From 67525d1d5adbb2a1c82711ba8d43c0fd97c105a6 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Sun, 21 Jan 2018 20:43:49 +0100
Subject: [PATCH 1/3] testem: Use `--no-sandbox` on TravisCI

---
 blueprints/app/files/testem.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/blueprints/app/files/testem.js b/blueprints/app/files/testem.js
index b3799ce1bb..d1755a4ea4 100644
--- 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)
     }
   }
 };

From d3297fdcd0b68d15032835cd3ee8c527bc5c097a Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Sun, 21 Jan 2018 21:04:45 +0100
Subject: [PATCH 2/3] testem: Adjust test configs

---
 tests/fixtures/smoke-tests/js-testem-config/testem.js        | 5 ++++-
 .../tasks/testem-config/testem-with-query-string.json        | 1 +
 tests/fixtures/tasks/testem-config/testem.json               | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/fixtures/smoke-tests/js-testem-config/testem.js b/tests/fixtures/smoke-tests/js-testem-config/testem.js
index 7fbbfb4bda..750ce18a5b 100644
--- 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
index 19e9e5b5b0..8824c50be8 100644
--- 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
index adf952500b..24349fdd77 100644
--- 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",

From 92774e7578b7c7de8ed9c34dae24e305c5102bdb Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Sun, 21 Jan 2018 10:54:08 +0100
Subject: [PATCH 3/3] tests/acceptance: Update test number expectation

`ember-qunit` is now generating a test of its own which we did not expect before. Updating the expected number of tests fixes our CI runs.
---
 tests/acceptance/smoke-test-slow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/smoke-test-slow.js b/tests/acceptance/smoke-test-slow.js
index 9051dfa282..6528c2b8ff 100644
--- 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 *() {