setVersion problem was causing test not to pass in Chrome.

However now the test won't pass in Firefox.
matthewp · Jul 1, 2012 · 42df5f2 · 42df5f2
1 parent 024f67d
commit 42df5f2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/build/gazel.js b/build/gazel.js
@@ -157,7 +157,7 @@ Client.prototype = {
         self.needsOsVerification = false;
 
         self.register(type, action, callback);
-      });
+      }, this.handleError.bind(this));
 
       return;
     }
@@ -449,14 +449,17 @@ function openDatabase(onsuccess, onerror, onupgrade) {
       uDb.createObjectStore(gazel.osName);
 
     if(onupgrade)
-      upgrade(uDb);
+      onupgrade(uDb);
   };
 
   var reqSuccess;
   reqSuccess = req.onsuccess = function (e) {
     var sDb = e.target.result;
 
     if (sDb.setVersion && Number(sDb.version) !== gazel.version) {
+      if(db)
+        db.close();
+
       var dbReq = sDb.setVersion(String(gazel.version));
       dbReq.onsuccess = function (e2) {
         var e3 = {}; e3.target = {};
@@ -484,12 +487,12 @@ function openDatabase(onsuccess, onerror, onupgrade) {
   req.onerror = onerror;
 }
 
-function ensureObjectStore(osName, callback) {
+function ensureObjectStore(osName, callback, errback) {
   gazel.version++;
 
   openDatabase(function() {
     callback();
-  }, null, function(db) {
+  }, errback, function(db) {
     if(!db.objectStoreNames.contains(osName)) {
       db.createObjectStore(osName);
     }

diff --git a/build/gazel.min.js b/build/gazel.min.js
diff --git a/src/client.js b/src/client.js
@@ -18,7 +18,7 @@ Client.prototype = {
         self.needsOsVerification = false;
 
         self.register(type, action, callback);
-      });
+      }, this.handleError.bind(this));
 
       return;
     }

diff --git a/src/dbfunctions.js b/src/dbfunctions.js
@@ -25,14 +25,17 @@ function openDatabase(onsuccess, onerror, onupgrade) {
       uDb.createObjectStore(gazel.osName);
 
     if(onupgrade)
-      upgrade(uDb);
+      onupgrade(uDb);
   };
 
   var reqSuccess;
   reqSuccess = req.onsuccess = function (e) {
     var sDb = e.target.result;
 
     if (sDb.setVersion && Number(sDb.version) !== gazel.version) {
+      if(db)
+        db.close();
+
       var dbReq = sDb.setVersion(String(gazel.version));
       dbReq.onsuccess = function (e2) {
         var e3 = {}; e3.target = {};
@@ -60,12 +63,12 @@ function openDatabase(onsuccess, onerror, onupgrade) {
   req.onerror = onerror;
 }
 
-function ensureObjectStore(osName, callback) {
+function ensureObjectStore(osName, callback, errback) {
   gazel.version++;
 
   openDatabase(function() {
     callback();
-  }, null, function(db) {
+  }, errback, function(db) {
     if(!db.objectStoreNames.contains(osName)) {
       db.createObjectStore(osName);
     }

diff --git a/test/change_objectstore.js b/test/change_objectstore.js
@@ -4,6 +4,10 @@ describe('Changed Object Store', function() {
   var osName = 'foo',
       client = gazel.createClient(osName);
 
+  client.on('error', function(err) {
+    throw err;
+  });
+
   var isTrue = function(done) {
     return function(truthy) {
       done(assert.ok(truthy, 'Not the case'));