Improve build and test tooling

Polymer · Nov 18, 2016 · 4e50281 · 4e50281
1 parent 25acb61
commit 4e50281
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,5 @@ language: node_js
 node_js:
   - "4"
   - "6"
-sudo: false
-before_install:
-  - npm install -g npm
-before_script:
-  - npm install
-  - npm run build
 script:
   - npm test
diff --git a/custom_typings/types_for_deps.d.ts b/custom_typings/types_for_deps.d.ts
@@ -0,0 +1,3 @@
+// One of our deps references XHR despite being a node library. -.-
+
+interface XMLHttpRequest {}
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "scripts": {
     "start": "./bin/polyserve",
     "build": "tsc",
-    "test": "(tsc; gulp test)",
+    "test": "npm run build && mocha",
     "test:watch": "watchy -w src/ -- npm test",
     "format": "find src test | grep '\\.js$\\|\\.ts$' | xargs clang-format --style=file -i"
   },
@@ -48,12 +48,9 @@
     "@types/tmp": "0.0.31",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
-    "gulp": "^3.9.1",
-    "gulp-mocha": "^2.2.0",
-    "gulp-spawn-mocha": "^3.1.0",
-    "istanbul": "^0.4.5",
     "mocha": "^3.1.0",
     "sinon": "^1.17.5",
+    "source-map-support": "^0.4.6",
     "supertest": "^1.2.0",
     "tmp": "0.0.28",
     "typescript": "^2.0.3",

diff --git a/src/test/start_server_test.ts b/src/test/start_server_test.ts
@@ -234,7 +234,7 @@ suite('startServer', () => {
       }
     }
 
-    let createServerStub: Sinon.SinonStub;
+    let createServerStub: sinon.SinonStub;
     function _setupStubServer() {
       _stubServer =
           sinon.createStubInstance(http['Server']) as any as http.Server;

diff --git a/test/mocha.opts b/test/mocha.opts
@@ -0,0 +1,3 @@
+--ui tdd
+--require source-map-support/register
+lib/test/*_test.js lib/test/**/*_test.js