diff --git a/lib/generators/serviceworker/templates/serviceworker-companion.js b/lib/generators/serviceworker/templates/serviceworker-companion.js index 8a524aa..35da935 100644 --- a/lib/generators/serviceworker/templates/serviceworker-companion.js +++ b/lib/generators/serviceworker/templates/serviceworker-companion.js @@ -1,6 +1,11 @@ if (navigator.serviceWorker) { - navigator.serviceWorker.register('/serviceworker.js', { scope: './' }) - .then(function(reg) { - console.log('[Companion]', 'Service worker registered!'); - }); -} + navigator.serviceWorker + .register("/serviceworker.js", { scope: "./" }) + .then(function() { + console.log("[Companion]", "Rails Service worker registered!") + }) + .catch(function(error) { + // registration failed :( + console.log("[Companion]", "Rails Service worker registration failed: " + error) + }) +} \ No newline at end of file diff --git a/lib/generators/serviceworker/templates/serviceworker.js b/lib/generators/serviceworker/templates/serviceworker.js index fa4fe49..c10c364 100644 --- a/lib/generators/serviceworker/templates/serviceworker.js +++ b/lib/generators/serviceworker/templates/serviceworker.js @@ -2,7 +2,7 @@ var CACHE_VERSION = 'v1'; var CACHE_NAME = CACHE_VERSION + ':sw-cache-'; function onInstall(event) { - console.log('[Serviceworker]', "Installing!", event); + console.log('[Serviceworker]', "Rails Service Worker Installing!", event); event.waitUntil( caches.open(CACHE_NAME).then(function prefill(cache) { return cache.addAll([ @@ -21,7 +21,7 @@ function onInstall(event) { } function onActivate(event) { - console.log('[Serviceworker]', "Activating!", event); + console.log('[Serviceworker]', "Rails Service Worker Activating!", event); event.waitUntil( caches.keys().then(function(cacheNames) { return Promise.all( @@ -51,7 +51,7 @@ function onFetch(event) { // if not found in cache, return default offline content for navigate requests if (event.request.mode === 'navigate' || (event.request.method === 'GET' && event.request.headers.get('accept').includes('text/html'))) { - console.log('[Serviceworker]', "Fetching offline content", event); + console.log('[Serviceworker]', "Rails Service Worker Fetching offline content", event); return caches.match('/offline.html'); } }) diff --git a/test/serviceworker/install_generator_test.rb b/test/serviceworker/install_generator_test.rb index 646b68f..49a2a2b 100644 --- a/test/serviceworker/install_generator_test.rb +++ b/test/serviceworker/install_generator_test.rb @@ -41,7 +41,7 @@ class ServiceWorker::InstallGeneratorTest < ::Rails::Generators::TestCase test "generates companion javascript" do assert_file "app/assets/javascripts/serviceworker-companion.js" do |content| - assert_match(/navigator.serviceWorker.register/, content) + assert_match(/navigator.serviceWorker./, content) end assert_file "app/assets/javascripts/application.js" do |content|