Merge pull request #12615 from adobe/marcel/fix-tests

Marcel Gerber · web-flow · commit aa5bead39a59 · 2016-07-24T20:08:02.000+02:00
Fix failing tests
diff --git a/src/extensions/default/SVGCodeHints/unittests.js b/src/extensions/default/SVGCodeHints/unittests.js
@@ -460,7 +460,9 @@ define(function (require, exports, module) {
                 var hints = expectHints(SVGCodeHints.hintProvider);
                 verifyHints(hints, "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 always include transparent and currentColor and they should not have a swatch, but class no-swatch-margin", function () {
diff --git a/test/spec/FindInFiles-test.js b/test/spec/FindInFiles-test.js
@@ -1746,6 +1746,7 @@ define(function (require, exports, module) {
                         openTestProjectCopy(defaultSourcePath);
                         openSearchBar(null, true);
                         runs(function () {
+                            $("#find-what").val("").trigger("input");
                             expect($("#replace-all").is(":disabled")).toBe(true);
                         });
                     });
@@ -2289,9 +2290,14 @@ define(function (require, exports, module) {
                         showSearchResults("foo", "bar");
                         runs(function () {
                             $(".disclosure-triangle").click();
-                            expect($("#items").is(":style")).toBeFalsy();
+                            expect($(".disclosure-triangle").hasClass("expanded")).toBeFalsy();
+                            // Check that all results are hidden
+                            expect($(".bottom-panel-table tr[data-file-index=0][data-match-index]:hidden").length).toEqual(7);
+                            expect($(".bottom-panel-table tr[data-file-index=1][data-match-index]:hidden").length).toEqual(4);
                             $(".disclosure-triangle").click();
-                            expect($("#items").is(":style")).toBeTruthy();
+                            expect($(".disclosure-triangle").hasClass("expanded")).toBeTruthy();
+                            expect($(".bottom-panel-table tr[data-file-index=0][data-match-index]:visible").length).toEqual(7);
+                            expect($(".bottom-panel-table tr[data-file-index=1][data-match-index]:visible").length).toEqual(4);
                         });
                     });
                 });
