Merge pull request #132 from marco-c/update_selenium_webdriver

Update selenium webdriver

Author: marco-c

.travis.yml

@@ -7,8 +7,8 @@ env:
     - MOZ_XVFB=$(if [[ $TRAVIS_OS_NAME == "linux" ]]; then echo 1; fi)
   matrix:
     - NODE_VERSION="0.12"
-    - NODE_VERSION="4" FIREFOX="all" CHROME="nightly"
-    - NODE_VERSION="stable" FIREFOX="all" CHROME="nightly"
+    - NODE_VERSION="4" CHROME="nightly"
+    - NODE_VERSION="stable" CHROME="nightly"
 before_install:
   - rm -rf ~/.nvm
   - git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`)

README.md

@@ -3,7 +3,7 @@
 
 Supports Firefox 44+ and Chromium/Chrome 42+.
 Notifications with payloads are supported in Firefox 44+ and Chromium/Chrome 50+.
-[VAPID](https://tools.ietf.org/html/draft-thomson-webpush-vapid-02) is supported in Firefox 45+ (for notifications without payloads) and in Firefox 46+ for all notifications.
+[VAPID](https://tools.ietf.org/html/draft-thomson-webpush-vapid-02) is supported in Firefox 45+ (for notifications without payloads).
 
 [![NPM](https://nodei.co/npm/web-push.svg?downloads=true)](https://www.npmjs.com/package/web-push)
 

package.json

@@ -39,7 +39,7 @@
     "mocha": "^2.4.5",
     "portfinder": "^1.0.2",
     "request": "^2.69.0",
-    "selenium-webdriver": "2.52.0",
+    "selenium-webdriver": "^2.53.1",
     "semver": "^5.1.0",
     "temp": "^0.8.3"
   }

test/server.js

@@ -18,7 +18,7 @@ var options = {
   cert: pem,
 };
 
-function createServer(pushPayload, pushTimeout, vapid) {
+function createServer(pushPayload, vapid) {
   var server = https.createServer(options, function(req, res) {
     if (req.method === 'GET') {
       if (req.url === '/') {
@@ -51,40 +51,30 @@ function createServer(pushPayload, pushTimeout, vapid) {
 
         console.log('Push Application Server - Register: ' + obj.endpoint);
 
-        server.clientRegistered = true;
-        if (server.onClientRegistered && server.onClientRegistered()) {
-          return;
-        }
+        console.log('Push Application Server - Send notification to ' + obj.endpoint);
 
-        setTimeout(function() {
-          console.log('Push Application Server - Send notification to ' + obj.endpoint);
-
-          var promise;
-          if (!pushPayload) {
-            promise = webPush.sendNotification(obj.endpoint, {
-              TTL: pushTimeout ? 200 : undefined,
-              vapid: vapid,
-            });
-          } else {
-            promise = webPush.sendNotification(obj.endpoint, {
-              TTL: pushTimeout ? 200 : undefined,
-              payload: pushPayload,
-              userPublicKey: obj.key,
-              userAuth: obj.auth,
-              vapid: vapid,
-            });
-          }
-
-          promise
-          .then(function() {
-            console.log('Push Application Server - Notification sent to ' + obj.endpoint);
-
-            server.notificationSent = true;
-            if (server.onNotificationSent) {
-              server.onNotificationSent();
-            }
+        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,
           });
-        }, pushTimeout * 1000);
+        }
+
+        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);
+        })
       });
 
       res.writeHead(200, {
@@ -106,9 +96,6 @@ function createServer(pushPayload, pushTimeout, vapid) {
     server.listen(server.port);
   });
 
-  server.notificationSent = false;
-  server.clientRegistered = false;
-
   return new Promise(function(resolve, reject) {
     server.on('listening', function() {
       resolve(server);