Delete old changes from make node app

Author: wu-hui

integration/firestore/bundle_test_data/generate_test_bundle.ts

@@ -42,7 +42,6 @@ function copyTests() {
     .src(
       [
         testBase + '/integration/api/*.ts',
-        testBase + '/integration/util/emulator_settings.ts',
         testBase + '/integration/util/events_accumulator.ts',
         testBase + '/integration/util/helpers.ts',
         testBase + '/integration/util/settings.ts',

integration/firestore/bundle_test_data/package.json

@@ -18,7 +18,6 @@
 import * as yargs from 'yargs';
 import { resolve } from 'path';
 import { spawn } from 'child-process-promise';
-import {EMULATOR_PROJECT_ID} from '../test/integration/util/emulator_settings';
 
 const argv = yargs.options({
   main: {
@@ -58,9 +57,8 @@ let args = [
 
 if (argv.emulator) {
   process.env.FIRESTORE_EMULATOR_PORT = '8080';
-  process.env.FIRESTORE_EMULATOR_PROJECT_ID = EMULATOR_PROJECT_ID;
+  process.env.FIRESTORE_EMULATOR_PROJECT_ID = 'test-emulator';
 }
-export const ALT_PROJECT_ID = 'test-db2';
 
 if (argv.persistence) {
   process.env.USE_MOCK_PERSISTENCE = 'YES';

integration/firestore/bundle_test_data/rollup.config.js

@@ -26,8 +26,7 @@ import {
   withTestCollection,
   withTestDb
 } from '../util/helpers';
-import { DEFAULT_PROJECT_ID } from '../util/settings';
-import { ALT_PROJECT_ID } from '../util/emulator_settings';
+import { ALT_PROJECT_ID, DEFAULT_PROJECT_ID } from '../util/settings';
 
 const FieldPath = firebaseExport.FieldPath;
 const FieldValue = firebaseExport.FieldValue;

integration/firestore/bundle_test_data/tsconfig.json

@@ -16,9 +16,12 @@
  */
 
 import * as firestore from '@firebase/firestore-types';
-import { DEFAULT_PROJECT_ID, DEFAULT_SETTINGS } from './settings';
+import {
+  ALT_PROJECT_ID,
+  DEFAULT_PROJECT_ID,
+  DEFAULT_SETTINGS
+} from './settings';
 import * as firebaseExport from './firebase_export';
-import { ALT_PROJECT_ID } from './emulator_settings';
 
 const newTestFirestore = firebaseExport.newTestFirestore;
 

integration/firestore/gulpfile.js

@@ -29,7 +29,7 @@ declare const __karma__: any;
 const PROJECT_CONFIG = require('../../../../../config/project.json');
 
 const EMULATOR_PORT = process.env.FIRESTORE_EMULATOR_PORT;
-export const EMULATOR_PROJECT_ID = process.env.FIRESTORE_EMULATOR_PROJECT_ID;
+const EMULATOR_PROJECT_ID = process.env.FIRESTORE_EMULATOR_PROJECT_ID;
 export const USE_EMULATOR = !!EMULATOR_PORT;
 
 const EMULATOR_FIRESTORE_SETTING = {
@@ -59,3 +59,4 @@ function getDefaultSettings(): firestore.Settings {
 export const DEFAULT_PROJECT_ID = USE_EMULATOR
   ? EMULATOR_PROJECT_ID
   : PROJECT_CONFIG.projectId;
+export const ALT_PROJECT_ID = 'test-db2';