fix some failing tests

Author: hsubox76

config/karma.saucelabs.js

@@ -31,11 +31,11 @@ if (!testConfigFile) {
  */
 const browserMap = {
   // Desktop
-  // Chrome_Windows: seleniumLauncher('chrome', 'Windows 10', 'latest'),
+  Chrome_Windows: seleniumLauncher('chrome', 'Windows 10', 'latest')
   // Firefox_Windows: seleniumLauncher('firefox', 'Windows 10', 'latest'),
   // Safari_macOS: seleniumLauncher('safari', 'macOS 10.13', 'latest'),
   // Edge_Windows: seleniumLauncher('MicrosoftEdge', 'Windows 10', 'latest'),
-  IE_Windows: seleniumLauncher('internet explorer', 'Windows 10', 'latest')
+  // IE_Windows: seleniumLauncher('internet explorer', 'Windows 10', 'latest')
 
   // Mobile
   // Safari_iOS: appiumLauncher('Safari', 'iPhone Simulator', 'iOS', '11.2'),
@@ -49,6 +49,14 @@ const packageConfigs = {
   messaging: {
     // Messaging currently only supports these browsers.
     browsers: ['Chrome_Windows', 'Firefox_Windows', 'Edge_Windows']
+  },
+  firestore: {
+    browsers: [
+      'Chrome_Windows',
+      'Firefox_Windows',
+      'Edge_Windows',
+      'Safari_macOS'
+    ]
   }
 };
 
@@ -170,7 +178,8 @@ module.exports = function(config) {
       'packages/polyfill/index.ts': ['webpack', 'sourcemap'],
       '**/test/**/*.ts': ['webpack', 'sourcemap'],
       '**/*.test.ts': ['webpack', 'sourcemap'],
-      'packages/firestore/test/**/bootstrap.ts': ['webpack', 'babel'],
+      // Restore when ready to run Firestore unit tests in IE.
+      // 'packages/firestore/test/**/bootstrap.ts': ['webpack', 'babel'],
       'integration/**/namespace.*': ['webpack', 'babel', 'sourcemap']
     },
 

config/webpack.test.js

@@ -54,7 +54,7 @@ module.exports = {
       },
       {
         test: /\.js$/,
-        include: [/node_modules\/chai-as-promised/, /webchannel-wrapper/],
+        include: [/node_modules\/chai-as-promised/],
         use: {
           loader: 'babel-loader',
           options: {

integration/firestore/karma.conf.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

packages/firestore/karma.conf.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-const karma = require('karma');
-const path = require('path');
 const karmaBase = require('../../config/karma.base');
 const { argv } = require('yargs');
 
@@ -42,7 +40,6 @@ module.exports = function(config) {
  * --unit and --integration command-line arguments.
  */
 function getTestFiles(argv) {
-  console.log(argv);
   const unitTests = 'test/unit/bootstrap.ts';
   const integrationTests = 'test/integration/bootstrap.ts';
   if (argv.unit) {

packages/firestore/src/util/async_queue.ts

@@ -360,7 +360,7 @@ export class AsyncQueue {
         .catch((error: FirestoreError) => {
           this.failure = error;
           this.operationInProgress = false;
-          const message = error.stack || error.message || '';
+          const message = getMessageOrStack(error);
           logError('INTERNAL UNHANDLED ERROR: ', message);
 
           // Re-throw the error so that this.tail becomes a rejected Promise and
@@ -413,10 +413,7 @@ export class AsyncQueue {
 
   private verifyNotFailed(): void {
     if (this.failure) {
-      fail(
-        'AsyncQueue is already failed: ' +
-          (this.failure.stack || this.failure.message)
-      );
+      fail('AsyncQueue is already failed: ' + getMessageOrStack(this.failure));
     }
   }
 
@@ -518,3 +515,20 @@ export function wrapInUserErrorIfRecoverable(
     throw e;
   }
 }
+
+/**
+ * Chrome includes Error.message in Error.stack. Other browsers do not.
+ * This returns expected output of message + stack when available.
+ * @param error Error or FirestoreError
+ */
+function getMessageOrStack(error: Error): string {
+  let message = error.message || '';
+  if (error.stack) {
+    if (error.stack.includes(error.message)) {
+      message = error.stack;
+    } else {
+      message = error.message + '\n' + error.stack;
+    }
+  }
+  return message;
+}

packages/firestore/test/unit/core/event_manager.test.ts

@@ -224,9 +224,10 @@ describe('QueryListener', () => {
     const query = Query.atPath(path('rooms/Eros'));
 
     const listener = queryListener(query, [], events);
+    const error = new Error('bad');
 
-    listener.onError(Error('bad'));
-    expect(events[0]).to.deep.equal(new Error('bad'));
+    listener.onError(error);
+    expect(events[0]).to.deep.equal(error);
   });
 
   it('raises event for empty collection after sync', () => {

packages/firestore/test/unit/util/async_queue.test.ts

@@ -143,7 +143,8 @@ describe('AsyncQueue', () => {
     const doStep = (n: number): Promise<number> =>
       defer(() => completedSteps.push(n));
     queue.enqueueAndForget(() => doStep(1));
-    const last = queue.enqueueAfterDelay(timerId1, 5, () => doStep(4));
+    // Flaky on Safari, increasing delay to 1000ms to try to increase reliability.
+    const last = queue.enqueueAfterDelay(timerId1, 1000, () => doStep(4));
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     queue.enqueueAfterDelay(timerId2, 1, () => doStep(3));
     queue.enqueueAndForget(() => doStep(2));

scripts/run_saucelabs.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,9 @@ const { configFiles } = yargs
 // runNextTest() pulls filenames one-by-one from this queue.
 const testFiles = configFiles.length
   ? configFiles
-  : glob
-      .sync(`{packages,integration}/*/karma.conf.js`)
-      // Automated tests in integration/firestore are currently disabled.
-      // .filter(name => !name.includes('integration/firestore'));
+  : glob.sync(`{packages,integration}/*/karma.conf.js`);
+// Automated tests in integration/firestore are currently disabled.
+// .filter(name => !name.includes('integration/firestore'));
 
 // Get CI build number or generate one if running locally.
 const buildNumber =
@@ -68,7 +67,9 @@ async function runTest(testFile) {
   }
   if (testFile.includes('integration/firestore')) {
     console.log('Generating memory build.');
-    await spawn('yarn', ['--cwd', 'integration/firestore', 'build:memory'], { stdio: 'inherit' });
+    await spawn('yarn', ['--cwd', 'integration/firestore', 'build:memory'], {
+      stdio: 'inherit'
+    });
     console.log('Running tests on memory build.');
     const exitCode1 = await runKarma(testFile);
     // console.log('Generating persistence build.');