Merge pull request #7819 from SAPlayer/update-notification-test

ingorichter · ingorichter · commit fb64ff014f07 · 2014-05-15T12:18:11.000-07:00
Fix UpdateNotification.Locale Fallback tests
diff --git a/test/spec/UpdateNotification-test.js b/test/spec/UpdateNotification-test.js
@@ -218,13 +218,16 @@ define(function (require, exports, module) {
 
             function setupAjaxSpy(defaultUpdateUrl) {
                 var jq = spyOn(testWindow.$, "ajax").andCallFake(function (req) {
-                    var d = $.Deferred();
+                    var d = new $.Deferred();
 
-                    if (req.url === defaultUpdateUrl) {
-                        d.resolve(expectedResult);
-                    } else {
-                        d.reject();
-                    }
+                    testWindow.setTimeout(function () {
+                        if (req.url === defaultUpdateUrl) {
+                            d.resolve(expectedResult);
+                        } else {
+                            d.reject();
+                        }
+                    }, 75);
+                    // we need to set a timeout in order to emulate the async behavior of $.ajax
 
                     return d.promise();
                 });
@@ -235,8 +238,8 @@ define(function (require, exports, module) {
 
                 setupAjaxSpy(defaultUpdateUrl);
 
-                // pretend that we are using the italian locale and we don't have a translation for the update notification
-                spyOn(testWindow.brackets, "getLocale").andReturn("de-ch");
+                // pretend that we are using the German (Switzerland) locale and we don't have a translation for the update notification
+                spyOn(testWindow.brackets, "getLocale").andReturn("de-CH");
 
                 runs(function () {
                     var promise = UpdateNotification.checkForUpdate(true, updateInfo);
@@ -254,7 +257,7 @@ define(function (require, exports, module) {
 
                 setupAjaxSpy(defaultUpdateUrl);
 
-                // pretend that we are using the italian locale and we don't have a translation for the update notification
+                // pretend that we are using the Italian locale and we don't have a translation for the update notification
                 spyOn(testWindow.brackets, "getLocale").andReturn("it");
 
                 runs(function () {
