firebase · Feiyang1 · Apr 24, 2020 · Apr 24, 2020 · Apr 24, 2020 · Apr 24, 2020
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,7 @@
       "args": [
         "test/{,!(browser)/**/}*.test.ts",
         "--file", "index.node.ts",
-        "--opts", "../../config/mocha.node.opts"
+        "--config", "../../config/mocharc.node.js"
       ],
       "env": {
         "TS_NODE_CACHE": "NO",

diff --git a/config/karma.base.js b/config/karma.base.js
@@ -125,4 +125,13 @@ if (false /* process.env.TRAVIS */) {
   config.browsers = [...config.browsers, ...Object.keys(sauceLabsBrowsers)];
 }
 
+// Make it easy to spot failed tests in CI
+if (process.env.CI) {
+  config.specReporter = {
+    suppressErrorSummary: true,
+    suppressPassed: true, // do not print information about passed tests
+    suppressSkipped: true
+  };
+}
+
 module.exports = config;
diff --git a/config/mocha.browser.opts b/config/mocha.browser.opts
@@ -1,6 +1,25 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 # See:
 #   - https://mochajs.org/#usage for more information on usage of mocha flags.
 #   - https://github.com/karma-runner/karma-mocha for more information on all mocha flags which the
 #     karma runner supports.
+# This file is not converted to .mocharc.js format because karma-mocha doesn't work with it.
+
 --timeout 20000
 --retry 3
diff --git a/config/mocha.node.opts b/config/mocha.node.opts
diff --git a/config/mocharc.node.js b/config/mocharc.node.js
@@ -0,0 +1,37 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * See:
+ * - https://mochajs.org/#usage for more information on usage of mocha flags.
+ * - https://github.com/karma-runner/karma-mocha for more information on all mocha flags which the
+ *   karma runner supports.
+ */
+
+const config = {
+  require: 'ts-node/register',
+  timeout: 5000,
+  retries: 5,
+  exit: true
+};
+
+// use min reporter in CI to make it easy to spot failed tests
+if (process.env.CI) {
+  config.reporter = 'min';
+}
+
+module.exports = config;
diff --git a/packages-exp/app-exp/package.json b/packages-exp/app-exp/package.json
@@ -20,7 +20,7 @@
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
     "type-check": "tsc -p . --noEmit",
     "prepare": "yarn build:release",
     "api-report": "api-extractor run --local --verbose",

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -23,7 +23,7 @@
     "type-check": "tsc -p . --noEmit",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers Chrome --auto-watch",
-    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
   "license": "Apache-2.0",

diff --git a/packages/component/package.json b/packages/component/package.json
@@ -19,7 +19,7 @@
     "test": "yarn type-check && run-p lint test:browser test:node",
     "type-check": "tsc -p . --noEmit",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
   "dependencies": {
@@ -47,4 +47,4 @@
     ],
     "reportDir": "./coverage/node"
   }
-}
+}
diff --git a/packages/database/package.json b/packages/database/package.json
@@ -19,7 +19,7 @@
     "test": "run-p lint test:emulator",
     "test:all": "run-p lint test:browser test:node",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
     "test:emulator": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/database-test-runner.ts",
     "prepare": "yarn build"
   },

diff --git a/packages/firestore/package.json b/packages/firestore/package.json
@@ -20,10 +20,10 @@
     "test:all": "run-p test:browser test:travis test:minified",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
-    "test:node": "FIRESTORE_EMULATOR_PORT=8080 FIRESTORE_EMULATOR_PROJECT_ID=test-emulator TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --opts ../../config/mocha.node.opts",
-    "test:node:prod": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --opts ../../config/mocha.node.opts",
-    "test:node:persistence": "FIRESTORE_EMULATOR_PORT=8080 FIRESTORE_EMULATOR_PROJECT_ID=test-emulator USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --require test/util/node_persistence.ts --opts ../../config/mocha.node.opts",
-    "test:node:persistence:prod": "USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --require test/util/node_persistence.ts --opts ../../config/mocha.node.opts",
+    "test:node": "FIRESTORE_EMULATOR_PORT=8080 FIRESTORE_EMULATOR_PROJECT_ID=test-emulator TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
+    "test:node:prod": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
+    "test:node:persistence": "FIRESTORE_EMULATOR_PORT=8080 FIRESTORE_EMULATOR_PROJECT_ID=test-emulator USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --require test/util/node_persistence.ts --config ../../config/mocharc.node.js",
+    "test:node:persistence:prod": "USE_MOCK_PERSISTENCE=YES TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --require test/util/node_persistence.ts --config ../../config/mocharc.node.js",
     "test:travis": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/firestore-test-runner.ts",
     "test:minified": "(cd ../../integration/firestore ; yarn test)",
     "prepare": "yarn build"

diff --git a/packages/functions/package.json b/packages/functions/package.json
@@ -20,7 +20,7 @@
     "type-check": "tsc -p . --noEmit",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.node.ts --config ../../config/mocharc.node.js",
     "test:emulator": "env FIREBASE_FUNCTIONS_EMULATOR_ORIGIN=http://localhost:5005 run-p test:node",
     "prepare": "yarn build"
   },

diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -18,7 +18,7 @@
     "test": "run-p lint test:browser test:node",
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers Chrome --auto-watch",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
   "license": "Apache-2.0",

diff --git a/packages/template/package.json b/packages/template/package.json
@@ -19,7 +19,7 @@
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.* --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.* --config ../../config/mocharc.node.js",
     "type-check": "tsc -p . --noEmit",
     "prepare": "yarn build"
   },

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -14,7 +14,7 @@
     "build": "rollup -c",
     "build:deps": "lerna run --scope @firebase/testing --include-dependencies build",
     "dev": "rollup -c -w",
-    "test": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --opts ../../config/mocha.node.opts",
+    "test": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
   "license": "Apache-2.0",

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -19,7 +19,7 @@
     "test": "yarn type-check && run-p lint test:browser test:node",
     "type-check": "tsc -p . --noEmit",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --opts ../../config/mocha.node.opts",
+    "test:node": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha test/**/*.test.* --config ../../config/mocharc.node.js",
     "prepare": "yarn build"
   },
   "license": "Apache-2.0",

diff --git a/scripts/run_changed.js b/scripts/run_changed.js
@@ -34,7 +34,7 @@ const fullTestTriggerFiles = [
   'config/karma.base.js',
   'config/.eslintrc.js',
   'config/mocha.browser.opts',
-  'config/mocha.node.opts',
+  'config/mocharc.node.js',
   'config/tsconfig.base.json',
   'config/webpack.test.js',
   'config/firestore.rules',

diff --git a/tools/gitHooks/prettier.js b/tools/gitHooks/prettier.js
@@ -65,7 +65,8 @@ async function doPrettierCommit(changedFiles) {
   }
 
   // Only run on .js or .ts files.
-  const targetFiles = changedFiles.filter(line => line.match(/(js|ts)$/));
+  const targetFiles = changedFiles.filter(line => line.match(/\.(js|ts)$/));
+
   if (targetFiles.length === 0) {
     console.log('No files changed.');
     return;