Merge pull request #278 from Financial-Times/fix/make-smoke-test-run-sequentially

fix: make smoke tests run sequentially

Author: ytcleon

README.md

@@ -167,7 +167,7 @@ To run a test suite for a type of FT subscriber, add a `user` property to the su
 
 For the test to get the user session tokens from [`next-test-sessions-lambda`](http://github.com/financial-times/next-test-sessions-lambda), it needs to rewrite the URL being tested to an ft.com host. The original URL is set in the `FT-Test-Host` header, which tells `next-router` to proxy the test URL rather than production.
 
-The test output will display the original URL. 
+The test output will display the original URL.
 
 *Options:* `premium`, `standard`, `expired`.
 
@@ -202,11 +202,20 @@ n-test smoke -H https://05bd2344ebca.ngrok.io
 
 Needs to set TEST_SESSIONS_URL (url to [`next-test-sessions-lambda`](http://github.com/financial-times/next-test-sessions-lambda)) and TEST_SESSIONS_API_KEY environment variables when running the tests.
 
+```
+TEST_SESSIONS_API_KEY=<TEST_SESSIONS_API_KEY> TEST_SESSIONS_URL=<TEST_SESSIONS_URL> n-test smoke -H https://05bd2344ebca.ngrok.io
+```
+
+Ngrok has added a warning page to block phishing attack, so an additional header `ngrok-skip-browser-warning` is needed to be truthy to bypass the page, or the warning page is always shown.
+
 *Example*
 ```
 [
   {
 	user: 'premium',
+	header: {
+		'ngrok-skip-browser-warning': 1,
+	},
 	urls: [
 	  '/these-will': 200,
 	  '/run-with-a': 200,

lib/smoke/smoke-test.js

@@ -109,14 +109,15 @@ class SmokeTest {
 
 		try {
 
-			const allTests = [directly(15, puppetTests)];
-			if (crossBrowserTests.length > 0) {
-				allTests.push(directly(5, crossBrowserTests));
-			} else {
-				allTests.push(Promise.resolve([]));
+			const puppetResults = [];
+			const crossBrowserResults = [];
+			for (let test of puppetTests) {
+				puppetResults.push(await test());
+			}
+			for (let test of crossBrowserTests) {
+				crossBrowserResults.push(await test());
 			}
 
-			const [puppetResults, crossBrowserResults] = await Promise.all(allTests);
 			const timeTaken = new Date(new Date().getTime() - startTime).toISOString().substr(14, 5);
 
 			return await this.displayResults(puppetResults, crossBrowserResults, timeTaken, puppetTests.length + crossBrowserTests.length);