Skip to content

Commit 9d0d0a5

Browse files
committed
Delete old changes from make node app
1 parent f1086b0 commit 9d0d0a5

File tree

10 files changed

+9
-306
lines changed

10 files changed

+9
-306
lines changed

integration/firestore/bundle_test_data/generate_test_bundle.ts

Lines changed: 0 additions & 111 deletions
This file was deleted.

integration/firestore/bundle_test_data/package.json

Lines changed: 0 additions & 44 deletions
This file was deleted.

integration/firestore/bundle_test_data/rollup.config.js

Lines changed: 0 additions & 114 deletions
This file was deleted.

integration/firestore/bundle_test_data/tsconfig.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

integration/firestore/gulpfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ function copyTests() {
4242
.src(
4343
[
4444
testBase + '/integration/api/*.ts',
45-
testBase + '/integration/util/emulator_settings.ts',
4645
testBase + '/integration/util/events_accumulator.ts',
4746
testBase + '/integration/util/helpers.ts',
4847
testBase + '/integration/util/settings.ts',

packages/firestore/scripts/run-tests.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import * as yargs from 'yargs';
1919
import { resolve } from 'path';
2020
import { spawn } from 'child-process-promise';
21-
import {EMULATOR_PROJECT_ID} from '../test/integration/util/emulator_settings';
2221

2322
const argv = yargs.options({
2423
main: {
@@ -58,9 +57,8 @@ let args = [
5857

5958
if (argv.emulator) {
6059
process.env.FIRESTORE_EMULATOR_PORT = '8080';
61-
process.env.FIRESTORE_EMULATOR_PROJECT_ID = EMULATOR_PROJECT_ID;
60+
process.env.FIRESTORE_EMULATOR_PROJECT_ID = 'test-emulator';
6261
}
63-
export const ALT_PROJECT_ID = 'test-db2';
6462

6563
if (argv.persistence) {
6664
process.env.USE_MOCK_PERSISTENCE = 'YES';

packages/firestore/test/integration/api/validation.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ import {
2626
withTestCollection,
2727
withTestDb
2828
} from '../util/helpers';
29-
import { DEFAULT_PROJECT_ID } from '../util/settings';
30-
import { ALT_PROJECT_ID } from '../util/emulator_settings';
29+
import { ALT_PROJECT_ID, DEFAULT_PROJECT_ID } from '../util/settings';
3130

3231
const FieldPath = firebaseExport.FieldPath;
3332
const FieldValue = firebaseExport.FieldValue;

packages/firestore/test/integration/util/emulator_settings.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

packages/firestore/test/integration/util/helpers.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616
*/
1717

1818
import * as firestore from '@firebase/firestore-types';
19-
import { DEFAULT_PROJECT_ID, DEFAULT_SETTINGS } from './settings';
19+
import {
20+
ALT_PROJECT_ID,
21+
DEFAULT_PROJECT_ID,
22+
DEFAULT_SETTINGS
23+
} from './settings';
2024
import * as firebaseExport from './firebase_export';
21-
import { ALT_PROJECT_ID } from './emulator_settings';
2225

2326
const newTestFirestore = firebaseExport.newTestFirestore;
2427

packages/firestore/test/integration/util/settings.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ declare const __karma__: any;
2929
const PROJECT_CONFIG = require('../../../../../config/project.json');
3030

3131
const EMULATOR_PORT = process.env.FIRESTORE_EMULATOR_PORT;
32-
export const EMULATOR_PROJECT_ID = process.env.FIRESTORE_EMULATOR_PROJECT_ID;
32+
const EMULATOR_PROJECT_ID = process.env.FIRESTORE_EMULATOR_PROJECT_ID;
3333
export const USE_EMULATOR = !!EMULATOR_PORT;
3434

3535
const EMULATOR_FIRESTORE_SETTING = {
@@ -59,3 +59,4 @@ function getDefaultSettings(): firestore.Settings {
5959
export const DEFAULT_PROJECT_ID = USE_EMULATOR
6060
? EMULATOR_PROJECT_ID
6161
: PROJECT_CONFIG.projectId;
62+
export const ALT_PROJECT_ID = 'test-db2';

0 commit comments

Comments
 (0)