www

commit a91151756bfce558cb4913c47784ad1b21c32ec4
parent fec43f1f62b5658fa762eeff3ecd76f990414175
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 12 Apr 2015 21:50:38 -0400

Fix test running after schema updates

Tests still need to be updated for Bluebird/promisification

Diffstat:
M
chrome/content/zotero/xpcom/schema.js
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
@@ -93,7 +93,7 @@ Zotero.Schema = new function(){
 					return Zotero.Schema.updateBundledFiles();
 				})
 				.then(function () {
-					return _schemaUpdateDeferred.resolve(true);
+					_schemaUpdateDeferred.resolve(true);
 				});
 			});
 		}
@@ -173,6 +173,9 @@ Zotero.Schema = new function(){
 		.then(1000)
 		.then(function () {
 			return Zotero.Schema.updateBundledFiles();
+		})
+		.then(function () {
+			_schemaUpdateDeferred.resolve(true);
 		});
 		
 		return updated;
@@ -456,8 +459,6 @@ Zotero.Schema = new function(){
 				let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles');
 				var updated = up1 || up2;
 			}
-			
-			_schemaUpdateDeferred.resolve(true);
 		}
 		finally {
 			_localUpdateInProgress = false;