test: find in files integ tests

Author: abose

test/spec/FindInFiles-integ-test.js

@@ -49,7 +49,8 @@ define(function (require, exports, module) {
             ProjectManager,
             SearchResultsView,
             testWindow,
-            $;
+            $,
+            __PR;
 
         beforeAll(async function () {
             await SpecRunnerUtils.createTempDirectory();
@@ -71,6 +72,7 @@ define(function (require, exports, module) {
             SearchResultsView   = testWindow.brackets.test.SearchResultsView;
             $                   = testWindow.$;
             PreferencesManager  = testWindow.brackets.test.PreferencesManager;
+            __PR                = testWindow.__PR;
             PreferencesManager.set("findInFiles.nodeSearch", false);
             PreferencesManager.set("findInFiles.instantSearch", false);
             PreferencesManager.set("maxSearchHistory", 5);
@@ -89,6 +91,8 @@ define(function (require, exports, module) {
             $                   = null;
             testWindow          = null;
             PreferencesManager  = null;
+            __PR                = null;
+
             await SpecRunnerUtils.closeTestWindow();
             await SpecRunnerUtils.removeTempDirectory();
         }, 30000);
@@ -125,6 +129,10 @@ define(function (require, exports, module) {
             });
         }
 
+        function getSearchField() {
+            return $("#find-what");
+        }
+
         async function closeSearchBar() {
             FindInFilesUI._closeFindBar();
             await waitForSearchBarClose();
@@ -571,6 +579,28 @@ define(function (require, exports, module) {
                 // Search model shouldn't be cleared after search bar closed without running a search
                 expect(Object.keys(FindInFiles.searchModel.results).length).not.toBe(0);
             });
+
+            it("should switch between find replace and find in files with selection work as expected", async function () {
+                await closeSearchBar();
+                const filePath = testPath + "/foo.js";
+                await __PR.openFile(filePath);
+                __PR.setCursors(["7:5-7:13"]); // select text: function
+                CommandManager.execute(Commands.CMD_FIND);
+
+                expect(getSearchField().val()).toEql("function");
+
+                CommandManager.execute(Commands.CMD_FIND_IN_FILES);
+                await awaitsFor(()=>{
+                    return $("#find-in-files-results .contracting-col").text() === "function";
+                }, ()=>{
+                    return `Find in files search to be function but got${$("#find-in-files-results .contracting-col").text()}`;
+                });
+
+                __PR.setCursors(["5:15-5:22"]); // select text: require
+                CommandManager.execute(Commands.CMD_FIND);
+                expect(getSearchField().val()).toEql("require");
+                await openSearchBar();
+            });
         });
     });
 });

test/spec/FindReplace-integ-test.js

@@ -90,7 +90,7 @@ define(function (require, exports, module) {
         ];
 
 
-        var testWindow, twCommandManager, twEditorManager, twFindInFiles, tw$;
+        var testWindow, twCommandManager, twEditorManager, twFindInFiles, tw$, __PR;
         var myDocument, myEditor;
 
         // Helper functions for testing cursor position / selection range
@@ -574,7 +574,34 @@ define(function (require, exports, module) {
                 twCommandManager.execute(Commands.CMD_FIND_NEXT);
                 expectSelection(capitalFooSelections[1]);
                 expectMatchIndex(1, 3);
-            }, 100000);
+            });
+
+            it("should highlight the current position match properly", async function () {
+                myEditor.setCursorPos(0, 0);
+
+                twCommandManager.execute(Commands.CMD_FIND);
+
+                enterSearchText("Foo");
+                pressEscape();
+
+                await waitsForSearchBarClose();
+
+                // Open search bar a second time
+                myEditor.setCursorPos(2, 8); // |Foo
+                twCommandManager.execute(Commands.CMD_FIND);
+
+                expectSearchBarOpen();
+                expect(getSearchField().val()).toEql("Foo");
+                expectMatchIndex(0, 4);
+
+                myEditor.setCursorPos(2, 9); // F|oo
+                twCommandManager.execute(Commands.CMD_FIND);
+                expectMatchIndex(0, 4);
+
+                myEditor.setCursorPos(2, 11); // Foo|
+                twCommandManager.execute(Commands.CMD_FIND);
+                expectMatchIndex(0, 4);
+            });
 
             it("should open search bar on Find Next with no previous search", async function () {
                 // Make sure we have no previous query