Uses new token models, adds usePublicVapidKey() and improved integration

tests.

Author: Matt Gaunt

config/karma.base.js

@@ -107,7 +107,7 @@ const config = {
 
   client: {
     mocha: {
-      timeout: 20000,
+      timeout: 3000,
       retries: 3
     },
 
@@ -118,7 +118,7 @@ const config = {
   coverageIstanbulReporter: {
     dir: path.resolve(process.cwd(), 'coverage/browser/%browser%'),
     fixWebpackSourcePaths: true,
-    reports: ['lcovonly']
+    reports: ['html', 'lcovonly']
   }
 };
 

integration/messaging/test/static/manual-test-server.js renamed to integration/messaging/manual-test-server.js

@@ -14,5 +14,8 @@
  * limitations under the License.
  */
 
-const testServer = require('./test-server');
-testServer.start();
+const testServer = require('./test/utils/test-server');
+testServer
+  .start()
+  .then(() => console.log(`Test server: ${testServer.serverAddress}`))
+  .catch(err => console.error(err));

integration/messaging/package.json

@@ -3,9 +3,8 @@
   "private": true,
   "version": "0.2.1",
   "scripts": {
-    "pretest:manual": "node ./download-browsers.js",
-    "test": "echo 'Automated tests temporarily disabled, run `npm run test:manual` to execute these tests'",
-    "test:manual": "mocha --retries 3 --exit"
+    "pretest": "node ./download-browsers.js",
+    "test": "mocha --exit"
   },
   "dependencies": {
     "firebase": "4.9.0"
@@ -17,6 +16,7 @@
     "geckodriver": "^1.8.0",
     "mocha": "^4.0.1",
     "node-fetch": "^1.7.2",
-    "selenium-assistant": "^5.1.0"
+    "selenium-assistant": "^5.2.0",
+    "sinon": "^4.1.3"
   }
 }