Merge pull request #6364 from BryceLTaylor/remove-run-in-band

Remove run in band from integration tests

package.json

@@ -7,8 +7,8 @@
     "test": "npm run test:lint && npm run build && npm run test:unit",
     "test:lint": "eslint . --ext .js,.jsx,.json",
     "test:lint:ci": "eslint . --ext .js,.jsx,.json --format junit -o ./test/results/lint-results.xml",
-    "test:integration": "jest ./test/integration/*.test.js --reporters=default --runInBand",
+    "test:integration": "jest ./test/integration/*.test.js --reporters=default --maxWorkers=5",
-    "test:integration:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --runInBand",
+    "test:integration:remote": "SMOKE_REMOTE=true jest ./test/integration/*.test.js --reporters=default --maxWorkers=5",
     "test:unit": "npm run test:unit:jest && npm run test:unit:tap",
     "test:unit:jest": "npm run test:unit:jest:unit && npm run test:unit:jest:localization",
     "test:unit:jest:unit": "jest ./test/unit/ --reporters=default",

test/integration/comments.test.js

@@ -15,8 +15,6 @@ const {
 let username1 = process.env.SMOKE_USERNAME + '4';
 let username2 = process.env.SMOKE_USERNAME + '5';
 let password = process.env.SMOKE_PASSWORD;
-
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 
 // project for comments (owned by username2)
@@ -43,11 +41,7 @@ let projectReply = projectComment + ' reply';
 let profileReply = profileComment + ' reply';
 let studioReply = studioComment + ' reply';
 
-if (remote) {
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/footer-links.test.js

@@ -7,14 +7,9 @@ const {
     buildDriver
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 
-if (remote) {
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(10000);
-}
 
 let driver;
 

test/integration/homepage-rows.test.js

@@ -8,14 +8,9 @@ const {
     buildDriver
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 
-if (remote) {
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/join.test.js

@@ -8,15 +8,10 @@ const {
     buildDriver
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let takenUsername = process.env.SMOKE_USERNAME;
 
-if (remote){
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(10000);
-}
 
 let driver;
 

test/integration/my-stuff.test.js

@@ -12,17 +12,12 @@ const {
 
 let username = process.env.SMOKE_USERNAME + '1';
 let password = process.env.SMOKE_PASSWORD;
-let remote = process.env.SMOKE_REMOTE || false;
 
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let myStuffURL = rootUrl + '/mystuff';
 let rateLimitCheck = process.env.RATE_LIMIT_CHECK || rootUrl;
 
-if (remote){
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/navbar.test.js

@@ -8,14 +8,9 @@ const {
     buildDriver
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 
-if (remote) {
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(10000);
-}
 
 let driver;
 

test/integration/project-page.test.js

@@ -9,16 +9,11 @@ const {
     waitUntilVisible
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let projectId = process.env.TEST_PROJECT_ID || 1300006196;
 let projectUrl = rootUrl + '/projects/' + projectId;
 
-if (remote){
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/search.test.js

@@ -9,14 +9,9 @@ const {
     getKey
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 
-if (remote){
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/sign-in-and-out.test.js

@@ -15,16 +15,11 @@ const {
 
 let username = process.env.SMOKE_USERNAME;
 let password = process.env.SMOKE_PASSWORD;
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let scratchr2url = rootUrl + '/users/' + username;
 let wwwURL = rootUrl;
 
-if (remote){
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;
 

test/integration/statistics.test.js

@@ -9,15 +9,10 @@ const {
     findByXpath
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let statisticsPage = rootUrl + '/statistics';
 
-if (remote) {
+jest.setTimeout(60000);
-    jest.setTimeout(60000);
-} else {
-    jest.setTimeout(10000);
-}
 
 let driver;
 

test/integration/studios-page.test.js

@@ -10,7 +10,6 @@ const {
     signIn
 } = new SeleniumHelper();
 
-let remote = process.env.SMOKE_REMOTE || false;
 let rootUrl = process.env.ROOT_URL || 'https://scratch.ly';
 let studioId = process.env.TEST_STUDIO_ID || 10004360;
 let studioUrl = rootUrl + '/studios/' + studioId;
@@ -26,11 +25,7 @@ let password = process.env.SMOKE_PASSWORD;
 let promoteStudioURL;
 let curatorTab;
 
-if (remote){
+jest.setTimeout(70000);
-    jest.setTimeout(70000);
-} else {
-    jest.setTimeout(20000);
-}
 
 let driver;