Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Commit

Permalink
Sync open-files-find-view-spec with changes to project-find-view-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
@trevdor
trevdor committed Jan 22, 2019
1 parent 5840cf7 commit 6e116d1
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 44 deletions.
111 changes: 69 additions & 42 deletions spec/open-files-find-view-spec.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/** @babel */

const os = require('os');
const path = require('path');
const temp = require('temp');
const temp = require('temp').track();
const fs = require('fs-plus');
const {TextBuffer} = require('atom');
const {PathReplacer, PathSearcher} = require('scandal');
Expand Down Expand Up @@ -34,17 +33,17 @@ describe('OpenFilesFindView', () => {
return getExistingResultsPane().refs.resultsView;
}

beforeEach(async () => {
beforeEach(() => {
pathSearcher = new PathSearcher();
workspaceElement = atom.views.getView(atom.workspace);
atom.config.set('core.excludeVcsIgnoredPaths', false);
atom.project.setPaths([path.join(__dirname, 'fixtures')]);
await atom.workspace.open(path.join(__dirname, 'fixtures', 'one-long-line.coffee'));
await atom.workspace.open(path.join(__dirname, 'fixtures', 'sample.js'));
jasmine.attachToDOM(workspaceElement);

activationPromise = atom.packages.activatePackage("find-and-replace").then(function({mainModule}) {
activationPromise = atom.packages.activatePackage("find-and-replace").then(async function({mainModule}) {
mainModule.createViews();
await atom.workspace.open(path.join(__dirname, 'fixtures', 'one-long-line.coffee'));
await atom.workspace.open(path.join(__dirname, 'fixtures', 'sample.js'));
({findView, openFilesFindView} = mainModule);
const spy = spyOn(openFilesFindView, 'search').andCallFake((options) => {
return searchPromise = spy.originalValue.call(openFilesFindView, options);
Expand All @@ -53,7 +52,7 @@ describe('OpenFilesFindView', () => {
});

describe("when open-files-find:show is triggered", () => {
it("attaches openFilesFindView to the root view", async () => {
it("attaches OpenFilesFindView to the root view", async () => {
atom.commands.dispatch(workspaceElement, 'open-files-find:show');
await activationPromise;

Expand Down Expand Up @@ -147,6 +146,7 @@ describe('OpenFilesFindView', () => {
beforeEach(async () => {
editor = await atom.workspace.open('sample.js');
editorElement = atom.views.getView(editor);
await atom.workspace.open('sample.coffee');
atom.commands.dispatch(workspaceElement, 'open-files-find:show');
await activationPromise;
workspaceElement.style.height = '800px'
Expand All @@ -156,7 +156,6 @@ describe('OpenFilesFindView', () => {
beforeEach(async () => {
let projectPath = temp.mkdirSync("atom");
fs.writeFileSync(path.join(projectPath, "tabs.txt"), "\t\n\\\t\n\\\\t");
await atom.workspace.open(path.join(projectPath, "tabs.txt"));
atom.project.setPaths([projectPath]);
atom.commands.dispatch(workspaceElement, 'open-files-find:show');
});
Expand All @@ -172,7 +171,7 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(2);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(2);
})
});

Expand All @@ -186,7 +185,7 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(1);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(1);
});

it("finds a backslash", async () => {
Expand All @@ -198,7 +197,8 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(3);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(2);
expect(resultsView.refs.listView.element.querySelectorAll(".match.highlight-info")).toHaveLength(3);
});

it("doesn't insert a escaped char if there are multiple backslashs in front of the char", async () => {
Expand All @@ -210,7 +210,7 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(1);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(1);
});
});
});
Expand Down Expand Up @@ -297,7 +297,7 @@ describe('OpenFilesFindView', () => {
});

it("does not split when option is false", async () => {
const initialPane = atom.workspace.getActivePane();
const initialPane = atom.workspace.getCenter().getActivePane();
openFilesFindView.findEditor.setText('items');

atom.commands.dispatch(openFilesFindView.element, 'core:confirm');
Expand All @@ -314,20 +314,23 @@ describe('OpenFilesFindView', () => {
await searchPromise;

const resultsPaneView1 = atom.views.getView(getExistingResultsPane());
const pane1 = atom.workspace.getActivePane();
const pane1 = atom.workspace.getCenter().getActivePane();
const resultsView1 = pane1.getItems()[0].refs.resultsView
pane1.splitRight({copyActiveItem: true});

const pane2 = atom.workspace.getActivePane();
const pane2 = atom.workspace.getCenter().getActivePane();
const resultsView2 = pane2.getItems()[0].refs.resultsView
const resultsPaneView2 = atom.views.getView(pane2.itemForURI(ResultsPaneView.URI));
expect(pane1).not.toBe(pane2);
expect(resultsPaneView1).not.toBe(resultsPaneView2);
simulateResizeEvent(resultsView2.element);

const {length: resultCount} = resultsPaneView1.querySelectorAll('.search-result');
await etch.update(resultsView1);
await etch.update(resultsView2);

const resultCount = resultsPaneView1.querySelectorAll('.match-row').length;
expect(resultCount).toBeGreaterThan(0);
expect(resultsPaneView2.querySelectorAll('.search-result')).toHaveLength(resultCount);
expect(resultsPaneView2.querySelectorAll('.match-row')).toHaveLength(resultCount);
expect(resultsPaneView2.querySelector('.preview-count').innerHTML).toEqual(resultsPaneView1.querySelector('.preview-count').innerHTML);
});

Expand All @@ -339,21 +342,25 @@ describe('OpenFilesFindView', () => {
await searchPromise;

const resultsPaneView1 = atom.views.getView(getExistingResultsPane());
const pane1 = atom.workspace.getActivePane();
const pane1 = atom.workspace.getCenter().getActivePane();
const resultsView1 = pane1.getItems()[0].refs.resultsView

pane1.splitDown({copyActiveItem: true});
const pane2 = atom.workspace.getActivePane();
const pane2 = atom.workspace.getCenter().getActivePane();
const resultsView2 = pane2.getItems()[0].refs.resultsView
const resultsPaneView2 = atom.views.getView(pane2.itemForURI(ResultsPaneView.URI));
expect(pane1).not.toBe(pane2);
expect(resultsPaneView1).not.toBe(resultsPaneView2);

await etch.update(resultsView1);
await etch.update(resultsView2);

expect(resultsPaneView2.querySelector('.preview-count').innerHTML).toEqual(resultsPaneView1.querySelector('.preview-count').innerHTML);
});
});

describe("serialization", () => {
it("serializes if the case, regex and whole word options", async () => {
it("serializes the case, regex and whole word options", async () => {
atom.commands.dispatch(editorElement, 'open-files-find:show');
expect(openFilesFindView.refs.caseOptionButton).not.toHaveClass('selected');
openFilesFindView.refs.caseOptionButton.click();
Expand Down Expand Up @@ -398,13 +405,14 @@ describe('OpenFilesFindView', () => {

await searchPromise;

// Would not expect these assertions to pass without first opening 2 files
expect(openFilesFindView.refs.descriptionLabel.textContent).toContain('13 results found in 2 open files');
atom.commands.dispatch(openFilesFindView.element, 'core:confirm');
expect(openFilesFindView.refs.descriptionLabel.textContent).toContain('13 results found in 2 open files');
});

it("shows an error when the pattern is invalid and clears when no error", async () => {
spyOn(pathSearcher, 'searchPaths').andReturn(Promise.resolve()); // TODO: Remove?
spyOn(pathSearcher, 'searchPaths').andReturn(Promise.resolve());
atom.commands.dispatch(openFilesFindView.element, 'open-files-find:toggle-regex-option');
openFilesFindView.findEditor.setText('[');
atom.commands.dispatch(openFilesFindView.element, 'core:confirm');
Expand Down Expand Up @@ -501,7 +509,7 @@ describe('OpenFilesFindView', () => {
await searchPromise;
});

it("runs a case insensitive search by default", () => expect(String(PathSearcher.searchPaths.argsForCall[0][0])).toEqual(String(/ITEMS/gi)));
it("runs a case insensitive search by default", () => expect(PathSearcher.searchPaths.argsForCall[0][0]).toEqual(/ITEMS/gi));

it("toggles case sensitive option via an event and finds files matching the pattern", async () => {
expect(openFilesFindView.refs.caseOptionButton).not.toHaveClass('selected');
Expand Down Expand Up @@ -568,7 +576,8 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(13);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(11);
expect(resultsView.refs.listView.element.querySelectorAll(".match.highlight-info")).toHaveLength(13);
})
});

Expand All @@ -577,8 +586,8 @@ describe('OpenFilesFindView', () => {
atom.commands.dispatch(workspaceElement, 'open-files-find:show')
});

describe("when the there search field is empty", () => {
it("does not run the seach but clears the model", () => {
describe("when the search field is empty", () => {
it("does not run the search but clears the model", () => {
spyOn(pathSearcher, 'searchPaths');
spyOn(openFilesFindView.model, 'clear');
atom.commands.dispatch(openFilesFindView.element, 'core:confirm');
Expand Down Expand Up @@ -628,37 +637,50 @@ describe('OpenFilesFindView', () => {

await resultsView.heightInvalidationPromise
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(13);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(11);
expect(resultsView.refs.listView.element.querySelectorAll(".match.highlight-info")).toHaveLength(13);

expect(resultsPaneView.refs.previewCount.textContent).toBe("13 results found in 2 files for items");
expect(openFilesFindView.errorMessages).not.toBeVisible();
expect(projectFindView.errorMessages).not.toBeVisible();
});

it("updates the results list when a buffer changes", async () => {
const buffer = atom.project.bufferForPathSync('sample.js');
const editor = await atom.workspace.open('sample.js')

atom.commands.dispatch(openFilesFindView.element, 'core:confirm');
await searchPromise;

const resultsView = getResultsView();
const listView = resultsView.refs.listView;
const resultsPaneView = getExistingResultsPane();

await resultsView.heightInvalidationPromise
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(13);
expect(listView.element.querySelectorAll(".match-row")).toHaveLength(11);
expect(listView.element.querySelectorAll(".match.highlight-info")).toHaveLength(13);
// This assertion should fail until 2 files are open
expect(resultsPaneView.refs.previewCount.textContent).toBe("13 results found in 2 files for items");

resultsView.selectFirstResult();
for (let i = 0; i < 7; i++) await resultsView.moveDown()
expect(resultsView.refs.listView.element.querySelectorAll(".path")[1]).toHaveClass('selected');
for (let i = 0; i < 6; i++) resultsView.moveDown();
await resultsView.moveDown();

expect(listView.element.querySelectorAll(".path-row")[1].parentElement).toHaveClass('selected');

buffer.setText('there is one "items" in this file');
advanceClock(buffer.stoppedChangingDelay);
editor.setText('there is one "items" in this file');
advanceClock(editor.getBuffer().stoppedChangingDelay);
await etch.getScheduler().getNextUpdatePromise()
// This assertion should fail until 2 files are open
expect(resultsPaneView.refs.previewCount.textContent).toBe("8 results found in 2 files for items");
expect(resultsView.refs.listView.element.querySelectorAll(".path")[1]).toHaveClass('selected');
expect(listView.element.querySelectorAll(".path-row")[1].parentElement).toHaveClass('selected');

// Ensure the newly added item can be opened.
await resultsView.moveDown()
atom.commands.dispatch(resultsView.element, 'core:confirm');
await new Promise(resolve => editor.onDidChangeSelectionRange(resolve));
expect(editor.getSelectedText()).toBe("items")

buffer.setText('no matches in this file');
advanceClock(buffer.stoppedChangingDelay);
editor.setText('no matches in this file');
advanceClock(editor.getBuffer().stoppedChangingDelay);
await etch.getScheduler().getNextUpdatePromise()
expect(resultsPaneView.refs.previewCount.textContent).toBe("7 results found in 1 file for items");
});
Expand All @@ -677,7 +699,7 @@ describe('OpenFilesFindView', () => {
const resultsView = getResultsView();
expect(openFilesFindView.refs.errorMessages).not.toBeVisible();
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(0);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(0);
});
});
});
Expand Down Expand Up @@ -775,10 +797,12 @@ describe('OpenFilesFindView', () => {
expect(errorList.querySelectorAll("li")).toHaveLength(0);

callback(null, {path: '/some/path.js', code: 'ENOENT', message: 'Nope'});
await etch.update(resultsPaneView);
expect(errorList).toBeVisible();
expect(errorList.querySelectorAll("li")).toHaveLength(1);

callback(null, {path: '/some/path.js', code: 'ENOENT', message: 'Broken'});
await etch.update(resultsPaneView);
expect(errorList.querySelectorAll("li")).toHaveLength(2);
});

Expand Down Expand Up @@ -870,11 +894,14 @@ describe('OpenFilesFindView', () => {

const resultsView = getResultsView();
resultsView.scrollToBottom(); // To load ALL the results
await etch.update(resultsView);
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(13);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(11);
expect(resultsView.refs.listView.element.querySelectorAll(".match.highlight-info")).toHaveLength(13);

resultsView.selectFirstResult();
for (let i = 0; i < 10; i++) await resultsView.moveDown();
for (let i = 0; i < 9; i++) resultsView.moveDown();
await resultsView.moveDown();

atom.commands.dispatch(resultsView.element, 'core:confirm');
await new Promise(resolve => editor.onDidChangeSelectionRange(resolve))
Expand Down Expand Up @@ -904,12 +931,12 @@ describe('OpenFilesFindView', () => {
});
});

describe("replacing", () => {
xdescribe("replacing", () => {
let testDir, sampleJs, sampleCoffee, replacePromise;

beforeEach(async () => {
pathReplacer = new PathReplacer();
testDir = path.join(os.tmpdir(), "atom-find-and-replace");
testDir = temp.mkdirSync('atom-find-and-replace');
sampleJs = path.join(testDir, 'sample.js');
sampleCoffee = path.join(testDir, 'sample.coffee');

Expand Down Expand Up @@ -1192,7 +1219,7 @@ describe('OpenFilesFindView', () => {

const resultsView = getResultsView();
expect(resultsView.element).toBeVisible();
expect(resultsView.refs.listView.element.querySelectorAll(".search-result")).toHaveLength(0);
expect(resultsView.refs.listView.element.querySelectorAll(".match-row")).toHaveLength(0);

expect(openFilesFindView.refs.descriptionLabel.textContent).toContain("Replaced items with sunshine 13 times in 2 open files");

Expand Down
4 changes: 2 additions & 2 deletions spec/project-find-view-spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ describe('ProjectFindView', () => {
});

describe("serialization", () => {
it("serializes if the case, regex and whole word options", async () => {
it("serializes the case, regex and whole word options", async () => {
atom.commands.dispatch(editorElement, 'project-find:show');
expect(projectFindView.refs.caseOptionButton).not.toHaveClass('selected');
projectFindView.refs.caseOptionButton.click();
Expand Down Expand Up @@ -708,7 +708,7 @@ describe('ProjectFindView', () => {
atom.commands.dispatch(workspaceElement, 'project-find:show')
});

describe("when the there search field is empty", () => {
describe("when the search field is empty", () => {
it("does not run the search but clears the model", () => {
spyOn(atom.workspace, 'scan');
spyOn(projectFindView.model, 'clear');
Expand Down

0 comments on commit 6e116d1

Please sign in to comment.