Merge pull request #12437 from adobe/marcel/test-fixes

nethip · nethip · commit c8a403b8a311 · 2016-05-20T11:20:08.000+05:30
Some unit test fixes
diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js
@@ -36,8 +36,10 @@ define(function (require, exports, module) {
         InstallExtensionDialog    = require("extensibility/InstallExtensionDialog"),
         LocalizationUtils         = require("utils/LocalizationUtils"),
         LanguageManager           = require("language/LanguageManager"),
-        itemTemplate              = require("text!htmlContent/extension-manager-view-item.html"),
-        Mustache                  = require("thirdparty/mustache/mustache");
+        Mustache                  = require("thirdparty/mustache/mustache"),
+        PathUtils                 = require("thirdparty/path-utils/path-utils"),
+        itemTemplate              = require("text!htmlContent/extension-manager-view-item.html");
+        
 
     /**
      * Create a detached link element, so that we can use it later to extract url details like 'protocol'
diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js
@@ -685,7 +685,9 @@ define(function (require, exports, module) {
                 var hints = expectHints(CSSCodeHints.cssPropHintProvider, undefined, true).hints;
                 expect(hints[0].text()).toBe("aliceblue"); // first hint should be aliceblue
                 expect(hints[0].find(".color-swatch").length).toBe(1);
-                expect(hints[0].find(".color-swatch").css("backgroundColor")).toBe("rgb(240, 248, 255)");
+                // CEF 2623 will output "aliceblue" whereas earlier versions give "rgb(240, 248, 255)",
+                // so we need this ugly hack to make sure this test passes on both
+                expect(hints[0].find(".color-swatch").css("backgroundColor")).toMatch(/^rgb\(240, 248, 255\)$|aliceblue/);
             });
 
             it("should filter out color names appropriately", function () {
diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js
@@ -752,7 +752,7 @@ define(function (require, exports, module) {
                 it("adjusts the selection if a parent folder is renamed", function () {
                     spyOn(model, "_renameItem").andReturn(new $.Deferred().resolve().promise());
                     model.setSelected("/foo/afile.js");
-                    model.startRename("/foo");
+                    model.startRename("/foo/");
                     model.setRenameValue("bar");
                     model.performRename();
                     expect(model._selections.selected).toBe("/bar/afile.js");
@@ -761,7 +761,7 @@ define(function (require, exports, module) {
                 it("does not adjust the selection if renaming a parent folder fails", function () {
                     spyOn(model, "_renameItem").andReturn(new $.Deferred().reject().promise());
                     model.setSelected("/foo/afile.js");
-                    model.startRename("/foo");
+                    model.startRename("/foo/");
                     model.setRenameValue("bar");
                     model.performRename();
                     expect(model._selections.selected).toBe("/foo/afile.js");
