Merge branch 'master' into firestore-multi-tab

Author: schmidt-sebastian

config/karma.base.js

@@ -54,14 +54,11 @@ const config = {
   browserNoActivityTimeout: 65000,
 
   // preprocess matching files before serving them to the browser
-  // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-  preprocessors: {
-    'test/**/*.ts': ['webpack', 'sourcemap']
-  },
+  // available preprocessors:
+  // https://npmjs.org/browse/keyword/karma-preprocessor
+  preprocessors: { 'test/**/*.ts': ['webpack', 'sourcemap'] },
 
-  mime: {
-    'text/x-typescript': ['ts', 'tsx']
-  },
+  mime: { 'text/x-typescript': ['ts', 'tsx'] },
 
   // test results reporter to use
   // possible values: 'dots', 'progress'
@@ -75,26 +72,24 @@ const config = {
   colors: true,
 
   // level of logging
-  // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+  // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN
+  // || config.LOG_INFO || config.LOG_DEBUG
   logLevel: karma.constants.LOG_INFO,
 
-  // enable / disable watching file and executing tests whenever any file changes
+  // enable / disable watching file and executing tests whenever any file
+  // changes
   autoWatch: false,
 
   customLaunchers: sauceLabsBrowsers,
 
   // start these browsers
-  // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+  // available browser launchers:
+  // https://npmjs.org/browse/keyword/karma-launcher
   browsers: ['ChromeHeadless'],
 
   webpack: webpackTestConfig,
 
-  webpackMiddleware: {
-    quiet: true,
-    stats: {
-      colors: true
-    }
-  },
+  webpackMiddleware: { quiet: true, stats: { colors: true } },
 
   sauceLabs: {
     tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER,
@@ -106,10 +101,7 @@ const config = {
   singleRun: false,
 
   client: {
-    mocha: {
-      timeout: 20000,
-      retries: 3
-    },
+    mocha: { timeout: 20000, retries: 3 },
 
     // Pass through --grep option to filter the tests that run.
     args: argv.grep ? ['--grep', argv.grep] : []
@@ -118,7 +110,7 @@ const config = {
   coverageIstanbulReporter: {
     dir: path.resolve(process.cwd(), 'coverage/browser/%browser%'),
     fixWebpackSourcePaths: true,
-    reports: ['lcovonly']
+    reports: ['html', 'lcovonly']
   }
 };
 

integration/messaging/test/static/manual-test-server.js renamed to integration/messaging/manual-test-server.js

@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-const testServer = require('./test-server');
-testServer.start();
+const testServer = require('./test/utils/test-server');
+testServer
+  .start()
+  .then(() => console.log(`Test server: ${testServer.serverAddress}`))
+  .catch(err => console.error(err));

integration/messaging/package.json

@@ -4,8 +4,8 @@
   "version": "0.2.1",
   "scripts": {
     "pretest:manual": "node ./download-browsers.js",
-    "test": "echo 'Automated tests temporarily disabled, run `npm run test:manual` to execute these tests'",
-    "test:manual": "mocha --retries 3 --exit"
+    "test": "echo 'Tests disabled due to flakiness'",
+    "test:manual": "mocha --exit"
   },
   "dependencies": {
     "firebase": "4.9.1"
@@ -17,6 +17,7 @@
     "geckodriver": "^1.8.0",
     "mocha": "^4.0.1",
     "node-fetch": "^1.7.2",
-    "selenium-assistant": "^5.1.0"
+    "selenium-assistant": "^5.2.0",
+    "sinon": "^4.1.3"
   }
 }