From c3a41445609639c11369a84ff38769e788545769 Mon Sep 17 00:00:00 2001
From: Matt Gaunt <matt@gauntface.co.uk>
Date: Thu, 31 Mar 2016 18:05:55 +0100
Subject: [PATCH] Moving stub to support actually running on FF if the
 appropriate API's work and moving back to Notification API to get FF support
 back on the roadmap

---
 README.md                                     |   2 +-
 package.json                                  |   2 +-
 src/client/push-client.js                     |  31 +-
 src/client/subscription-failed-error.js       |   4 +-
 test/automated-suite.js                       |  32 +-
 test/browser-tests/index.html                 |  29 +-
 test/browser-tests/push-client/constructor.js | 112 +++
 .../push-client/get-permission-state.js       |  73 ++
 .../push-client/get-registration.js           |  69 ++
 .../push-client/get-subscription.js           | 104 +++
 .../browser-tests/push-client/is-supported.js |  35 +
 .../{push-client-lib.js => lib-usage.js}      |   0
 .../push-client/push-client-methods.js        | 702 ------------------
 .../push-client/request-permission.js         | 145 ++++
 .../push-client/status-change-event.js        | 119 +++
 test/browser-tests/push-client/subscribe.js   | 189 +++++
 test/browser-tests/push-client/unsubscribe.js | 163 ++++
 test/data/demos/just-subscribe.html           |   2 +-
 test/data/demos/sw.js                         |   0
 test/libs/helper-functions.js                 |  53 --
 test/libs/is-supported.js                     |  24 +
 test/libs/state-stub-singleton.js             |  51 ++
 test/libs/state-stub.js                       |  82 --
 test/libs/stubs/base-stub.js                  |  42 ++
 test/libs/stubs/firefox-stub.js               |  74 ++
 test/libs/stubs/full-stub.js                  | 120 +++
 26 files changed, 1395 insertions(+), 864 deletions(-)
 create mode 100644 test/browser-tests/push-client/constructor.js
 create mode 100644 test/browser-tests/push-client/get-permission-state.js
 create mode 100644 test/browser-tests/push-client/get-registration.js
 create mode 100644 test/browser-tests/push-client/get-subscription.js
 create mode 100644 test/browser-tests/push-client/is-supported.js
 rename test/browser-tests/push-client/{push-client-lib.js => lib-usage.js} (100%)
 delete mode 100644 test/browser-tests/push-client/push-client-methods.js
 create mode 100644 test/browser-tests/push-client/request-permission.js
 create mode 100644 test/browser-tests/push-client/status-change-event.js
 create mode 100644 test/browser-tests/push-client/subscribe.js
 create mode 100644 test/browser-tests/push-client/unsubscribe.js
 create mode 100644 test/data/demos/sw.js
 delete mode 100644 test/libs/helper-functions.js
 create mode 100644 test/libs/is-supported.js
 create mode 100644 test/libs/state-stub-singleton.js
 delete mode 100644 test/libs/state-stub.js
 create mode 100644 test/libs/stubs/base-stub.js
 create mode 100644 test/libs/stubs/firefox-stub.js
 create mode 100644 test/libs/stubs/full-stub.js

diff --git a/README.md b/README.md
index d01a3fb..b869f13 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ To use the Propel library do the following:
     var PropelClient = window.goog.propel.PropelClient;
 
     // Check if push is supported by the current browsers
