From a78eebe480f1a721274d3e3a02815688f6b7a037 Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:15:11 -0400 Subject: [PATCH 1/6] Update query.test.ts --- packages/firestore/test/integration/api/query.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firestore/test/integration/api/query.test.ts b/packages/firestore/test/integration/api/query.test.ts index 3a0e7c1c2e8..28a2a61979c 100644 --- a/packages/firestore/test/integration/api/query.test.ts +++ b/packages/firestore/test/integration/api/query.test.ts @@ -1347,7 +1347,7 @@ apiDescribe('Queries', persistence => { }); // eslint-disable-next-line no-restricted-properties - (USE_EMULATOR ? describe : describe.skip)('Multiple Inequality', () => { + (USE_EMULATOR ? describe.only : describe.skip)('Multiple Inequality', () => { it('can use multiple inequality filters', async () => { const testDocs = { doc1: { key: 'a', sort: 0, v: 0 }, From 37e37706ae61c3dbc3982d5f11c0c44cc1a02230 Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:51:06 -0400 Subject: [PATCH 2/6] Update test-changed-firestore.yml --- .github/workflows/test-changed-firestore.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index f8cc135380e..705eadca5b8 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -118,6 +118,8 @@ jobs: run: cp config/ci.config.json config/project.json - name: Run tests run: cd packages/firestore && yarn run ${{ matrix.test-name }} + env: + EXPERIMENTAL_MODE: true compat-test-firefox: name: Test Firestore Compatible on Firefox @@ -185,6 +187,7 @@ jobs: run: cd packages/firestore && xvfb-run yarn run ${{ matrix.test-name }} env: BROWSERS: 'Firefox' + EXPERIMENTAL_MODE: true # A job that fails if any required job in the test matrix fails, # to be used as a required check for merging. From f37eeaf28dafd49126ca5999e187f7344ca7fd0b Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:26:05 -0400 Subject: [PATCH 3/6] try run export EXPERIMENTAL_MODE=true --- .github/workflows/test-changed-firestore.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 705eadca5b8..b0e59e8e5ca 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -115,11 +115,11 @@ jobs: - name: Bump Node memory limit run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV - name: Test setup and yarn install - run: cp config/ci.config.json config/project.json + run: | + export EXPERIMENTAL_MODE=true + cp config/ci.config.json config/project.json - name: Run tests run: cd packages/firestore && yarn run ${{ matrix.test-name }} - env: - EXPERIMENTAL_MODE: true compat-test-firefox: name: Test Firestore Compatible on Firefox @@ -182,12 +182,13 @@ jobs: - name: Bump Node memory limit run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV - name: Test setup and yarn install - run: cp config/ci.config.json config/project.json + run: | + export EXPERIMENTAL_MODE=true + cp config/ci.config.json config/project.json - name: Run tests run: cd packages/firestore && xvfb-run yarn run ${{ matrix.test-name }} env: BROWSERS: 'Firefox' - EXPERIMENTAL_MODE: true # A job that fails if any required job in the test matrix fails, # to be used as a required check for merging. From ff6b0a972bf61a8f001661f5fd22d467a6452516 Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:11:23 -0400 Subject: [PATCH 4/6] Revert "try run export EXPERIMENTAL_MODE=true" This reverts commit f37eeaf28dafd49126ca5999e187f7344ca7fd0b. --- .github/workflows/test-changed-firestore.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index b0e59e8e5ca..705eadca5b8 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -115,11 +115,11 @@ jobs: - name: Bump Node memory limit run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV - name: Test setup and yarn install - run: | - export EXPERIMENTAL_MODE=true - cp config/ci.config.json config/project.json + run: cp config/ci.config.json config/project.json - name: Run tests run: cd packages/firestore && yarn run ${{ matrix.test-name }} + env: + EXPERIMENTAL_MODE: true compat-test-firefox: name: Test Firestore Compatible on Firefox @@ -182,13 +182,12 @@ jobs: - name: Bump Node memory limit run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV - name: Test setup and yarn install - run: | - export EXPERIMENTAL_MODE=true - cp config/ci.config.json config/project.json + run: cp config/ci.config.json config/project.json - name: Run tests run: cd packages/firestore && xvfb-run yarn run ${{ matrix.test-name }} env: BROWSERS: 'Firefox' + EXPERIMENTAL_MODE: true # A job that fails if any required job in the test matrix fails, # to be used as a required check for merging. From d0affc9ffc40d11e1d373ac3b5e7f31686d29416 Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 16:39:12 -0400 Subject: [PATCH 5/6] upgrade cloud firestore emulator version --- scripts/emulator-testing/emulators/firestore-emulator.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/emulator-testing/emulators/firestore-emulator.ts b/scripts/emulator-testing/emulators/firestore-emulator.ts index 8e30d2cfe99..53dcb713d55 100644 --- a/scripts/emulator-testing/emulators/firestore-emulator.ts +++ b/scripts/emulator-testing/emulators/firestore-emulator.ts @@ -22,11 +22,11 @@ export class FirestoreEmulator extends Emulator { constructor(port: number, projectId = 'test-emulator') { super( - 'cloud-firestore-emulator-v1.14.4.jar', + 'cloud-firestore-emulator-v1.18.1.jar', // Use locked version of emulator for test to be deterministic. // The latest version can be found from firestore emulator doc: // https://firebase.google.com/docs/firestore/security/test-rules-emulator - 'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.14.4.jar', + 'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.18.1.jar', port ); this.projectId = projectId; From 035b560002732dc181e9cb08b6e1bd633a0d89ae Mon Sep 17 00:00:00 2001 From: milaGGL <107142260+milaGGL@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:17:00 -0400 Subject: [PATCH 6/6] Update query.test.ts --- packages/firestore/test/integration/api/query.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firestore/test/integration/api/query.test.ts b/packages/firestore/test/integration/api/query.test.ts index 28a2a61979c..3a0e7c1c2e8 100644 --- a/packages/firestore/test/integration/api/query.test.ts +++ b/packages/firestore/test/integration/api/query.test.ts @@ -1347,7 +1347,7 @@ apiDescribe('Queries', persistence => { }); // eslint-disable-next-line no-restricted-properties - (USE_EMULATOR ? describe.only : describe.skip)('Multiple Inequality', () => { + (USE_EMULATOR ? describe : describe.skip)('Multiple Inequality', () => { it('can use multiple inequality filters', async () => { const testDocs = { doc1: { key: 'a', sort: 0, v: 0 },