From 711d20ea14b288c8c65aced0d548abe75fe531c4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 12 Jun 2013 17:35:12 -0700 Subject: [PATCH] Rename path variables to prevent collisions --- src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee | 4 ++-- src/packages/status-bar/spec/status-bar-spec.coffee | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee index b6b0c9347..071e8f5b1 100644 --- a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee +++ b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee @@ -111,11 +111,11 @@ describe 'FuzzyFinder', -> describe "when the selected path isn't a file that exists", -> it "leaves the the tree view open, doesn't open the path in the editor, and displays an error", -> rootView.attachToDom() - path = rootView.getActiveView().getPath() + editorPath = rootView.getActiveView().getPath() rootView.trigger 'fuzzy-finder:toggle-file-finder' finderView.confirmed({path: 'dir/this/is/not/a/file.txt'}) expect(finderView.hasParent()).toBeTruthy() - expect(rootView.getActiveView().getPath()).toBe path + expect(rootView.getActiveView().getPath()).toBe editorPath expect(finderView.find('.error').text().length).toBeGreaterThan 0 advanceClock(2000) expect(finderView.find('.error').text().length).toBe 0 diff --git a/src/packages/status-bar/spec/status-bar-spec.coffee b/src/packages/status-bar/spec/status-bar-spec.coffee index 54b185ecc..ab7b99fb0 100644 --- a/src/packages/status-bar/spec/status-bar-spec.coffee +++ b/src/packages/status-bar/spec/status-bar-spec.coffee @@ -115,9 +115,8 @@ describe "StatusBar", -> rootView.attachToDom() it "displays the current branch for files in repositories", -> - path = require.resolve('fixtures/git/master.git/HEAD') project.setPath(fsUtils.resolveOnLoadPath('fixtures/git/master.git')) - rootView.open(path) + rootView.open(require.resolve('fixtures/git/master.git/HEAD')) expect(statusBar.branchArea).toBeVisible() expect(statusBar.branchLabel.text()).toBe 'master'