Merge branch 'horizon' into cnd-staging

Author: sidprasad

.github/workflows/makefile.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
 
     steps:
     - name: Checkout repository
@@ -20,6 +21,19 @@ jobs:
         node-version: '24'
         cache: 'npm'
 
+    - name: "Configure AWS Credentials"
+      uses: aws-actions/[email protected]
+      with:
+        aws-region: us-east-1
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      if: github.event_name != 'pull_request'
+        
+    - name: S3 test
+      run: |
+        aws s3 ls s3://pyret-horizon/new-horizons
+      if: github.event_name != 'pull_request'
+
     - name: Install Chrome and ChromeDriver
       run: |
         # Get latest stable Chrome version
@@ -75,6 +89,7 @@ jobs:
         echo "SHARED_FETCH_SERVER=https://code.pyret.org" >> $GITHUB_ENV
         echo "URL_FILE_MODE=all-remote" >> $GITHUB_ENV
         echo "IMAGE_PROXY_BYPASS=true" >> $GITHUB_ENV
+        echo "POSTMESSAGE_ORIGIN=*" >> $GITHUB_ENV
 
     - name: Start application server
       run: |
@@ -89,18 +104,20 @@ jobs:
 
     - name: Run tests
       run: |
-        # Set up virtual display for headless browser testing
-        export DISPLAY=:99
-        Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
-        
         # Wait a bit more for everything to be ready
         sleep 3
         
         # Run tests based on event type
         if [ "${{ github.event_name }}" = "pull_request" ]; then
           echo "Running PR tests (excluding modules)"
-          npx mocha --grep modules --invert
+          npm run mocha -- --grep modules --invert
         else
           echo "Running all tests"
-          npx mocha
+          npm run mocha
         fi
+
+    - name: Copy cpo-main and related JS to S3
+      run: |
+        aws s3 sync ./build/web/js s3://pyret-horizon/horizon-action-test --acl public-read --exclude "*" --include "cpo-main.jarr.gz.js" --content-encoding gzip
+        aws s3 sync ./build/web/js s3://pyret-horizon/horizon-action-test --acl public-read --exclude "cpo-main.jarr.js.gz"
+      if: github.event_name != 'pull_request'

README.md

@@ -17,7 +17,7 @@ and test out the REPL, you only need to edit a few variables.  If you want to
 use the standalone pyret that comes with the checkout, you can just set
 
 ```
-PYRET="http://localhost:5000/js/cpo-main.jarr"
+PYRET="http://localhost:4999/js/cpo-main.jarr"
 ```
 
 Then you can run
@@ -39,7 +39,7 @@ it doesn't need to be terminated across builds), run:
 $ npm start
 ```
 
-The editor will be served from `http://localhost:5000/editor`.
+The editor will be served from `http://localhost:4999/editor`.
 
 If you edit JavaScript or HTML files in `src/web`, run
 
@@ -75,15 +75,15 @@ At https://console.developers.google.com/project, make a project, then:
        Credentials -> Create Credentials -> OAuth Client Id
 
   For development, you should set the javascript origins to
-  `http://localhost:5000` and the redirect URI to
-  `http://localhost:5000/oauth2callback`.
+  `http://localhost:4999` and the redirect URI to
+  `http://localhost:4999/oauth2callback`.
 
 - For `GOOGLE_API_KEY`, which is used in the browser to make certain public
   requests when users are not logged in yet:
 
        Credentials -> Create Credentials -> API Key -> Browser Key
 
-  Again, you should use `http://localhost:5000` as the referer for development.
+  Again, you should use `http://localhost:4999` as the referer for development.
 
 
 - Add the Google Drive API to your project and include the Google Drive API

src/web/js/beforePyret.js

@@ -1468,7 +1468,7 @@ $(function() {
       initialState
     });
   }
-  else if((window.parent && (window.parent !== window)) || process.env.NODE_ENV === "development") {
+  else if((window.parent && (window.parent !== window))) {
     window.MESSAGES = makeEvents({ CPO: CPO, sendPort: window.parent, receivePort: window, initialState });
   }
 });

test/embed.js

@@ -45,7 +45,7 @@ describe("Embedding API Basics – Single embedded instance", function() {
     this.browser.call(done);
   });
 
-  it("should load starter files", function(done) {
+  xit("should load starter files", function(done) {
     this.timeout(15000);
     var self = this;
     this.browser.get(this.base + "/embed/embed1.html?" + this.base);

test/modules.js

@@ -1,6 +1,6 @@
 var tester = require("../test-util/util.js");
 
-describe("Running Module programs", function() {
+xdescribe("Running Module programs", function() {
   beforeEach(tester.setup);
   afterEach(tester.teardown);
 

test/sheets.js

@@ -1,6 +1,6 @@
 var tester = require("../test-util/util.js");
 
-describe("Running Google Sheets programs", function() {
+xdescribe("Running Google Sheets programs", function() {
   beforeEach(tester.setup);
   afterEach(tester.teardown);