Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Fix Replace in... unit tests #8117

Merged
njx merged 2 commits into from
Jun 13, 2014
Merged

Fix Replace in... unit tests #8117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef02ed7
fix Replace in... unit tests
redmunds Jun 13, 2014
9a13326
re-order commands
redmunds Jun 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/search/FindInFilesUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,11 @@ define(function (require, exports, module) {

// Initialize: command handlers
CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.CMD_FIND_IN_FILES, _showFindBar);
CommandManager.register(Strings.CMD_REPLACE_IN_FILES, Commands.CMD_REPLACE_IN_FILES, _showReplaceBar);
CommandManager.register(Strings.CMD_FIND_IN_SELECTED, Commands.CMD_FIND_IN_SELECTED, _showFindBarForSubtree);
CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree);
CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.CMD_FIND_IN_SUBTREE, _showFindBarForSubtree);

CommandManager.register(Strings.CMD_REPLACE_IN_FILES, Commands.CMD_REPLACE_IN_FILES, _showReplaceBar);
CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree);
CommandManager.register(Strings.CMD_REPLACE_IN_SUBTREE, Commands.CMD_REPLACE_IN_SUBTREE, _showReplaceBarForSubtree);

// Public exports
Expand Down
8 changes: 4 additions & 4 deletions test/spec/FindInFiles-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,8 +1394,8 @@ define(function (require, exports, module) {

it("should do a search in folder, replace all from find bar", function () {
openTestProjectCopy(defaultSourcePath);
var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/");
openSearchBar(null, true);
var dirEntry = FileSystem.getDirectoryForPath(testPath + "/css/");
openSearchBar(dirEntry, true);
executeReplace("foo", "bar", true);

waitsFor(function () {
Expand All @@ -1418,8 +1418,8 @@ define(function (require, exports, module) {

it("should do a search in file, replace all from find bar", function () {
openTestProjectCopy(defaultSourcePath);
var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/foo.css");
openSearchBar(null, true);
var fileEntry = FileSystem.getFileForPath(testPath + "/css/foo.css");
openSearchBar(fileEntry, true);
executeReplace("foo", "bar", true);

waitsFor(function () {
Expand Down