-    if (PropelClient.supported()) {
+    if (PropelClient.isSupported()) {
       // Initialise Push Client
       var propelClient = new PropelClient('/sw.js');
       propelClient.addEventListener('statuschange', function(event) {
diff --git a/package.json b/package.json
index 53a5dbe..db27bba 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "require-dir": "^0.3.0",
     "rollupify": "^0.2.0",
     "run-sequence": "^1.1.5",
-    "selenium-webdriver": "^2.52.0",
+    "selenium-webdriver": "^2.53.1",
     "sinon": "^1.17.3",
     "sw-testing-helpers": "0.0.6",
     "vinyl-buffer": "^1.0.0",
diff --git a/src/client/push-client.js b/src/client/push-client.js
index 866d6f7..e23f50b 100644
--- a/src/client/push-client.js
+++ b/src/client/push-client.js
@@ -19,7 +19,6 @@ import EventDispatch from './event-dispatch';
 const SUPPORTED = 'serviceWorker' in navigator &&
     'PushManager' in window &&
     'Notification' in window &&
-    'permissions' in navigator &&
     'showNotification' in ServiceWorkerRegistration.prototype;
 
 const ERROR_MESSAGES = {
@@ -78,7 +77,7 @@ export default class PushClient extends EventDispatch {
   constructor(workerUrlOrRegistration, scope) {
     super();
 
-    if (!PushClient.supported()) {
+    if (!PushClient.isSupported()) {
       throw new Error('Your browser does not support the web push API');
     }
 
@@ -106,14 +105,16 @@ export default class PushClient extends EventDispatch {
 
   _dispatchStatusUpdate() {
     return Promise.all([
-      this.getSubscription(),
+      this.getSubscription().catch(() => {
+        return null;
+      }),
       PushClient.getPermissionState()
     ])
     .then(results => {
       return {
         isSubscribed: (results[0] !== null),
         currentSubscription: results[0],
-        permissionState: results[1].state
+        permissionState: results[1]
       };
     })
     .then(status => {
@@ -187,6 +188,12 @@ export default class PushClient extends EventDispatch {
     })
     .then(() => {
       this._dispatchStatusUpdate();
+    })
+    .catch(err => {
+      return this._dispatchStatusUpdate()
+      .then(() => {
+        throw err;
+      });
     });
   }
 
@@ -223,13 +230,17 @@ export default class PushClient extends EventDispatch {
   /**
    * Will manage requesting permission for push messages, resolving
    * with the final permission status.
+   * @param {Boolean} dispatchStatusChange - Optional parameter with a
+   * default value of true. If true, a `statuschange` event will be
+   * dispatched once the permission state has resolved (i.e. use interacted
+   * with the permission dialog).
    * @return {Promise<String>} Permission status of granted, default or denied
    */
   requestPermission(dispatchStatusChange = true) {
     return PushClient.getPermissionState()
     .then(permissionState => {
       // Check if requesting permission will show a prompt
-      if (permissionState.state === 'prompt') {
+      if (permissionState === 'default') {
         this.dispatchEvent(new PushClientEvent('requestingpermission'));
       }
 
@@ -248,17 +259,19 @@ export default class PushClient extends EventDispatch {
    * @return {Boolean} Whether the current browser has everything needed
    *  to use push messaging.
    */
-  static supported() {
+  static isSupported() {
     return SUPPORTED;
   }
 
   /**
    * This method can be used to check if subscribing the user will display
    * the permission dialog or not.
-   * @return {Promise<PermissionStatus>} PermistionStatus.state will be
-   * 'granted', 'denied' or 'prompt' to reflect the current permission state
+   * @return {Promise<PermissionStatus>} PermistionStatus will be
+   * 'granted', 'denied' or 'default' to reflect the current permission state
    */
   static getPermissionState() {
-    return navigator.permissions.query({name: 'push', userVisibleOnly: true});
+    return new Promise(resolve => {
+      resolve(Notification.permission);
+    });
   }
 }
diff --git a/src/client/subscription-failed-error.js b/src/client/subscription-failed-error.js
index 25fc29e..7383a90 100644
--- a/src/client/subscription-failed-error.js
+++ b/src/client/subscription-failed-error.js
@@ -13,8 +13,8 @@
 
 const MESSAGES = {
   'not supported': 'Your browser doesn\'t support push messaging.',
-  'blocked': 'The user denied permission to show notifications.',
-  'prompt': 'The user dismissed the notification permission dialog.',
+  'denied': 'The user denied permission to show notifications.',
+  'default': 'The user dismissed the notification permission dialog.',
   'endpoint': 'No endpoint URL specified.',
   'nogcmid': 'Please ensure you have a Web App Manifest with ' +
     'a "gcm_sender_id" defined.'
diff --git a/test/automated-suite.js b/test/automated-suite.js
index 7dc4022..035195c 100644
--- a/test/automated-suite.js
+++ b/test/automated-suite.js
@@ -27,6 +27,7 @@ const path = require('path');
 const swTestingHelpers = require('sw-testing-helpers');
 const testServer = swTestingHelpers.testServer;
 const automatedBrowserTesting = swTestingHelpers.automatedBrowserTesting;
+const seleniumFirefox = require('selenium-webdriver/firefox');
 
 describe('Test Propel', function() {
   // Browser tests can be slow
@@ -57,13 +58,34 @@ describe('Test Propel', function() {
 
   const queueUnitTest = browserInfo => {
     it(`should pass all tests in ${browserInfo.prettyName}`, () => {
+
+      if (browserInfo.seleniumBrowserId === 'firefox') {
+        const ffProfile = new seleniumFirefox.Profile();
+        ffProfile.setPreference('security.turn_off_all_security_so_that_viruses_can_take_over_this_computer', true);
+        browserInfo.seleniumOptions.setProfile(ffProfile);
+      }
+
       globalDriverReference = browserInfo.getSeleniumDriver();
 
-      return automatedBrowserTesting.runMochaTests(
-        browserInfo.prettyName,
-        globalDriverReference,
-        `${testServerURL}/test/browser-tests/`
-      )
+      let initialisePromise = Promise.resolve();
+      if (browserInfo.seleniumBrowserId === 'firefox') {
+        // H/T to web-push for this trick to get permissions accepted / denied
+        // https://github.com/marco-c/web-push
+        initialisePromise = globalDriverReference.executeScript(() => {
+          /* global window, Components */
+          window.netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+          Components.utils.import('resource://gre/modules/Services.jsm');
+        });
+      }
+
+      return initialisePromise
+      .then(() => {
+        return automatedBrowserTesting.runMochaTests(
+          browserInfo.prettyName,
+          globalDriverReference,
+          `${testServerURL}/test/browser-tests/`
+        );
+      })
       .then(testResults => {
         automatedBrowserTesting.manageTestResults(
           browserInfo.prettyName,
diff --git a/test/browser-tests/index.html b/test/browser-tests/index.html
index 82cbb62..fc980b0 100644
--- a/test/browser-tests/index.html
+++ b/test/browser-tests/index.html
@@ -33,18 +33,29 @@
   <script src="/node_modules/chai/chai.js"></script>
   <script src="/node_modules/mocha/mocha.js"></script>
   <script src="/node_modules/sinon/pkg/sinon.js"></script>
+  <script src="/node_modules/sw-testing-helpers/src/in-browser-helpers/sw-utils.js"></script>
 
-  <!-- Helper functions will be under window.testHelper -->
-  <script src="/test/libs/helper-functions.js"></script>
-  <script src="/test/libs/state-stub.js"></script>
+  <script src="/test/libs/is-supported.js"></script>
+  <script src="/test/libs/stubs/base-stub.js"></script>
+  <script src="/test/libs/stubs/firefox-stub.js"></script>
+  <script src="/test/libs/stubs/full-stub.js"></script>
+  <script src="/test/libs/state-stub-singleton.js"></script>
 
   <script>mocha.setup({
     ui: 'bdd'
   })</script>
 
   <!-- In browser test scripts should be added to the page here-->
-  <script src="/test/browser-tests/push-client/push-client-lib.js"></script>
-  <script src="/test/browser-tests/push-client/push-client-methods.js"></script>
+  <script src="/test/browser-tests/push-client/lib-usage.js"></script>
+  <script src="/test/browser-tests/push-client/is-supported.js"></script>
+  <script src="/test/browser-tests/push-client/constructor.js"></script>
+  <script src="/test/browser-tests/push-client/get-registration.js"></script>
+  <script src="/test/browser-tests/push-client/get-permission-state.js"></script>
+  <script src="/test/browser-tests/push-client/get-subscription.js"></script>
+  <script src="/test/browser-tests/push-client/status-change-event.js"></script>
+  <script src="/test/browser-tests/push-client/request-permission.js"></script>
+  <script src="/test/browser-tests/push-client/subscribe.js"></script>
+  <script src="/test/browser-tests/push-client/unsubscribe.js"></script>
 
   <script>
     (function() {
@@ -83,16 +94,18 @@
       // We unregister all service workers, clear all caches and remove
       // All registered iframes
       beforeEach(function() {
-        return testHelper.cleanState();
+        return window.goog.SWHelper.cleanState();
       });
 
       // Clean up after the final test has finished
       after(function() {
-        return testHelper.cleanState();
+        return window.goog.SWHelper.cleanState();
       });
 
       mocha.checkLeaks();
-      mocha.globals(['goog']);
+      // Services is a global that is set if we use Firefox's API to disable
+      // permission prompts
+      mocha.globals(['goog', 'Services']);
       var runResults = mocha.run();
       // pass, fail and end events allow up to capture results and
       // determine when to publish test results
diff --git a/test/browser-tests/push-client/constructor.js b/test/browser-tests/push-client/constructor.js
new file mode 100644
index 0000000..b90dca9
--- /dev/null
+++ b/test/browser-tests/push-client/constructor.js
@@ -0,0 +1,112 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test PushClient Constructor', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  const ERROR_MESSAGES = {
+    'bad constructor': 'The PushClient constructor expects either service ' +
+      'worker registration or the path to a service worker file and an ' +
+      'optional scope string.',
+    'redundant worker': 'Worker became redundant'
+  };
+
+  const getUrlAndScope = function(client) {
+    return client.getRegistration().then(reg => {
+      const sw = reg.installing || reg.waiting || reg.active;
+      return {url: sw.scriptURL, scope: reg.scope};
+    });
+  };
+
+  it('should throw an error for no constructor arguments', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient();
+    }).to.throw(ERROR_MESSAGES['bad constructor']);
+  });
+
+  it('should throw an error for Object in the constructor', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient({});
+    }).to.throw(ERROR_MESSAGES['bad constructor']);
+  });
+
+  it('should throw an error for Array in the constructor', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient([]);
+    }).to.throw(ERROR_MESSAGES['bad constructor']);
+  });
+
+  it('should throw an error for null in the constructor', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient(null);
+    }).to.throw(ERROR_MESSAGES['bad constructor']);
+  });
+
+  it('should throw an error for an empty string in the constructor', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient('');
+    }).to.throw(ERROR_MESSAGES['bad constructor']);
+  });
+
+  it('should be able to create a new push client with just a workerUrl', function() {
+    window.chai.expect(() => {
+      /* eslint no-unused-vars: 0 */
+      var client = new window.goog.propel.PropelClient('/sw.js', null);
+    }).not.to.throw();
+  });
+
+  it('should be able to create a new push client with a workerUrl and scope', function(done) {
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH, './push-service');
+
+    getUrlAndScope(pushClient).then(result => {
+      window.chai.expect(result.url).to.contain(EMPTY_SW_PATH);
+      window.chai.expect(result.scope).to.contain('/test/browser-tests/push-service');
+
+      done();
+    }).catch(done);
+  });
+
+  it('should be able to create a new push client with a service worker registration', function(done) {
+    navigator.serviceWorker.register(EMPTY_SW_PATH)
+    .then(registration => {
+      const pushClient = new window.goog.propel.PropelClient(registration);
+
+      return getUrlAndScope(pushClient).then(result => {
+        window.chai.expect(result.url).to.contain(EMPTY_SW_PATH);
+        window.chai.expect(result.scope).to.contain('/test/browser-tests/push-client');
+
+        done();
+      }).catch(done);
+    })
+    .catch(done);
+  });
+});
diff --git a/test/browser-tests/push-client/get-permission-state.js b/test/browser-tests/push-client/get-permission-state.js
new file mode 100644
index 0000000..3cbe893
--- /dev/null
+++ b/test/browser-tests/push-client/get-permission-state.js
@@ -0,0 +1,73 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test getPermissionState()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should return permission status of granted', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+
+    return window.goog.propel.PropelClient.getPermissionState()
+    .then(permissionState => {
+      permissionState.should.equal('granted');
+    });
+  });
+
+  it('should return permission status of default', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+
+    return window.goog.propel.PropelClient.getPermissionState()
+    .then(permissionState => {
+      permissionState.should.equal('default');
+    });
+  });
+
+  it('should return permission status of denied', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+
+    return window.goog.propel.PropelClient.getPermissionState()
+    .then(permissionState => {
+      permissionState.should.equal('denied');
+    });
+  });
+});
diff --git a/test/browser-tests/push-client/get-registration.js b/test/browser-tests/push-client/get-registration.js
new file mode 100644
index 0000000..b4042d2
--- /dev/null
+++ b/test/browser-tests/push-client/get-registration.js
@@ -0,0 +1,69 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test getRegistration()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should reject due to a bad registration', function(done) {
+    stateStub = window.StateStub.getStub();
+
+    const pushClient = new window.goog.propel.PropelClient('/non-existant/sw.js');
+    pushClient.getRegistration()
+    .then(() => {
+      done(new Error('getRegistration should reject for a bad SW'));
+    })
+    .catch(() => {
+      done();
+    });
+  });
+
+  it('should resolve with a registration', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    return pushClient.getRegistration()
+    .then(reg => {
+      window.chai.expect(reg).to.not.equal(null);
+    });
+  });
+});
diff --git a/test/browser-tests/push-client/get-subscription.js b/test/browser-tests/push-client/get-subscription.js
new file mode 100644
index 0000000..fd32d95
--- /dev/null
+++ b/test/browser-tests/push-client/get-subscription.js
@@ -0,0 +1,104 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test getSubscription()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  const NON_EXISTANT_SW_PATH = '/test/browser-tests/push-client/doesnt-exist.js';
+  const EXAMPLE_SUBSCRIPTION = {
+    endpoint: '/endpoint'
+  };
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should return null when the user isn\'t subscribed', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    return pushClient.getSubscription()
+    .then(subscription => {
+      window.chai.expect(subscription).to.equal(null);
+    });
+  });
+
+  it('should return a subscription when the user is subscribed', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    // Subscribe before we initialise propel to see if it picks up the subscription
+    return navigator.serviceWorker.register(EMPTY_SW_PATH)
+    .then(reg => {
+      return reg.pushManager.subscribe({userVisibleOnly: true});
+    })
+    .then(subscription => {
+      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+      return pushClient.getSubscription()
+      .then(innerSubscription => {
+        window.chai.expect(innerSubscription.endpoint).to.equal(subscription.endpoint);
+      });
+    });
+  });
+
+  it('should manage a failing pushManager.getSubscription() call', function(done) {
+    stateStub = window.StateStub.getStub(true);
+    // Empty function will caused an error to be throw
+    stateStub.setUpRegistration();
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.getSubscription()
+    .then(() => {
+      done(new Error('getSubscription should have thrown an error'));
+    })
+    .catch(err => {
+      err.message.should.equal('Test Generated Error');
+      done();
+    });
+  });
+
+  it('should reject the promise when no registration is set', function(done) {
+    stateStub = window.StateStub.getStub();
+
+    const pushClient = new window.goog.propel.PropelClient(NON_EXISTANT_SW_PATH);
+    pushClient.getSubscription()
+    .then(() => done(new Error('getSubscription should reject when no registration is available')))
+    .catch(() => done());
+  });
+});
diff --git a/test/browser-tests/push-client/is-supported.js b/test/browser-tests/push-client/is-supported.js
new file mode 100644
index 0000000..a3ebae0
--- /dev/null
+++ b/test/browser-tests/push-client/is-supported.js
@@ -0,0 +1,35 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test isSupported()', function() {
+  it('should return true or false', function() {
+    (typeof window.goog.propel.PropelClient.isSupported()).should.equal('boolean');
+  });
+
+  // This test is useful to make sure that the test runner is
+  // running the same check as the client.
+  it('should match the test runners supported check', function() {
+    window.goog.propel.PropelClient.isSupported().should.equal(window.isPropelClientSupported);
+  });
+});
diff --git a/test/browser-tests/push-client/push-client-lib.js b/test/browser-tests/push-client/lib-usage.js
similarity index 100%
rename from test/browser-tests/push-client/push-client-lib.js
rename to test/browser-tests/push-client/lib-usage.js
diff --git a/test/browser-tests/push-client/push-client-methods.js b/test/browser-tests/push-client/push-client-methods.js
deleted file mode 100644
index c5da981..0000000
--- a/test/browser-tests/push-client/push-client-methods.js
+++ /dev/null
@@ -1,702 +0,0 @@
-/*
-  Copyright 2016 Google Inc. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-// This is a test and we want descriptions to be useful, if this
-// breaks the max-length, it's ok.
-
-/* eslint-disable max-len, no-unused-expressions */
-/* eslint-env browser, mocha */
-
-'use strict';
-
-describe('Test PushClient Methods', () => {
-  let stateStub;
-
-  const EXAMPLE_SUBSCRIPTION = {
-    endpoint: '/endpoint'
-  };
-
-  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
-
-  const ERROR_MESSAGES = {
-    'bad constructor': 'The PushClient constructor expects either service ' +
-      'worker registration or the path to a service worker file and an ' +
-      'optional scope string.',
-    'redundant worker': 'Worker became redundant'
-  };
-
-  const buildSWRegistration = subscription => {
-    let innerSubscription = subscription;
-    if (innerSubscription) {
-      innerSubscription.unsubscribe = () => {
-        innerSubscription = null;
-      };
-    }
-    return {
-      scope: './',
-      active: {
-        // This is to skip handling of SW lifecycle.
-      },
-      pushManager: {
-        subscribe: options => {
-          if (!options.userVisibleOnly) {
-            throw new Error('Test Stub Error: User Visible Required');
-          }
-
-          return Promise.resolve(innerSubscription);
-        },
-        getSubscription: () => {
-          if (typeof subscription === 'undefined') {
-            return Promise.reject(new Error('Test Generated Error'));
-          }
-
-          return Promise.resolve(innerSubscription);
-        }
-      }
-    };
-  };
-
-  const getUrlAndScope = function(client) {
-    return client.getRegistration().then(reg => {
-      const sw = reg.installing || reg.waiting || reg.active;
-      return {url: sw.scriptURL, scope: reg.scope};
-    });
-  };
-
-  beforeEach(() => {
-    if (stateStub) {
-      stateStub.restore();
-    }
-  });
-
-  after(() => {
-    if (stateStub) {
-      stateStub.restore();
-    }
-  });
-
-  describe('Test supported()', () => {
-    it('should return true or false', () => {
-      (typeof window.goog.propel.PropelClient.supported()).should.equal('boolean');
-    });
-  });
-
-  // Skip further tests if it's not supported
-  const SUPPORTED = 'serviceWorker' in navigator &&
-      'PushManager' in window &&
-      'Notification' in window &&
-      'permissions' in navigator &&
-      'showNotification' in ServiceWorkerRegistration.prototype;
-  if (!SUPPORTED) {
-    return;
-  }
-
-  describe('Test PushClient construction', () => {
-    it('should throw an error for no constructor arguments', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient();
-      }).to.throw(ERROR_MESSAGES['bad constructor']);
-    });
-
-    it('should throw an error for Object in the constructor', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient({});
-      }).to.throw(ERROR_MESSAGES['bad constructor']);
-    });
-
-    it('should throw an error for Array in the constructor', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient([]);
-      }).to.throw(ERROR_MESSAGES['bad constructor']);
-    });
-
-    it('should throw an error for null in the constructor', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient(null);
-      }).to.throw(ERROR_MESSAGES['bad constructor']);
-    });
-
-    it('should throw an error for an empty string in the constructor', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient('');
-      }).to.throw(ERROR_MESSAGES['bad constructor']);
-    });
-
-    it('should be able to create a new push client with just a workerUrl', () => {
-      window.chai.expect(() => {
-        /* eslint no-unused-vars: 0 */
-        var client = new window.goog.propel.PropelClient('/sw.js', null);
-      }).not.to.throw();
-    });
-
-    it('should be able to create a new push client with a workerUrl and scope', done => {
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH, './push-service');
-
-      getUrlAndScope(pushClient).then(result => {
-        window.chai.expect(result.url).to.contain(EMPTY_SW_PATH);
-        window.chai.expect(result.scope).to.contain('/test/browser-tests/push-service');
-
-        done();
-      }).catch(done);
-    });
-
-    it('should be able to create a new push client with a service worker registration', done => {
-      navigator.serviceWorker.register(EMPTY_SW_PATH)
-      .then(registration => {
-        const pushClient = new window.goog.propel.PropelClient(registration);
-
-        return getUrlAndScope(pushClient).then(result => {
-          window.chai.expect(result.url).to.contain(EMPTY_SW_PATH);
-          window.chai.expect(result.scope).to.contain('/test/browser-tests/push-client');
-
-          done();
-        }).catch(done);
-      })
-      .catch(done);
-    });
-  });
-
-  describe('Test \'statuschange\' event', () => {
-    it('should dispatch a \'statuschange\' event when the constructor is created (permission: prompt, subscription: null)', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('prompt');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-    });
-
-    it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: null)', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('granted');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-    });
-
-    it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: {FAKE})', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('granted');
-        window.chai.expect(event.currentSubscription).to.equal(EXAMPLE_SUBSCRIPTION);
-        window.chai.expect(event.isSubscribed).to.equal(true);
-
-        done();
-      });
-    });
-
-    it('should dispatch a \'statuschange\' event when the constructor is created (permission: blocked, subscription: null)', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('blocked');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-    });
-  });
-
-  describe('Test getRegistration()', () => {
-    it('should resolve with a registration', () => {
-      stateStub = new window.StateStub();
-      stateStub.registration = buildSWRegistration();
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.getRegistration()
-      .then(reg => {
-        window.chai.expect(reg).to.not.equal(null);
-      });
-    });
-
-    it('should resolve with null due to no registration', () => {
-      stateStub = new window.StateStub();
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.getRegistration()
-      .then(reg => {
-        window.chai.expect(reg).to.equal(null);
-      });
-    });
-  });
-
-  describe('Test requestPermission()', () => {
-    it('should dispatch a \'requestingpermission\' event when the permission state is prompt', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('requestingpermission', () => {
-        done();
-      });
-      pushClient.requestPermission();
-    });
-
-    it('should resolve to prompt', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.requestPermission()
-      .then(permissionState => {
-        permissionState.should.equal('prompt');
-      });
-    });
-
-    it('should not dispatch a \'requestingpermission\' event because permission is granted', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('requestingpermission', () => {
-        done(new Error('This should not be called when the state is granted'));
-      });
-      pushClient.requestPermission()
-      .then(() => done());
-    });
-
-    it('should resolve to permission state of granted', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.requestPermission()
-      .then(permissionState => {
-        permissionState.should.equal('granted');
-      });
-    });
-
-    it('should not dispatch a \'requestingpermission\' event because permission is blocked', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('requestingpermission', () => {
-        done(new Error('This should not be called'));
-      });
-      pushClient.requestPermission()
-      .then(() => done());
-    });
-
-    it('should resolve to blocked', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.requestPermission()
-      .then(permissionState => {
-        permissionState.should.equal('blocked');
-      });
-    });
-
-    it('should dispatch a \'statuschange\' event when called directly', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-      stateStub.registration = null;
-
-      let counter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        counter++;
-
-        if (counter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('granted');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.requestPermission();
-    });
-  });
-
-  describe('Test getSubscription()', () => {
-    it('should return null when the user isn\'t subscribed', () => {
-      stateStub = new window.StateStub();
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.getSubscription()
-      .then(subscription => {
-        window.chai.expect(subscription).to.equal(null);
-      });
-    });
-
-    it('should return a subscription when the user is subscribed', () => {
-      stateStub = new window.StateStub();
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      return pushClient.getSubscription()
-      .then(subscription => {
-        window.chai.expect(subscription).to.equal(EXAMPLE_SUBSCRIPTION);
-      });
-    });
-
-    it('should manage a failing pushManager.getSubscription() call', done => {
-      stateStub = new window.StateStub();
-      // Empty function will caused an error to be throw
-      stateStub.registration = buildSWRegistration();
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.getSubscription()
-      .then(() => {
-        done(new Error('getSubscription should have thrown an error'));
-      })
-      .catch(err => {
-        err.message.should.equal('Test Generated Error');
-        done();
-      });
-    });
-  });
-
-  describe('Test subscribe()', () => {
-    it('should dispatch a statuschange event with no subscription', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(null);
-
-      let eventCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        eventCounter++;
-
-        if (eventCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('prompt');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.subscribe();
-    });
-
-    it('should return an error that the user dismissed the notification', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(null);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.subscribe()
-      .then(() => {
-        done(new Error('This shouldn\'t have resolved'));
-      })
-      .catch(err => {
-        err.message.should.equal('Subscription failed. The user dismissed the notification permission dialog.');
-        done();
-      });
-    });
-
-    it('should dispatch a status event if the notification permission is blocked', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-      stateStub.registration = buildSWRegistration(null);
-
-      let eventCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        eventCounter++;
-
-        if (eventCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('blocked');
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.subscribe();
-    });
-
-    it('should reject the promise with an error that the user has blocked notifications', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-      stateStub.registration = buildSWRegistration(null);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.subscribe()
-      .then(() => {
-        done(new Error('This shouldn\'t have resolved'));
-      })
-      .catch(err => {
-        err.message.should.equal('Subscription failed. The user denied permission to show notifications.');
-        done();
-      });
-    });
-
-    it('should dispatch a status event with the subscription when the permission is granted', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      let eventCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        eventCounter++;
-
-        if (eventCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.permissionState).to.equal('granted');
-        window.chai.expect(event.currentSubscription).to.equal(EXAMPLE_SUBSCRIPTION);
-        window.chai.expect(event.isSubscribed).to.equal(true);
-
-        done();
-      });
-      pushClient.subscribe();
-    });
-
-    it('should resolve the promise with a subscription when notifications are granted', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.subscribe()
-      .then(subscriptionObject => {
-        window.chai.expect(subscriptionObject).to.not.equal(null);
-        window.chai.expect(subscriptionObject).to.equal(EXAMPLE_SUBSCRIPTION);
-
-        done();
-      })
-      .catch(err => {
-        done(err);
-      });
-    });
-
-    it('should dispath events in order, requestingpermission, requestingsubscription and statuschange', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      let statuschangeCounter = 0;
-      let eventTypes = [];
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        eventTypes.push(event.type);
-
-        statuschangeCounter++;
-
-        if (statuschangeCounter < 2) {
-          // Called here so we can guarentee statuschange occurs first
-          // from constructor
-          pushClient.subscribe();
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.currentSubscription).to.equal(EXAMPLE_SUBSCRIPTION);
-        window.chai.expect(event.isSubscribed).to.equal(true);
-
-        eventTypes.length.should.equal(4);
-        eventTypes[0].should.equal('statuschange');
-        eventTypes[1].should.equal('requestingpermission');
-        eventTypes[2].should.equal('requestingsubscription');
-        eventTypes[3].should.equal('statuschange');
-
-        done();
-      });
-      pushClient.addEventListener('requestingpermission', event => {
-        stateStub.permissionState = 'granted';
-
-        eventTypes.push(event.type);
-      });
-      pushClient.addEventListener('requestingsubscription', event => {
-        eventTypes.push(event.type);
-      });
-    });
-  });
-
-  describe('Test unsubscribe()', () => {
-    it('should unsubscribe the current subscription', done => {
-      stateStub = new window.StateStub();
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.unsubscribe()
-      .then(() => done());
-    });
-
-    it('should unsubscribe the current subscription and dispatch a statuschange event', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(EXAMPLE_SUBSCRIPTION);
-
-      let statuschangeCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        statuschangeCounter++;
-        if (statuschangeCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.unsubscribe();
-    });
-
-    it('should resolve promise when no registration is available', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = null;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.unsubscribe()
-      .then(() => done());
-    });
-
-    it('should dispatch a status event when no registration is available', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = null;
-
-      let statuschangeCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        statuschangeCounter++;
-        if (statuschangeCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.unsubscribe();
-    });
-
-    it('should resolve promise when no subscription is available', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(null);
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.unsubscribe()
-      .then(() => done());
-    });
-
-    it('should dispatch a status event when no subscription is available', done => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-      stateStub.registration = buildSWRegistration(null);
-
-      let statuschangeCounter = 0;
-
-      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
-      pushClient.addEventListener('statuschange', event => {
-        statuschangeCounter++;
-        if (statuschangeCounter < 2) {
-          return;
-        }
-
-        window.chai.expect(event).to.not.equal(null);
-        window.chai.expect(event.currentSubscription).to.equal(null);
-        window.chai.expect(event.isSubscribed).to.equal(false);
-
-        done();
-      });
-      pushClient.unsubscribe();
-    });
-  });
-
-  describe('Test getPermissionState()', () => {
-    it('should return permission status of granted', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'granted';
-
-      return window.goog.propel.PropelClient.getPermissionState()
-      .then(permissionState => {
-        permissionState.state.should.equal('granted');
-      });
-    });
-
-    it('should return permission status of prompt', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'prompt';
-
-      return window.goog.propel.PropelClient.getPermissionState()
-      .then(permissionState => {
-        permissionState.state.should.equal('prompt');
-      });
-    });
-
-    it('should return permission status of denied', () => {
-      stateStub = new window.StateStub();
-      stateStub.permissionState = 'blocked';
-
-      return window.goog.propel.PropelClient.getPermissionState()
-      .then(permissionState => {
-        permissionState.state.should.equal('blocked');
-      });
-    });
-  });
-});
diff --git a/test/browser-tests/push-client/request-permission.js b/test/browser-tests/push-client/request-permission.js
new file mode 100644
index 0000000..2ae2af2
--- /dev/null
+++ b/test/browser-tests/push-client/request-permission.js
@@ -0,0 +1,145 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test requestPermission()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  // We can't surpress a dialog after requesting it so force stub
+  it('should dispatch a \'requestingpermission\' event when the permission state is default', function(done) {
+    stateStub = window.StateStub.getStub(true);
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('requestingpermission', () => {
+      done();
+    });
+    pushClient.requestPermission();
+  });
+
+  // We can't surpress a dialog after requesting it so force stub
+  it('should resolve to default', function() {
+    stateStub = window.StateStub.getStub(true);
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    return pushClient.requestPermission()
+    .then(permissionState => {
+      permissionState.should.equal('default');
+    });
+  });
+
+  it('should not dispatch a \'requestingpermission\' event because permission is granted', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('requestingpermission', () => {
+      done(new Error('This should not be called when the state is granted'));
+    });
+    pushClient.requestPermission()
+    .then(() => done());
+  });
+
+  it('should resolve to permission state of granted', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    return pushClient.requestPermission()
+    .then(permissionState => {
+      permissionState.should.equal('granted');
+    });
+  });
+
+  it('should not dispatch a \'requestingpermission\' event because permission is blocked', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('requestingpermission', () => {
+      done(new Error('This should not be called'));
+    });
+    pushClient.requestPermission()
+    .then(() => done());
+  });
+
+  it('should resolve to blocked', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.requestPermission()
+    .then(permissionState => {
+      permissionState.should.equal('denied');
+    });
+  });
+
+  it('should dispatch a \'statuschange\' event when called directly', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(null);
+
+    let counter = 0;
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      counter++;
+
+      if (counter < 2) {
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('granted');
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+    pushClient.requestPermission();
+  });
+});
diff --git a/test/browser-tests/push-client/status-change-event.js b/test/browser-tests/push-client/status-change-event.js
new file mode 100644
index 0000000..f248110
--- /dev/null
+++ b/test/browser-tests/push-client/status-change-event.js
@@ -0,0 +1,119 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test \'statuschange\' event', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  const EXAMPLE_SUBSCRIPTION = {
+    endpoint: '/endpoint'
+  };
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should dispatch a \'statuschange\' event when the constructor is created (permission: default, subscription: null)', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('default');
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+  });
+
+  it('should dispatch a \'statuschange\' event when the constructor is created (permission: blocked, subscription: null)', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('denied');
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+  });
+
+  it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: null)', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('granted');
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+  });
+
+  it('should dispatch a \'statuschange\' event when the constructor is created (permission: granted, subscription: {STUBBED})', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    // Subscribe before we initialise propel to see if it picks up the subscription
+    return navigator.serviceWorker.register(EMPTY_SW_PATH)
+    .then(reg => {
+      return reg.pushManager.subscribe({userVisibleOnly: true});
+    })
+    .then(subscription => {
+      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+      pushClient.addEventListener('statuschange', event => {
+        window.chai.expect(event).to.not.equal(null);
+        window.chai.expect(event.permissionState).to.equal('granted');
+        window.chai.expect(event.currentSubscription.endpoint).to.equal(subscription.endpoint);
+        window.chai.expect(event.isSubscribed).to.equal(true);
+
+        done();
+      });
+    });
+  });
+});
diff --git a/test/browser-tests/push-client/subscribe.js b/test/browser-tests/push-client/subscribe.js
new file mode 100644
index 0000000..93f39aa
--- /dev/null
+++ b/test/browser-tests/push-client/subscribe.js
@@ -0,0 +1,189 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test subscribe()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  const EXAMPLE_SUBSCRIPTION = {
+    endpoint: '/endpoint'
+  };
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should return an error that the user dismissed the notification', function(done) {
+    stateStub = window.StateStub.getStub(true);
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.subscribe()
+    .then(() => {
+      done(new Error('This shouldn\'t have resolved'));
+    })
+    .catch(err => {
+      err.message.should.equal('Subscription failed. The user dismissed the notification permission dialog.');
+      done();
+    });
+  });
+
+  it('should dispatch a status event if the notification permission is blocked', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+    stateStub.setUpRegistration(null);
+
+    let eventCounter = 0;
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      eventCounter++;
+
+      if (eventCounter < 2) {
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('denied');
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+    pushClient.subscribe();
+  });
+
+  it('should reject the promise with an error that the user has blocked notifications', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('denied');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.subscribe()
+    .then(() => {
+      done(new Error('This shouldn\'t have resolved'));
+    })
+    .catch(err => {
+      err.message.should.equal('Subscription failed. The user denied permission to show notifications.');
+      done();
+    });
+  });
+
+  it('should dispatch a status event with the subscription when the permission is granted', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    let eventCounter = 0;
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      eventCounter++;
+
+      if (eventCounter < 2) {
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.permissionState).to.equal('granted');
+      window.chai.expect(event.currentSubscription).to.not.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(true);
+
+      done();
+    });
+    pushClient.subscribe();
+  });
+
+  it('should resolve the promise with a subscription when notifications are granted', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.subscribe()
+    .then(subscriptionObject => {
+      window.chai.expect(subscriptionObject).to.not.equal(null);
+
+      done();
+    })
+    .catch(err => {
+      done(err);
+    });
+  });
+
+  it('should dispath events in order, requestingpermission, requestingsubscription and statuschange', function(done) {
+    stateStub = window.StateStub.getStub(true);
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    let statuschangeCounter = 0;
+    let eventTypes = [];
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      eventTypes.push(event.type);
+
+      statuschangeCounter++;
+
+      if (statuschangeCounter < 2) {
+        // Called here so we can guarentee statuschange occurs first
+        // from constructor
+        pushClient.subscribe();
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.currentSubscription).to.not.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(true);
+
+      eventTypes.length.should.equal(4);
+      eventTypes[0].should.equal('statuschange');
+      eventTypes[1].should.equal('requestingpermission');
+      eventTypes[2].should.equal('requestingsubscription');
+      eventTypes[3].should.equal('statuschange');
+
+      done();
+    });
+    pushClient.addEventListener('requestingpermission', event => {
+      stateStub.setPermissionState('granted');
+
+      eventTypes.push(event.type);
+    });
+    pushClient.addEventListener('requestingsubscription', event => {
+      eventTypes.push(event.type);
+    });
+  });
+});
diff --git a/test/browser-tests/push-client/unsubscribe.js b/test/browser-tests/push-client/unsubscribe.js
new file mode 100644
index 0000000..655cf13
--- /dev/null
+++ b/test/browser-tests/push-client/unsubscribe.js
@@ -0,0 +1,163 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+// This is a test and we want descriptions to be useful, if this
+// breaks the max-length, it's ok.
+
+/* eslint-disable max-len, no-unused-expressions */
+/* eslint-env browser, mocha */
+
+'use strict';
+
+describe('Test unsubscribe()', function() {
+  if (!window.isPropelClientSupported) {
+    return;
+  }
+
+  const EMPTY_SW_PATH = '/test/browser-tests/push-client/empty-sw.js';
+  const NON_EXISTANT_SW_PATH = '/test/browser-tests/push-client/doesnt-exist.js';
+  const EXAMPLE_SUBSCRIPTION = {
+    endpoint: '/endpoint'
+  };
+
+  let stateStub;
+
+  beforeEach(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  after(function() {
+    if (stateStub) {
+      stateStub.restore();
+    }
+  });
+
+  it('should unsubscribe the current subscription', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    // Subscribe before we initialise propel to see if it picks up the subscription
+    return navigator.serviceWorker.register(EMPTY_SW_PATH)
+    .then(reg => {
+      return reg.pushManager.subscribe({userVisibleOnly: true});
+    })
+    .then(subscription => {
+      window.chai.expect(subscription).to.not.equal(null);
+
+      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+      return pushClient.unsubscribe();
+    });
+  });
+
+  it('should unsubscribe the current subscription and dispatch a statuschange event', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('granted');
+    stateStub.setUpRegistration(EXAMPLE_SUBSCRIPTION);
+
+    // Subscribe before we initialise propel to see if it picks up the subscription
+    return navigator.serviceWorker.register(EMPTY_SW_PATH)
+    .then(reg => {
+      return reg.pushManager.subscribe({userVisibleOnly: true});
+    })
+    .then(subscription => {
+      window.chai.expect(subscription).to.not.equal(null);
+
+      let statuschangeCounter = 0;
+
+      const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+      pushClient.addEventListener('statuschange', event => {
+        statuschangeCounter++;
+        if (statuschangeCounter < 2) {
+          return;
+        }
+
+        window.chai.expect(event).to.not.equal(null);
+        window.chai.expect(event.currentSubscription).to.equal(null);
+        window.chai.expect(event.isSubscribed).to.equal(false);
+
+        done();
+      });
+      pushClient.unsubscribe();
+    });
+  });
+
+  it('should reject promise when no registration is available', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+
+    const pushClient = new window.goog.propel.PropelClient(NON_EXISTANT_SW_PATH);
+    pushClient.unsubscribe()
+    .then(() => done(new Error('Expected an error to be thrown when no registration')))
+    .catch(() => done());
+  });
+
+  it('should dispatch a status event when no registration is available', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+
+    let statuschangeCounter = 0;
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      statuschangeCounter++;
+      if (statuschangeCounter < 2) {
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+    pushClient.unsubscribe();
+  });
+
+  it('should resolve promise when no subscription is available', function() {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    return pushClient.unsubscribe();
+  });
+
+  it('should dispatch a status event when no subscription is available', function(done) {
+    stateStub = window.StateStub.getStub();
+    stateStub.setPermissionState('default');
+    stateStub.setUpRegistration(null);
+
+    let statuschangeCounter = 0;
+
+    const pushClient = new window.goog.propel.PropelClient(EMPTY_SW_PATH);
+    pushClient.addEventListener('statuschange', event => {
+      statuschangeCounter++;
+      if (statuschangeCounter < 2) {
+        return;
+      }
+
+      window.chai.expect(event).to.not.equal(null);
+      window.chai.expect(event.currentSubscription).to.equal(null);
+      window.chai.expect(event.isSubscribed).to.equal(false);
+
+      done();
+    });
+    pushClient.unsubscribe();
+  });
+});
diff --git a/test/data/demos/just-subscribe.html b/test/data/demos/just-subscribe.html
index 75b7387..96b247b 100644
--- a/test/data/demos/just-subscribe.html
+++ b/test/data/demos/just-subscribe.html
@@ -20,7 +20,7 @@
   <script src="/dist/propel-client.js"></script>
   <script>
     var PushClient = window.goog.propel.PropelClient;
