WIP: refactor(database): Add migrated test harness [Part 3/3]

.gitignore

@@ -4,6 +4,6 @@
 npm-debug.log
 /coverage
 /.nyc_output
-/tests/integration/config
+/tests/config
 /temp
 /.vscode

gulp/config.js

@@ -30,6 +30,7 @@ module.exports = {
         'tests/**/*.test.ts',
         '!tests/**/browser/**/*.test.ts',
         '!tests/**/binary/**/*.test.ts',
+        '!src/firebase-*.ts',
       ],
       binary: [
         'tests/**/binary/**/*.test.ts',
@@ -45,7 +46,6 @@ module.exports = {
   babel: {
     plugins: [
       require('babel-plugin-add-module-exports'),
-      require('babel-plugin-minify-dead-code-elimination')
     ],
     presets: [
       [require('babel-preset-env'), {

gulp/tasks/build.js

@@ -134,6 +134,7 @@ function compileIndvES2015ModulesToBrowser() {
       'firebase-app': './src/app.ts',
       'firebase-storage': './src/storage.ts',
       'firebase-messaging': './src/messaging.ts',
+      'firebase-database': './src/database.ts',
     },
     output: {
       path: path.resolve(__dirname, './dist/browser'),
@@ -192,27 +193,6 @@ function compileIndvES2015ModulesToBrowser() {
     .pipe(gulp.dest(`${config.paths.outDir}/browser`));
 }
 
-function compileSDKES2015ToBrowser() {
-  return gulp.src('./dist/es2015/firebase.js')
-    .pipe(webpackStream({
-      plugins: [
-        new webpack.DefinePlugin({
-          TARGET_ENVIRONMENT: JSON.stringify('browser')
-        })
-      ]
-    }, webpack))
-    .pipe(sourcemaps.init({ loadMaps: true }))
-    .pipe(through.obj(function(file, enc, cb) {
-      // Dont pipe through any source map files as it will be handled
-      // by gulp-sourcemaps
-      var isSourceMap = /\.map$/.test(file.path);
-      if (!isSourceMap) this.push(file);
-      cb();
-    }))
-    .pipe(sourcemaps.write('.'))
-    .pipe(gulp.dest(`${config.paths.outDir}/browser`));
-}
-
 function buildBrowserFirebaseJs() {
   return gulp.src('./dist/browser/*.js')
     .pipe(sourcemaps.init({ loadMaps: true }))
@@ -222,32 +202,18 @@ function buildBrowserFirebaseJs() {
 }
 
 function buildAltEnvFirebaseJs() {
-  const envs = [
-    'browser',
-    'node',
-    'react-native'
-  ];
-
-  const streams = envs.map(env => {
-    const babelConfig = Object.assign({}, config.babel, {
-      plugins: [
-        ['inline-replace-variables', {
-          'TARGET_ENVIRONMENT': env
-        }],
-        ...config.babel.plugins
-      ]
-    });
-    return gulp.src('./dist/es2015/firebase.js')
-      .pipe(sourcemaps.init({ loadMaps: true }))
-      .pipe(babel(babelConfig))
-      .pipe(rename({
-        suffix: `-${env}`
-      }))
-      .pipe(sourcemaps.write('.'))
-      .pipe(gulp.dest(`${config.paths.outDir}/cjs`));
+  const babelConfig = Object.assign({}, config.babel, {
+    plugins: config.babel.plugins
   });
-
-  return merge(streams);
+  return gulp.src([
+      './dist/es2015/firebase-browser.js',
+      './dist/es2015/firebase-node.js',
+      './dist/es2015/firebase-react-native.js',
+    ])
+    .pipe(sourcemaps.init({ loadMaps: true }))
+    .pipe(babel(babelConfig))
+    .pipe(sourcemaps.write('.'))
+    .pipe(gulp.dest(`${config.paths.outDir}/cjs`));
 }
 
 function copyPackageContents() {

gulp/tasks/dev.js

@@ -17,19 +17,18 @@ const gulp = require('gulp');
 const config = require('../config');
 
 // Ensure that the test tasks get set up
-require('./test');
+const testFxns = require('./test');
 
 function watchDevFiles() {
   const stream = gulp.watch([
     `${config.root}/src/**/*.ts`,
-    config.paths.test.unit
-  ], gulp.parallel('test:unit'));
+    'tests/**/*.test.ts'
+  ], testFxns.runBrowserUnitTests(true));
 
-  stream.on('error', () => {});
+  stream.on('error', err => {});
   return stream;
 }
 
 gulp.task('dev', gulp.parallel([
-  'test:unit',
   watchDevFiles
 ]));

gulp/tasks/test.js

@@ -54,26 +54,29 @@ function runNodeBinaryTests() {
 /**
  * Runs all of the browser unit tests in karma
  */
-function runBrowserUnitTests(done) {
-  const karmaConfig = Object.assign({}, config.karma, {
-    // list of files / patterns to load in the browser
-    files: [
-      './+(src|tests)/**/*.ts'
-    ],
-
-    // list of files to exclude from the included globs above
-    exclude: [
-      // we don't want this file as it references files that only exist once compiled
-      `./src/firebase.ts`,
+function runBrowserUnitTests(dev) {
+  return (done) => {
+    const karmaConfig = Object.assign({}, config.karma, {
+      // list of files / patterns to load in the browser
+      files: [
+        './+(src|tests)/**/*.ts'
+      ],
+
+      // list of files to exclude from the included globs above
+      exclude: [
+        // we don't want this file as it references files that only exist once compiled
+        `./src/firebase-*.ts`,
 
-      // Don't include node test files
-      './tests/**/node/**/*.test.ts',
+        // Don't include node test files
+        './tests/**/node/**/*.test.ts',
 
-      // Don't include binary test files
-      './tests/**/binary/**/*.test.ts',
-    ],
-  });
-  new karma.Server(karmaConfig, done).start();
+        // Don't include binary test files
+        './tests/**/binary/**/*.test.ts',
+      ],
+      browsers: !!dev ? ['ChromeHeadless'] : config.karma.browsers,
+    });
+    new karma.Server(karmaConfig, done).start();
+  };
 }
 
 /**
@@ -121,9 +124,9 @@ function runAllKarmaTests(done) {
 }
 
 gulp.task('test:unit:node', runNodeUnitTests);
-gulp.task('test:unit:browser', runBrowserUnitTests);
+gulp.task('test:unit:browser', runBrowserUnitTests());
 
-const unitTestSuite = gulp.parallel(runNodeUnitTests, runBrowserUnitTests);
+const unitTestSuite = gulp.parallel(runNodeUnitTests, runBrowserUnitTests());
 gulp.task('test:unit', unitTestSuite);
 
 gulp.task('test:binary:browser', runBrowserBinaryTests);
@@ -137,3 +140,6 @@ gulp.task('test', gulp.parallel([
   runNodeBinaryTests,
   runAllKarmaTests
 ]));
+
+exports.runNodeUnitTests = runNodeUnitTests;
+exports.runBrowserUnitTests = runBrowserUnitTests;

src/database.ts

@@ -0,0 +1,73 @@
+/**
+* Copyright 2017 Google Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import firebase from './app';
+import { FirebaseApp, FirebaseNamespace } from "./app/firebase_app";
+import { Database } from "./database/api/Database";
+import { Query } from "./database/api/Query";
+import { Reference } from "./database/api/Reference";
+import { enableLogging } from "./database/core/util/util";
+import { RepoManager } from "./database/core/RepoManager";
+import * as INTERNAL from './database/api/internal';
+import * as TEST_ACCESS from './database/api/test_access';
+import { isNodeSdk } from "./utils/environment";
+
+export function registerDatabase(instance) {
+  // Register the Database Service with the 'firebase' namespace.
+  const namespace = instance.INTERNAL.registerService(
+    'database',
+    app => RepoManager.getInstance().databaseFromApp(app),
+    // firebase.database namespace properties
+    {
+      Reference,
+      Query,
+      Database,
+      enableLogging,
+      INTERNAL,
+      ServerValue: Database.ServerValue,
+      TEST_ACCESS
+    }
+  );
+
+  if (isNodeSdk()) {
+    module.exports = namespace;
+  }
+}
+
+/**
+ * Extensions to the FirebaseApp and FirebaseNamespaces interfaces
+ */
+declare module './app/firebase_app' {
+  interface FirebaseApp {
+    database?(): Database
+  }
+}
+
+declare module './app/firebase_app' {
+  interface FirebaseNamespace {
+    database?: {
+      (app?: FirebaseApp): Database,
+      Database,
+      enableLogging,
+      INTERNAL,
+      Query,
+      Reference,
+      ServerValue,
+    }
+  }
+}
+
+registerDatabase(firebase);