Fixing broken int tests

firebase · Sep 22, 2017 · a24b786 · a24b786
1 parent 599769d
commit a24b786
Show file tree

Hide file tree

Showing 7 changed files with 593 additions and 9 deletions.
diff --git a/integration/typescript/karma.conf.js b/integration/typescript/karma.conf.js
@@ -21,7 +21,7 @@ const karmaBase = require('../../config/karma.base');
 module.exports = function(config) {
   const karmaConfig = Object.assign({}, karmaBase, {
     // files to load into karma
-    files: [{ pattern: `dist/**/*` }],
+    files: ['test/**/*.test.*'],
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
     frameworks: ['mocha']

diff --git a/integration/typescript/package.json b/integration/typescript/package.json
@@ -3,9 +3,7 @@
   "private": true,
   "version": "0.1.0",
   "scripts": {
-    "pretest": "tsc",
-    "test:browser": "karma start --single-run",
-    "test": "run-p test:browser"
+    "test": "karma start --single-run"
   },
   "dependencies": {
     "firebase": "^4.3.3"

diff --git a/integration/typescript/src/namespace.test.ts → ...gration/typescript/test/namespace.test.ts b/integration/typescript/src/namespace.test.ts → ...gration/typescript/test/namespace.test.ts
diff --git a/integration/typescript/src/typings.d.ts → integration/typescript/test/typings.d.ts b/integration/typescript/src/typings.d.ts → integration/typescript/test/typings.d.ts
diff --git a/integration/typescript/tsconfig.json b/integration/typescript/tsconfig.json
@@ -1,16 +1,15 @@
 {
+  "extends": "../../config/tsconfig.base.json",
   "compileOnSave": false,
   "compilerOptions": {
     "allowJs": true,
+    "declaration": false,
     "module": "commonjs",
     "moduleResolution": "node",
     "noImplicitAny": true,
     "outDir": "dist",
     "target": "ES5",
-    "sourceMap": true,
-    "typeRoots" : [
-      "node_modules/@types"
-    ]
+    "sourceMap": true
   },
   "exclude": [
     "node_modules",