Merge remote-tracking branch 'jason/upgrade-to-react-18' into newHome…

…page
jaltekruse · Mar 20, 2023 · 6332a99 · 6332a99
2 parents 61ccb63 + ef7a1b9
commit 6332a99
Show file tree

Hide file tree

Showing 63 changed files with 2,005 additions and 435 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ dist_local/*
 
 cypress/videos
 cypress/screenshots
+runner-results
 
 src/tempcodes
 

diff --git a/cypress.config.js b/cypress.config.js
@@ -22,20 +22,20 @@ function queryTestDb(query, config) {
 
 module.exports = defineConfig({
   numTestsKeptInMemory: 20,
-  defaultCommandTimeout: 20000,
+  defaultCommandTimeout: 30000,
   e2e: {
     setupNodeEvents(on, config) {
       on('before:browser:launch', (browser = {}, launchOptions) => {
-      
+
         if (browser.name === 'chrome') {
           launchOptions.args.push('--mute-audio');
         }
-    
+
         return launchOptions;
       });
       on('task', { queryDb: query => { return queryTestDb(query, config) }, }); //For running sql query
     },
-    
+
     baseUrl: 'http://localhost',
   },
   env: {

diff --git a/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js
@@ -125,7 +125,7 @@ describe('CobwebPolyline Tag Tests', function () {
         componentName: "/graph1/cobweb",
         args: {
           pointCoords: { 0: [1, 0] },
-          sourceInformation: { vertex: 0 }
+          sourceDetails: { vertex: 0 }
         }
       })
 
@@ -163,7 +163,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 1: [3, 4] },
-            sourceInformation: { vertex: 1 }
+            sourceDetails: { vertex: 1 }
           }
         })
       })
@@ -207,7 +207,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 1: [1, 1] },
-            sourceInformation: { vertex: 1 }
+            sourceDetails: { vertex: 1 }
           }
         })
       })
@@ -248,7 +248,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 1: [1, 1.6] },
-            sourceInformation: { vertex: 1 }
+            sourceDetails: { vertex: 1 }
           }
         })
       })
@@ -336,7 +336,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 2: [1.6, 1.6] },
-            sourceInformation: { vertex: 2 }
+            sourceDetails: { vertex: 2 }
           }
         })
       })
@@ -392,7 +392,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 3: [1, 2] },
-            sourceInformation: { vertex: 3 }
+            sourceDetails: { vertex: 3 }
           }
         })
       })
@@ -454,7 +454,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 3: [1.6, 2.4] },
-            sourceInformation: { vertex: 3 }
+            sourceDetails: { vertex: 3 }
           }
         })
       })
@@ -611,7 +611,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 4: [2.4, 2.4] },
-            sourceInformation: { vertex: 4 }
+            sourceDetails: { vertex: 4 }
           }
         })
       })
@@ -680,7 +680,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 5: [-1, 3] },
-            sourceInformation: { vertex: 5 }
+            sourceDetails: { vertex: 5 }
           }
         })
       })
@@ -756,7 +756,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 5: [2.4, 3] },
-            sourceInformation: { vertex: 5 }
+            sourceDetails: { vertex: 5 }
           }
         })
       })
@@ -832,7 +832,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 6: [3, 1] },
-            sourceInformation: { vertex: 6 }
+            sourceDetails: { vertex: 6 }
           }
         })
       })
@@ -914,7 +914,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 6: [3, 3] },
-            sourceInformation: { vertex: 6 }
+            sourceDetails: { vertex: 6 }
           }
         })
       })
@@ -996,7 +996,7 @@ describe('CobwebPolyline Tag Tests', function () {
           componentName: "/graph1/cobweb",
           args: {
             pointCoords: { 7: [3, 3] },
-            sourceInformation: { vertex: 7 }
+            sourceDetails: { vertex: 7 }
           }
         })
       })

diff --git a/multi-reporter-config.json b/multi-reporter-config.json
@@ -0,0 +1,3 @@
+{
+  "reporterEnabled": "cypress-parallel/json-stream.reporter.js, cypress-parallel/simple-spec.reporter.js"
+}