-    var pushClient = new PushClient();
+    var pushClient = new PushClient('./sw.js');
     console.log('Calling pushClient.subscribe()');
     pushClient.subscribe()
     .then(function(subscription) {
diff --git a/test/data/demos/sw.js b/test/data/demos/sw.js
new file mode 100644
index 0000000..e69de29
diff --git a/test/libs/helper-functions.js b/test/libs/helper-functions.js
deleted file mode 100644
index f05af25..0000000
--- a/test/libs/helper-functions.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/* eslint-env browser */
-
-window.testHelper = {
-  unregisterAllRegistrations: function() {
-    return navigator.serviceWorker.getRegistrations()
-      .then(registrations => {
-        return Promise.all(registrations.map(registration => {
-          registration.unregister();
-        }));
-      });
-  },
-
-  clearAllCaches: function() {
-    return window.caches.keys()
-      .then(cacheNames => {
-        return Promise.all(cacheNames.map(cacheName => {
-          window.caches.delete(cacheName);
-        }));
-      });
-  },
-
-  // Helper to unregister all service workers and clean all caches
-  // This should be called before each test
-  cleanState: function() {
-    return Promise.all([
-      this.unregisterAllRegistrations(),
-      this.clearAllCaches()
-    ])
-    .then(() => {
-      var iframeList = document.querySelectorAll('.js-test-iframe');
-      for (var i = 0; i < iframeList.length; i++) {
-        iframeList[i].parentElement.removeChild(iframeList[i]);
-      }
-    });
-  }
-};
diff --git a/test/libs/is-supported.js b/test/libs/is-supported.js
new file mode 100644
index 0000000..87a89df
--- /dev/null
+++ b/test/libs/is-supported.js
@@ -0,0 +1,24 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+/* eslint-env browser */
+
+window.isPropelClientSupported = 'serviceWorker' in navigator &&
+  'PushManager' in window &&
+  'Notification' in window &&
+  'showNotification' in ServiceWorkerRegistration.prototype;
diff --git a/test/libs/state-stub-singleton.js b/test/libs/state-stub-singleton.js
new file mode 100644
index 0000000..072f2ee
--- /dev/null
+++ b/test/libs/state-stub-singleton.js
@@ -0,0 +1,51 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+// Services is available in FF if we have correct flags set
+// (See automated-test-suite.js for what is set)
+/* global Services */
+/* eslint-env browser */
+
+window.StateStub = {
+  getStub: forceFullStub => {
+    if (forceFullStub) {
+      return new window.FullStateStub();
+    }
+
+    let useFFPermissions = false;
+
+    if (
+      typeof window.netscape !== 'undefined' &&
+      typeof window.netscape.security !== 'undefined' &&
+      typeof window.netscape.security.PrivilegeManager !== 'undefined'
+    ) {
+      // IF here we are in FF with ability to alter permission state
+      window.netscape.security.PrivilegeManager
+        .enablePrivilege('UniversalXPConnect');
+      window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+      useFFPermissions = (typeof Services !== 'undefined');
+    }
+
+    if (useFFPermissions) {
+      return new window.FFStateStub();
+    }
+
+    return new window.FullStateStub();
+  }
+};
diff --git a/test/libs/state-stub.js b/test/libs/state-stub.js
deleted file mode 100644
index dd524e5..0000000
--- a/test/libs/state-stub.js
+++ /dev/null
@@ -1,82 +0,0 @@
-'use strict';
-
-/* eslint-env browser */
-
-const sinon = window.sinon;
-
-const DEFAULT_PERMISSION_STATE = 'prompt';
-
-class StateStub {
-  constructor() {
-    this.allStubs = [];
-
-    this._currentPermission = DEFAULT_PERMISSION_STATE;
-    this._currentRegistration = null;
-
-    // navigator.permissions.query
-    const permissionQueryStub = sinon.stub(navigator.permissions, 'query',
-      opts => {
-        if (opts && opts.name === 'push' && opts.userVisibleOnly === true) {
-          return Promise.resolve({
-            state: this.permissionState
-          });
-        }
-
-        return Promise.reject(new Error('Unexpected input to ' +
-          'navigator.permissions.query'));
-      });
-
-    // Notification.requestPermission
-    const permissionRequestStub = sinon.stub(Notification, 'requestPermission',
-      cb => {
-        cb(this.permissionState);
-      });
-
-    // navigator.serviceWorker.register
-    const registerStub = sinon.stub(
-      navigator.serviceWorker, 'register', (swurl, options) => {
-        if (this.registration && options && options.scope) {
-          this.registration.scope = options.scope;
-        }
-        return Promise.resolve(this.registration);
-      });
-
-    // navigator.serviceWorker.getRegistration
-    const getRegistrationStub = sinon.stub(
-      navigator.serviceWorker, 'getRegistration', scope => {
-        if (this.registration) {
-          this.registration.scope = scope;
-        }
-        return Promise.resolve(this.registration);
-      });
-
-    this.allStubs.push(permissionQueryStub);
-    this.allStubs.push(permissionRequestStub);
-    this.allStubs.push(registerStub);
-    this.allStubs.push(getRegistrationStub);
-  }
-
-  restore() {
-    this.allStubs.forEach(stub => {
-      stub.restore();
-    });
-  }
-
-  get permissionState() {
-    return this._currentPermission;
-  }
-
-  set permissionState(newState) {
-    this._currentPermission = newState;
-  }
-
-  get registration() {
-    return this._currentRegistration;
-  }
-
-  set registration(reg) {
-    this._currentRegistration = reg;
-  }
-}
-
-window.StateStub = StateStub;
diff --git a/test/libs/stubs/base-stub.js b/test/libs/stubs/base-stub.js
new file mode 100644
index 0000000..b236edf
--- /dev/null
+++ b/test/libs/stubs/base-stub.js
@@ -0,0 +1,42 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+/* eslint-env browser */
+
+const DEFAULT_PERMISSION_STATE = 'default';
+
+class BaseStateStub {
+  constructor() {
+    this.setPermissionState(DEFAULT_PERMISSION_STATE);
+    this._currentRegistration = null;
+  }
+
+  restore() {
+    throw new Error('restore() must be overriden');
+  }
+
+  setPermissionState() {
+    throw new Error('setPermissionState() must be overriden');
+  }
+
+  setUpRegistration() {
+    throw new Error('setUpRegistration() must be overriden');
+  }
+}
+
+window.BaseStateStub = BaseStateStub;
diff --git a/test/libs/stubs/firefox-stub.js b/test/libs/stubs/firefox-stub.js
new file mode 100644
index 0000000..60eb6a2
--- /dev/null
+++ b/test/libs/stubs/firefox-stub.js
@@ -0,0 +1,74 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+// Services is available in FF if we have correct flags set
+// (See automated-test-suite.js for what is set)
+/* global Services */
+/* eslint-env browser */
+
+class FFStateStub extends window.BaseStateStub {
+  constructor() {
+    super();
+  }
+
+  restore() {
+    window.netscape.security.PrivilegeManager
+      .enablePrivilege('UniversalXPConnect');
+    window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+    const uri = Services.io.newURI(window.location.origin, null, null);
+    const principal = Services.scriptSecurityManager
+      .getNoAppCodebasePrincipal(uri);
+    Services.perms.addFromPrincipal(principal, 'desktop-notification',
+      Services.perms.PROMPT_ACTION);
+  }
+
+  setPermissionState(newState) {
+    let permissionState;
+    switch (newState) {
+      case 'granted':
+        permissionState = Services.perms.ALLOW_ACTION;
+        break;
+      case 'denied':
+        permissionState = Services.perms.DENY_ACTION;
+        break;
+      case 'default':
+        permissionState = Services.perms.PROMPT_ACTION;
+        break;
+      default:
+        throw new Error(`Unexpected permission state given: '${newState}' `);
+    }
+
+    window.netscape.security.PrivilegeManager
+      .enablePrivilege('UniversalXPConnect');
+    window.Components.utils.import('resource://gre/modules/Services.jsm');
+
+    // ALLOW_ACTION, DENY_ACTION, PROMPT_ACTION
+    const uri = Services.io.newURI(window.location.origin, null, null);
+    const principal = Services.scriptSecurityManager
+      .getNoAppCodebasePrincipal(uri);
+    Services.perms.addFromPrincipal(principal, 'desktop-notification',
+      permissionState);
+  }
+
+  setUpRegistration() {
+    // NOOP - We use actual SW registration etc
+  }
+}
+
+window.FFStateStub = FFStateStub;
diff --git a/test/libs/stubs/full-stub.js b/test/libs/stubs/full-stub.js
new file mode 100644
index 0000000..42a7d47
--- /dev/null
+++ b/test/libs/stubs/full-stub.js
@@ -0,0 +1,120 @@
+/*
+  Copyright 2016 Google Inc. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+'use strict';
+
+/* global sinon */
+/* eslint-env browser */
+
+class FullStateStub extends window.BaseStateStub {
+  constructor() {
+    super();
+
+    this.allStubs = [];
+
+    // Fallbacks for browsers where we can't pre-select the permission dialog
+    const permissionQueryStub = sinon.stub(window.goog.propel.PropelClient,
+      'getPermissionState',
+      () => {
+        return Promise.resolve(this._currentPermission);
+      }
+    );
+
+    // Notification.requestPermission
+    const permissionRequestStub = sinon.stub(Notification,
+      'requestPermission',
+      cb => {
+        cb(this._currentPermission);
+      });
+
+    // navigator.serviceWorker.register
+    const registerStub = sinon.stub(
+      navigator.serviceWorker, 'register', (swurl, options) => {
+        if (this._currentRegistration === null) {
+          return Promise.reject(new Error('No valid SW registered'));
+        }
+
+        if (this._currentRegistration && options && options.scope) {
+          this._currentRegistration.scope = options.scope;
+        }
+        return Promise.resolve(this._currentRegistration);
+      }
+    );
+
+    // navigator.serviceWorker.getRegistration
+    const getRegistrationStub = sinon.stub(
+      navigator.serviceWorker, 'getRegistration', scope => {
+        if (this._currentRegistration) {
+          this._currentRegistration.scope = scope;
+        }
+
+        return Promise.resolve(this._currentRegistration);
+      }
+    );
+
+    this.allStubs.push(permissionQueryStub);
+    this.allStubs.push(permissionRequestStub);
+    this.allStubs.push(registerStub);
+    this.allStubs.push(getRegistrationStub);
+  }
+
+  restore() {
+    this.allStubs.forEach(stub => {
+      stub.restore();
+    });
+  }
+
+  setPermissionState(newState) {
+    this._currentPermission = newState;
+  }
+
+  setUpRegistration(subscription) {
+    this._currentRegistration = this._buildSWRegistration(subscription);
+  }
+
+  _buildSWRegistration(subscription) {
+    let innerSubscription = subscription;
+    if (innerSubscription) {
+      innerSubscription.unsubscribe = () => {
+        innerSubscription = null;
+      };
+    }
+    return {
+      scope: './',
+      active: {
+        // This is to skip handling of SW lifecycle.
+      },
+      pushManager: {
+        subscribe: options => {
+          if (!options.userVisibleOnly) {
+            throw new Error('Test Stub Error: User Visible Required');
+          }
+
+          return Promise.resolve(innerSubscription);
+        },
+        getSubscription: () => {
+          if (typeof subscription === 'undefined') {
+            return Promise.reject(new Error('Test Generated Error'));
+          }
+
+          return Promise.resolve(innerSubscription);
+        }
+      }
+    };
+  }
+}
+
+window.FullStateStub = FullStateStub;