fixing some compat tests

Author: Feiyang1

common/api-review/storage.api.md

@@ -6,10 +6,10 @@
 
 import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 import { CompleteFn } from '@firebase/util';
-import { FirebaseApp } from '@firebase/app';
+import { FirebaseApp } from '@firebase/app-exp';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseError } from '@firebase/util';
-import { _FirebaseService } from '@firebase/app';
+import { _FirebaseService } from '@firebase/app-exp';
 import { NextFn } from '@firebase/util';
 import { Provider } from '@firebase/component';
 import { Subscribe } from '@firebase/util';

packages/storage-compat/karma.conf.js

@@ -34,14 +34,6 @@ function getTestFiles(argv) {
   let unitTestFiles = ['test/unit/*'];
   let integrationTestFiles = ['test/integration/*'];
 
-  // if (argv.compat) {
-  //   unitTestFiles = unitTestFiles.filter(
-  //     filename => !filename.includes('.exp.')
-  //   );
-  //   integrationTestFiles = ['test/integration/*compat*'];
-  // } else {
-  //   integrationTestFiles = ['test/integration/*'];
-  // }
   if (argv.unit) {
     return unitTestFiles;
   } else if (argv.integration) {

packages/storage-compat/package.json

@@ -20,7 +20,7 @@
     "test:browser:unit": "karma start --single-run --compat --unit",
     "test:browser:integration": "karma start --single-run --compat --integration",
     "test:browser": "karma start --single-run",
-    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file index.ts --config ../../config/mocharc.node.js",
+    "test:node": "TS_NODE_FILES=true TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --file src/index.ts --config ../../config/mocharc.node.js",
     "test:debug": "karma start --browser=Chrome",
     "prettier": "prettier --write 'src/**/*.ts' 'test/**/*.ts'",
     "add-compat-overloads": "ts-node-script ../../scripts/exp/create-overloads.ts -i ../storage/dist/storage-public.d.ts -o dist/storage-compat/src/index.d.ts -a -r FirebaseStorage:types.FirebaseStorage -r StorageReference:types.Reference -r FirebaseApp:FirebaseAppCompat --moduleToEnhance @firebase/storage"
@@ -35,6 +35,13 @@
     "@firebase/component": "0.5.5",
     "tslib": "^2.1.0"
   },
+  "devDependencies": {
+    "rollup": "2.52.2",
+    "@rollup/plugin-alias": "3.1.2",
+    "@rollup/plugin-json": "4.1.0",
+    "rollup-plugin-typescript2": "0.30.0",
+    "typescript": "4.2.2"
+  },
   "files": [
     "dist"
   ]

packages/storage-compat/test/integration/integration.compat.test.ts renamed to packages/storage-compat/test/integration/integration.test.ts

@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-import firebase from '@firebase/app';
-import '@firebase/auth';
+import firebase from '@firebase/app-compat';
+import '@firebase/auth-compat';
 
 // See https://github.com/typescript-eslint/typescript-eslint/issues/363
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import * as storage from '@firebase/storage-types';
 
 import { expect } from 'chai';
-import '../../index';
+import '../../src/index';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const PROJECT_CONFIG = require('../../../../config/project.json');

packages/storage-compat/test/setup.ts

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright 2019 Google LLC
+ *
+ * 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 { use } from 'chai';
+import { restore } from 'sinon';
+import * as sinonChai from 'sinon-chai';
+import * as chaiAsPromised from 'chai-as-promised';
+
+use(chaiAsPromised);
+use(sinonChai);
+
+afterEach(async () => {
+  restore();
+});

packages/storage-compat/test/unit/index.compat.test.ts renamed to packages/storage-compat/test/unit/index.test.ts

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 import { expect } from 'chai';
-import '../../index';
-import firebase from '@firebase/app';
+import '../../src/index';
+import firebase from '@firebase/app-compat';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { StorageServiceCompat } from '../../compat/service';
-import { FirebaseStorageImpl } from '../../../storage/src/service';
+import { StorageServiceCompat } from '../../src/service';
+import { _FirebaseStorageImpl } from '@firebase/storage';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const PROJECT_CONFIG = require('../../../../config/project.json');
@@ -39,7 +39,7 @@ describe('Firebase Storage > API', () => {
     });
     const storage = firebase.storage!();
     expect(
-      ((storage as StorageServiceCompat)._delegate as FirebaseStorageImpl)
+      ((storage as StorageServiceCompat)._delegate as _FirebaseStorageImpl)
         ._bucket?.bucket
     ).to.equal(STORAGE_BUCKET);
     await app.delete();
@@ -53,7 +53,7 @@ describe('Firebase Storage > API', () => {
     });
     const storage = firebase.storage!(app, 'gs://foo-bar.appspot.com');
     expect(
-      ((storage as StorageServiceCompat)._delegate as FirebaseStorageImpl)
+      ((storage as StorageServiceCompat)._delegate as _FirebaseStorageImpl)
         ._bucket?.bucket
     ).to.equal(STORAGE_BUCKET);
     await app.delete();