Merge branch 'master' of https://github.com/marco-c/web-push into no_profile_path

Author: marco-c

test/index.html

@@ -13,46 +13,42 @@
   });
 }
 
-var serverAddress;
+navigator.serviceWorker.ready
+.then(function(reg) {
+  var channel = new MessageChannel();
+  channel.port1.onmessage = function(e) {
+    window.document.title = e.data;
+  }
+  reg.active.postMessage('setup', [channel.port2]);
 
-function go() {
-  navigator.serviceWorker.ready
-  .then(function(reg) {
-    var channel = new MessageChannel();
-    channel.port1.onmessage = function(e) {
-      window.document.title = e.data;
-    }
-    reg.active.postMessage('setup', [channel.port2]);
-
-    return reg.pushManager.getSubscription()
-    .then(function(subscription) {
-      if (!subscription) {
-        return reg.pushManager.subscribe({ userVisibleOnly: true })
-        .then(function(subscription) {
-          return subscription;
-        });
-      } else {
-        return subscription;
-      }
-    });
-  })
+  return reg.pushManager.getSubscription()
   .then(function(subscription) {
-    var key = subscription.getKey ? subscription.getKey('p256dh') : '';
-    var auth = subscription.getKey ? subscription.getKey('auth') : '';
+    if (!subscription) {
+      return reg.pushManager.subscribe({ userVisibleOnly: true })
+      .then(function(subscription) {
+        return subscription;
+      });
+    } else {
+      return subscription;
+    }
+  });
+})
+.then(function(subscription) {
+  var key = subscription.getKey ? subscription.getKey('p256dh') : '';
+  var auth = subscription.getKey ? subscription.getKey('auth') : '';
 
-    return fetch(serverAddress, {
-      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))) : '',
-      }),
-    });
+  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))) : '',
+    }),
   });
-}
+});
 </script>
 </body>
 </html>

test/selenium-init.js

@@ -46,6 +46,7 @@ function unzip(dir, file) {
 var destDir = 'test_tools';
 var stableDestDir = 'test_tools/stable';
 var betaDestDir = 'test_tools/beta';
+var auroraDestDir = 'test_tools/aurora';
 
 try {
   fs.mkdirSync(destDir);
@@ -62,6 +63,11 @@ try {
 } catch (e) {
 }
 
+try {
+  fs.mkdirSync(auroraDestDir);
+} catch (e) {
+}
+
 if (process.platform !== 'linux' && process.platform !== 'darwin') {
   throw new Error('Platform ' + process.platform + ' not supported.');
 }
@@ -204,6 +210,10 @@ function downloadFirefoxBeta() {
   return downloadFirefoxFromDMO('firefox-beta-latest', betaDestDir);
 }
 
+function downloadFirefoxAurora() {
+  return downloadFirefoxFromDMO('firefox-aurora-latest', auroraDestDir);
+}
+
 // Download Chrome Canary
 
 var chromePlatform, chromeZipPlatform;
@@ -273,6 +283,7 @@ module.exports = {
   downloadFirefoxNightly: downloadFirefoxNightly,
   downloadFirefoxRelease: downloadFirefoxRelease,
   downloadFirefoxBeta: downloadFirefoxBeta,
+  downloadFirefoxAurora: downloadFirefoxAurora,
   downloadChromiumNightly: downloadChromiumNightly,
   downloadChromeDriver: downloadChromeDriver,
 };

test/testSelenium.js

@@ -36,7 +36,7 @@ suite('selenium', function() {
 
   this.timeout(180000);
 
-  var firefoxStableBinaryPath, firefoxBetaBinaryPath, firefoxNightlyBinaryPath, chromeBinaryPath;
+  var firefoxStableBinaryPath, firefoxBetaBinaryPath, firefoxAuroraBinaryPath, firefoxNightlyBinaryPath, chromeBinaryPath;
   var server, driver;
 
   function runTest(params) {
@@ -46,6 +46,10 @@ suite('selenium', function() {
     } else if (params.browser === 'firefox-beta') {
       params.browser = 'firefox';
       firefoxBinaryPath = firefoxBetaBinaryPath;
+    } else if (params.browser === 'firefox-aurora') {
+      params.browser = 'firefox';
+      firefoxBinaryPath = firefoxAuroraBinaryPath;
+      process.env.SELENIUM_MARIONETTE = true;
     }
 
     process.env.SELENIUM_BROWSER = params.browser;
@@ -90,11 +94,6 @@ suite('selenium', function() {
 
       driver.get('http://127.0.0.1:' + server.port);
 
-      driver.executeScript(function(port) {
-        serverAddress = 'http://127.0.0.1:' + port;
-        go();
-      }, server.port);
-
       return driver.wait(webdriver.until.titleIs(params.payload ? params.payload : 'no payload'), 60000);
     });
   }
@@ -120,6 +119,14 @@ suite('selenium', function() {
 
     promises.push(seleniumInit.downloadFirefoxBeta());
 
+    /*if (process.platform === 'linux') {
+      firefoxAuroraBinaryPath = 'test_tools/aurora/firefox/firefox-bin';
+    } else if (process.platform === 'darwin') {
+      firefoxAuroraBinaryPath = 'test_tools/aurora/Firefox.app/Contents/MacOS/firefox-bin';
+    }
+
+    promises.push(seleniumInit.downloadFirefoxAurora());*/
+
     if (process.platform === 'linux') {
       firefoxNightlyBinaryPath = 'test_tools/firefox/firefox-bin';
     } else if (process.platform === 'darwin') {
@@ -152,8 +159,9 @@ suite('selenium', function() {
 
       try {
         console.log('Using Firefox: ' + firefoxStableBinaryPath);
-        console.log('Version: ' + childProcess.execSync(firefoxStableBinaryPath + ' --version'));
-        console.log('Beta Version: ' + childProcess.execSync(firefoxBetaBinaryPath + ' --version'));
+        console.log('Version: ' + childProcess.execSync(firefoxStableBinaryPath + ' --version').replace('\n', ''));
+        console.log('Beta Version: ' + childProcess.execSync(firefoxBetaBinaryPath + ' --version').replace('\n', ''));
+        console.log('Aurora Version: ' + childProcess.execSync(firefoxAuroraBinaryPath + ' --version').replace('\n', ''));
       } catch (e) {}
 
       if (process.env.GCM_API_KEY && !fs.existsSync(chromeBinaryPath)) {
@@ -162,7 +170,7 @@ suite('selenium', function() {
 
       try {
         console.log('Using Chromium: ' + chromeBinaryPath);
-        console.log('Version: ' + childProcess.execSync(chromeBinaryPath + ' --version'));
+        console.log('Version: ' + childProcess.execSync(chromeBinaryPath + ' --version').replace('\n', ''));
       } catch (e) {}
     });
   });