Precaching idb fix

packages/workbox-precaching/models/PrecachedDetailsModel.mjs

@@ -39,19 +39,33 @@ class PrecachedDetailsModel {
   constructor(cacheName) {
     this._cacheName = cacheNames.getPrecacheName(cacheName);
     this._db = new DBWrapper(`workbox-precaching`, 2, {
-      onupgradeneeded: (evt) => {
-        if (evt.oldVersion < 2) {
-          try {
-            evt.target.result.deleteObjectStore('workbox-precaching');
-          } catch (err) {
-            // NOOP
-          }
-        }
-        evt.target.result.createObjectStore(DB_STORE_NAME);
-      },
+      onupgradeneeded: this._handleUpgrade,
     });
   }
 
+  /**
+   * Should perform an upgrade of indexedDB.
+   *
+   * @param {Event} evt
+   *
+   * @private
+   */
+  _handleUpgrade(evt) {
+    const db = evt.target.result;
+    if (evt.oldVersion < 2) {
+      // IndexedDB version 1 used both 'workbox-precaching' and
+      // 'precached-details-model' before upgrading to version 2.
+      // Delete them and create a new store with latest schema.
+      if (db.objectStoreNames.indexOf('workbox-precaching') !== -1) {
+        db.deleteObjectStore('workbox-precaching');
+      }
+      if (db.objectStoreNames.indexOf(DB_STORE_NAME) !== -1) {
+        db.deleteObjectStore(DB_STORE_NAME);
+      }
+    }
+    db.createObjectStore(DB_STORE_NAME);
+  }
+
   /**
    * Check if an entry is already cached. Returns false if
    * the entry isn't cached or the revision has changed.

test/workbox-precaching/node/models/test-PrecachedDetailsModel.mjs

@@ -1,11 +1,20 @@
 import {expect} from 'chai';
+import sinon from 'sinon';
 import {reset as iDBReset} from 'shelving-mock-indexeddb';
 import {_private} from '../../../../packages/workbox-core/index.mjs';
 import PrecachedDetailsModel from '../../../../packages/workbox-precaching/models/PrecachedDetailsModel.mjs';
 import PrecacheEntry from '../../../../packages/workbox-precaching/models/PrecacheEntry.mjs';
 
 describe('[workbox-precaching] PrecachedDetailsModel', function() {
+  const sandbox = sinon.sandbox.create();
+
   beforeEach(function() {
+    sandbox.restore();
+    iDBReset();
+  });
+
+  after(function() {
+    sandbox.restore();
     iDBReset();
   });
 
@@ -23,6 +32,75 @@ describe('[workbox-precaching] PrecachedDetailsModel', function() {
     // TODO Bad cache name input
   });
 
+  describe('_handleUpgrade', function() {
+    it('should handle upgrade 0 (Doesnt exist)', () => {
+      const fakeDB = {
+        objectStoreNames: [],
+        deleteObjectStore: sandbox.spy(),
+        createObjectStore: sandbox.spy(),
+      };
+
+      const precacheDetailsModel = new PrecachedDetailsModel();
+      precacheDetailsModel._handleUpgrade({
+        target: {
+          result: fakeDB,
+        },
+      });
+
+      // Assert only create called
+      expect(fakeDB.createObjectStore.callCount).to.equal(1);
+      expect(fakeDB.createObjectStore.args[0][0]).to.equal(`precached-details-models`);
+
+     expect(fakeDB.deleteObjectStore.callCount).to.equal(0);
+    });
+
+    it('should handle upgrade 1 > 2', () => {
+      const fakeDB = {
+        objectStoreNames: ['workbox-precaching'],
+        deleteObjectStore: sandbox.spy(),
+        createObjectStore: sandbox.spy(),
+      };
+
+      const precacheDetailsModel = new PrecachedDetailsModel();
+      precacheDetailsModel._handleUpgrade({
+        oldVersion: 1,
+        target: {
+          result: fakeDB,
+        },
+      });
+
+      // Assert only create called
+      expect(fakeDB.createObjectStore.callCount).to.equal(1);
+      expect(fakeDB.createObjectStore.args[0][0]).to.equal(`precached-details-models`);
+
+     expect(fakeDB.deleteObjectStore.callCount).to.equal(1);
+     expect(fakeDB.deleteObjectStore.args[0][0]).to.equal(`workbox-precaching`);
+    });
+
+    it('should handle upgrade 1 > 2 with constructing precached-details-models', () => {
+      const fakeDB = {
+        objectStoreNames: ['workbox-precaching', 'precached-details-models'],
+        deleteObjectStore: sandbox.spy(),
+        createObjectStore: sandbox.spy(),
+      };
+
+      const precacheDetailsModel = new PrecachedDetailsModel();
+      precacheDetailsModel._handleUpgrade({
+        oldVersion: 1,
+        target: {
+          result: fakeDB,
+        },
+      });
+
+      // Assert only create called
+      expect(fakeDB.createObjectStore.callCount).to.equal(1);
+      expect(fakeDB.createObjectStore.args[0][0]).to.equal(`precached-details-models`);
+      expect(fakeDB.deleteObjectStore.callCount).to.equal(2);
+      expect(fakeDB.deleteObjectStore.args[0][0]).to.equal(`workbox-precaching`);
+      expect(fakeDB.deleteObjectStore.args[1][0]).to.equal(`precached-details-models`);
+    });
+  });
+
   describe('_getAllEntries', function() {
     it(`should return an empty array`, async function() {
       const model = new PrecachedDetailsModel(`test-cache-name`);