more fixes

Gaurav0 · Dec 5, 2019 · 517f11a · 517f11a
1 parent 5ad039e
commit 517f11a
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 20 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -9,10 +9,6 @@ on:
 
 jobs:
   test-all-deprecations:
-    strategy:
-      fail-fast: false
-      matrix:
-        scenario: [ember-beta, ember-canary]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/packages/unpublished-adapter-encapsulation-test-app/testem.js b/packages/unpublished-adapter-encapsulation-test-app/testem.js
@@ -1,9 +1,19 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [

diff --git a/packages/unpublished-debug-encapsulation-test-app/testem.js b/packages/unpublished-debug-encapsulation-test-app/testem.js
@@ -1,9 +1,19 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [

diff --git a/packages/unpublished-fastboot-test-app/testem.js b/packages/unpublished-fastboot-test-app/testem.js
@@ -1,8 +1,17 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
   browser_start_timeout: 120,
   browser_args: {

diff --git a/packages/unpublished-model-encapsulation-test-app/testem.js b/packages/unpublished-model-encapsulation-test-app/testem.js
@@ -1,9 +1,19 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [

diff --git a/packages/unpublished-record-data-encapsulation-test-app/testem.js b/packages/unpublished-record-data-encapsulation-test-app/testem.js
@@ -1,9 +1,19 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [

diff --git a/packages/unpublished-relationship-performance-test-app/testem.js b/packages/unpublished-relationship-performance-test-app/testem.js
@@ -1,20 +1,30 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [
-        // --no-sandbox is needed when running Chrome inside a container
-        process.env.CI ? '--no-sandbox' : null,
         '--headless',
         '--disable-dev-shm-usage',
         '--disable-software-rasterizer',
         '--mute-audio',
         '--remote-debugging-port=0',
         '--window-size=1440,900',
-      ].filter(Boolean),
+        '--no-sandbox',
+      ],
     },
   },
 };
diff --git a/packages/unpublished-serializer-encapsulation-test-app/testem.js b/packages/unpublished-serializer-encapsulation-test-app/testem.js
@@ -1,9 +1,19 @@
+const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter');
+
+const TestIE = process.env.TEST_IE11;
+
+if (TestIE) {
+  // eslint-disable-next-line no-console
+  console.log('\n\nLaunching with IE\n\n');
+}
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
-  reporter: 'dot',
-  launch_in_ci: ['Chrome'],
+  reporter: customDotReporter,
+  launch_in_ci: TestIE ? ['IE'] : ['Chrome'],
   launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       ci: [