Merge 0ccc5d8 into 4decdf6

Author: dconeybe

.github/workflows/test-all.yml

@@ -186,7 +186,11 @@ jobs:
       continue-on-error: true
 
   test-firestore-integration:
-    name: Firestore Integration Tests
+    strategy:
+      fail-fast: false
+      matrix:
+        persistence: ['memory', 'persistence']
+    name: Firestore Integration Tests (${{ matrix.persistence }})
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -211,11 +215,9 @@ jobs:
       run: |
         cp config/ci.config.json config/project.json
         yarn
-    - name: Set start timestamp env var
-      run: echo "FIREBASE_CI_TEST_START_TIME=$(date +%s)" >> $GITHUB_ENV
-    - name: Run unit tests
-      run: |
-        xvfb-run yarn lerna run --concurrency 4 test:ci --scope firebase-firestore-integration-test
-        node scripts/print_test_logs.js
+    - run: yarn build:${{ matrix.persistence }}
+      working-directory: integration/firestore
+    - run: xvfb-run yarn karma:singlerun
+      working-directory: integration/firestore
       env:
         FIREBASE_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

integration/firestore/package.json

@@ -6,9 +6,8 @@
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:persistence": "INCLUDE_FIRESTORE_PERSISTENCE=true gulp compile-tests",
     "build:memory": "INCLUDE_FIRESTORE_PERSISTENCE=false gulp compile-tests",
+    "karma:singlerun": "karma start --single-run",
     "prettier": "prettier --write '*.js' '*.ts'",
-    "test": "yarn build:memory; karma start --single-run; yarn build:persistence; karma start --single-run;",
-    "test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
     "test:persistence": " yarn build:persistence; karma start --single-run",
     "test:persistence:debug": "yarn build:persistence; karma start --auto-watch --browsers Chrome",
     "test:memory": "yarn build:memory; karma start --single-run",