Merge pull request #166 from gauntface/test-errors

Makes tests fail faster with helpful errors

Author: marco-c

.travis.yml

@@ -9,6 +9,7 @@ addons:
     packages:
       - google-chrome-stable
       - google-chrome-beta
+      - google-chrome-unstable
 env:
   global:
     - DISPLAY=$(if [[ $TRAVIS_OS_NAME == "linux" ]]; then echo ':99.0'; fi)

test/browser-managers/chrome-browsers.js

@@ -23,17 +23,25 @@ function ChromeBrowsers() {
       'Contents/MacOS/Google Chrome Beta';
   }
 
+  var chromeUnstablePath;
+  if (process.platform === 'linux') {
+    chromeUnstablePath = which.sync('google-chrome-unstable');
+  } else if (process.platform === 'darwin') {
+    chromeUnstablePath = '/Applications/Google Chrome Canary.app/' +
+      'Contents/MacOS/Google Chrome Canary';
+  }
+
   var chromiumPath
   if (process.platform === 'linux') {
     chromiumPath = 'test_tools/chrome-linux/chrome';
   } else if (process.platform === 'darwin') {
     chromiumPath = 'test_tools/chrome-mac/Chromium.app/Contents/MacOS/Chromium';
   }
 
-  this.downloadBrowsers = function() {
+  this.downloadDependencies = function() {
     return Promise.all([
-      seleniumInit.downloadChromiumNightly(),
-      seleniumInit.downloadChromeDriver(),
+      // seleniumInit.downloadChromiumNightly(),
+      seleniumInit.downloadChromeDriver()
     ]);
   }
 
@@ -46,6 +54,9 @@ function ChromeBrowsers() {
       case 'chrome-beta':
         chromeBinaryPath = chromeBetaPath;
         break;
+      case 'chrome-unstable':
+        chromeBinaryPath = chromeUnstablePath;
+        break;
       case 'chromium':
         chromeBinaryPath = chromiumPath;
         break;

test/browser-managers/firefox-browsers.js

@@ -36,7 +36,7 @@ function FirefoxBrowsers() {
     throw new Error('Firefox binary doesn\'t exist at ' + firefoxBetaBinaryPath + '.'.bold.red);
   }*/
 
-  this.downloadBrowsers = function() {
+  this.downloadDependencies = function() {
     return seleniumInit.downloadFirefoxRelease();
     // promises.push(seleniumInit.downloadFirefoxBeta());
     // promises.push(seleniumInit.downloadFirefoxAurora());

test/data/demo/index.html

@@ -11,7 +11,7 @@
     return;
   }
 
-  navigator.serviceWorker.register('service-worker.js')
+  return navigator.serviceWorker.register('service-worker.js')
   .then(function(registration) {
     console.log('service worker registered');
     return navigator.serviceWorker.ready;
@@ -26,20 +26,18 @@
     return reg.pushManager.subscribe({ userVisibleOnly: true });
   })
   .then(function(subscription) {
+    window.subscribeSuccess = true;
     var key = subscription.getKey ? subscription.getKey('p256dh') : '';
     var auth = subscription.getKey ? subscription.getKey('auth') : '';
-
-    return fetch('/', {
-      method: 'post',
-      headers: {
-        'Content-type': 'application/json'
-      },
-      body: JSON.stringify({
-        endpoint: subscription.endpoint,
-        key: key ? btoa(String.fromCharCode.apply(null, new Uint8Array(key))) : '',
-        auth: auth ? btoa(String.fromCharCode.apply(null, new Uint8Array(auth))) : '',
-      }),
-    });
+    window.testSubscription = {
+      endpoint: subscription.endpoint,
+      key: key ? btoa(String.fromCharCode.apply(null, new Uint8Array(key))) : '',
+      auth: auth ? btoa(String.fromCharCode.apply(null, new Uint8Array(auth))) : '',
+    };
+  })
+  .catch(function(err) {
+    window.subscribeSuccess = false;
+    window.subscribeError = err;
   });
 })();
 </script>

test/helpers/create-server.js

@@ -3,34 +3,6 @@ var portfinder = require('portfinder');
 var fs = require('fs');
 var path = require('path');
 
-function sendWebPush(webPush, obj, pushPayload, vapid) {
-  // console.log('Push Application Server - Register: ' + obj.endpoint);
-  // console.log('Push Application Server - Send notification to ' + obj.endpoint);
-
-  var promise;
-  if (!pushPayload) {
-    promise = webPush.sendNotification(obj.endpoint, {
-      vapid: vapid,
-    });
-  } else {
-    promise = webPush.sendNotification(obj.endpoint, {
-      payload: pushPayload,
-      userPublicKey: obj.key,
-      userAuth: obj.auth,
-      vapid: vapid,
-    });
-  }
-
-  promise
-  .then(function() {
-    //console.log('Push Application Server - Notification sent to ' + obj.endpoint);
-  })
-  .catch(function(error) {
-    console.log('Push Application Server - Error in sending notification to ' + obj.endpoint);
-    console.log(error);
-  })
-}
-
 function createServer(options, webPush) {
   var demoPath = 'test/data/demo';
   var pushPayload = null;
@@ -62,22 +34,7 @@ function createServer(options, webPush) {
         });
         res.end(data);
       } else {
-        var body = '';
-
-        req.on('data', function(chunk) {
-          body += chunk;
-        })
-
-        req.on('end', function() {
-          sendWebPush(webPush, JSON.parse(body), pushPayload, vapid);
-        });
-
-        res.writeHead(200, {
-          'Content-Type': 'application/json',
-          'Access-Control-Allow-Origin': '*',
-          'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept',
-        });
-        res.end('ok');
+        throw new Error('Unable to handle post requests.');
       }
     } catch (err) {
       console.error('An error occured handling request.', err);

test/testSelenium.js

@@ -1,3 +1,4 @@
+var assert = require('assert');
 var webPush = require('../index');
 var createServer = require('./helpers/create-server');
 var isPortOpen = require('./helpers/port-open');
@@ -31,8 +32,8 @@ suite('selenium', function() {
     this.timeout(0);
 
     var promises = [];
-    promises.push(firefoxBrowsers.downloadBrowsers());
-    promises.push(chromeBrowsers.downloadBrowsers());
+    promises.push(firefoxBrowsers.downloadDependencies());
+    promises.push(chromeBrowsers.downloadDependencies());
 
     return Promise.all(promises)
     .then(function() {
@@ -83,6 +84,14 @@ suite('selenium', function() {
       // Not the web driver promise of then and thenCatch
       return new Promise(function(resolve, reject) {
         globalDriver.get('http://127.0.0.1:' + globalServer.port)
+        .then(function() {
+          return globalDriver.executeScript(function() {
+            return typeof navigator.serviceWorker !== 'undefined';
+          });
+        })
+        .then(function(serviceWorkerSupported) {
+          assert(serviceWorkerSupported);
+        })
         .then(function() {
           return globalDriver.executeScript(function(port) {
             if (typeof netscape !== 'undefined') {
@@ -94,6 +103,72 @@ suite('selenium', function() {
             }
           }, globalServer.port);
         })
+        .then(function() {
+          return globalDriver.wait(function() {
+            return globalDriver.executeScript(function() {
+              return typeof window.subscribeSuccess !== 'undefined';
+            });
+          });
+        })
+        .then(function() {
+          return globalDriver.executeScript(function() {
+            if (!window.subscribeSuccess) {
+              return window.subscribeError;
+            }
+
+            return null;
+          });
+        })
+        .then(function(subscribeError) {
+          if (subscribeError) {
+            throw subscribeError;
+          }
+
+          return globalDriver.executeScript(function() {
+            return window.testSubscription;
+          });
+        })
+        .then(function(subscription) {
+          if (!subscription) {
+            throw new Error('No subscription found.');
+          }
+
+          // console.log('Push Application Server - Register: ' + obj.endpoint);
+          // console.log('Push Application Server - Send notification to ' + obj.endpoint);
+
+          var promise;
+          var pushPayload = null;
+          var vapid = null;
+          if (options) {
+            pushPayload = options.payload;
+            vapid = options.vapid;
+          }
+
+          if (!pushPayload) {
+            promise = webPush.sendNotification(subscription.endpoint, {
+              vapid: vapid,
+            });
+          } else {
+            promise = webPush.sendNotification(subscription.endpoint, {
+              payload: pushPayload,
+              userPublicKey: subscription.key,
+              userAuth: subscription.auth,
+              vapid: vapid,
+            });
+          }
+
+          return promise
+          .then(function(response) {
+            if (response.length > 0) {
+              var data = JSON.parse(response);
+              if (typeof data.failure !== 'undefined' && data.failure > 0) {
+                throw new Error('Bad GCM Response: ' + response);
+              }
+            }
+
+            //console.log('Push Application Server - Notification sent to ' + obj.endpoint);
+          });
+        })
         .then(function() {
           var expectedTitle = options.payload ? options.payload : 'no payload';
           return globalDriver.wait(webdriver.until.titleIs(expectedTitle, 60000));