Skip to content

Commit 0c9959b

Browse files
committed
Revert temp stuff
1 parent f994549 commit 0c9959b

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

packages/firestore/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import { name, version } from './package.json';
2828

2929
import './register-module';
3030

31-
// trigger run_changed
32-
3331
/**
3432
* Registers the main Firestore build with the components framework.
3533
* Persistence can be enabled via `firebase.firestore().enablePersistence()`.

packages/firestore/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,16 @@
2424
"gendeps:exp": "../../scripts/exp/extract-deps.sh --types ./exp-types/index.d.ts --bundle ./dist/exp/tmp.js --output ./exp/dependencies.json",
2525
"pregendeps:lite": "node scripts/build-bundle.js --input ./lite/index.ts --output ./dist/lite/tmp.js",
2626
"gendeps:lite": "../../scripts/exp/extract-deps.sh --types ./lite-types/index.d.ts --bundle ./dist/lite/tmp.js --output ./lite/dependencies.json",
27-
"test:lite": "node ./scripts/run-tests.js --emulator --platform node_lite --main=lite/index.ts 'lite/test/**/*.test.ts'",
28-
"test:lite:prod": "node ./scripts/run-tests.js --platform node_lite --main=lite/index.ts 'lite/test/**/*.test.ts'",
27+
"test:lite": "node ./scripts/run-tests.js --emulator --platform node_lite --main=lite/index.ts 'lite/test/**/*.test.ts'",
2928
"test:lite:browser": "karma start --single-run --lite",
3029
"test:lite:browser:debug": "karma start --single-run --lite --auto-watch",
3130
"test:exp": "node ./scripts/run-tests.js --emulator --main=exp/index.ts test/integration/api/*.test.ts",
32-
"test:exp:prod": "node ./scripts/run-tests.js --main=exp/index.ts test/integration/api/*.test.ts",
3331
"test:exp:persistence": "node ./scripts/run-tests.js --emulator --persistence --main=exp/index.ts test/integration/api/*.test.ts",
34-
"test:exp:persistence:prod": "node ./scripts/run-tests.js --persistence --main=exp/index.ts test/integration/api/*.test.ts",
3532
"test:exp:browser": "karma start --single-run --exp",
3633
"test:exp:browser:debug": "karma start --single-run --exp --auto-watch",
3734
"test": "run-s lint test:all",
3835
"test:ci": "node ../../scripts/run_tests_in_ci.js",
39-
"test:all": "run-p test:browser test:lite:browser test:exp:browser test:travis test:minified",
36+
"test:all": "run-p test:browser test:lite:browser test:exp:browser test:travis test:minified test:exp test:lite",
4037
"test:browser": "karma start --single-run",
4138
"test:browser:debug": "karma start --browsers=Chrome --auto-watch",
4239
"test:node": "node ./scripts/run-tests.js --main=index.node.ts --emulator 'test/{,!(browser)/**/}*.test.ts'",

scripts/emulator-testing/firestore-test-runner.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,9 @@ function runTest(port: number, projectId: string, withPersistence: boolean) {
3636
// ready in Firestore emulator.
3737
// Use `prod` to allow test runner's env variable overrides to work.
3838
if (withPersistence) {
39-
return Promise.all([
40-
spawn('yarn', ['test:node:persistence:prod'], options),
41-
spawn('yarn', ['test:exp:persistence:prod'], options),
42-
spawn('yarn', ['test:lite:prod'], options)
43-
]);
39+
return spawn('yarn', ['test:node:persistence:prod'], options);
4440
} else {
45-
return Promise.all([
46-
spawn('yarn', ['test:node:prod'], options),
47-
spawn('yarn', ['test:exp:prod'], options),
48-
spawn('yarn', ['test:lite:prod'], options)
49-
]);
41+
return spawn('yarn', ['test:node:prod'], options);
5042
}
5143
}
5244

0 commit comments

Comments
 (0)