From a9c4b8ca94fb3594fc752c3bfe83fce2a7f38a4a Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Thu, 19 May 2016 23:42:30 +0200 Subject: [PATCH 1/3] Fix ProjectModel test 'adjusts the selection if a parent folder is renamed' Test failure caused by a505026d40a4eb0bffc196eda30557c0e6b021bc --- test/spec/ProjectModel-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/spec/ProjectModel-test.js b/test/spec/ProjectModel-test.js index ea837506534..6dc98d8d0f9 100644 --- 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"); From ce12a86c107e2cdb258dd3c264a20e2d55a6a8c1 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 20 May 2016 00:44:11 +0200 Subject: [PATCH 2/3] Fix Extension Manager test failures Caused by interference between #12389 and #12203. The former utilizes PathUtils, while the latter adapted PathUtils to our normal require() workflow. --- src/extensibility/ExtensionManagerView.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/extensibility/ExtensionManagerView.js b/src/extensibility/ExtensionManagerView.js index 35950b4bdb1..8afe722964a 100644 --- 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' From bc002599703239b72dbcc9143a31e7362de57183 Mon Sep 17 00:00:00 2001 From: Marcel Gerber Date: Fri, 20 May 2016 01:06:32 +0200 Subject: [PATCH 3/3] Fix CSS Code Hints test case 'should show color swatches for background-color' Caused by our recent CEF upgrade --- src/extensions/default/CSSCodeHints/unittests.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/extensions/default/CSSCodeHints/unittests.js b/src/extensions/default/CSSCodeHints/unittests.js index a50c9ad3a42..715e2b752b2 100644 --- 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 () {