Merge pull request #7566 from Turbo87/no-sandbox

testem: Use `--no-sandbox` on TravisCI
ember-cli · Jan 21, 2018 · 24aeacc · 24aeacc
2 parents d3d90a7 + 92774e7
commit 24aeacc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/blueprints/app/files/testem.js b/blueprints/app/files/testem.js
@@ -11,11 +11,14 @@ module.exports = {
     Chrome: {
       mode: 'ci',
       args: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.TRAVIS ? '--no-sandbox' : null,
+
         '--disable-gpu',
         '--headless',
         '--remote-debugging-port=0',
         '--window-size=1440,900'
-      ]
+      ].filter(Boolean)
     }
   }
 };
diff --git a/tests/acceptance/smoke-test-slow.js b/tests/acceptance/smoke-test-slow.js
@@ -152,7 +152,7 @@ describe('Acceptance: smoke-test', function() {
     output = output.join(EOL);
 
     expect(output).to.match(/fail\s+0/, 'no failures');
-    expect(output).to.match(/pass\s+11/, '11 passing');
+    expect(output).to.match(/pass\s+12/, '12 passing');
   }));
 
   it('ember new foo, build development, and verify generated files', co.wrap(function *() {

diff --git a/tests/fixtures/smoke-tests/js-testem-config/testem.js b/tests/fixtures/smoke-tests/js-testem-config/testem.js
@@ -12,10 +12,13 @@ module.exports = {
   ],
   "browser_args": {
     "Chrome": [
+      // --no-sandbox is needed when running Chrome inside a container
+      process.env.TRAVIS ? '--no-sandbox' : null,
+
       "--disable-gpu",
       "--headless",
       "--remote-debugging-port=0",
       "--window-size=1440,900"
-    ],
+    ].filter(Boolean),
   }
 };
diff --git a/tests/fixtures/tasks/testem-config/testem-with-query-string.json b/tests/fixtures/tasks/testem-config/testem-with-query-string.json
@@ -10,6 +10,7 @@
   ],
   "browser_args": {
     "Chrome": [
+      "--no-sandbox",
       "--disable-gpu",
       "--headless",
       "--remote-debugging-port=0",

diff --git a/tests/fixtures/tasks/testem-config/testem.json b/tests/fixtures/tasks/testem-config/testem.json
@@ -9,6 +9,7 @@
   ],
   "browser_args": {
     "Chrome": [
+      "--no-sandbox",
       "--disable-gpu",
       "--headless",
       "--remote-debugging-port=0",