From 28363a0254572b8b3633628a07692f7e8825c194 Mon Sep 17 00:00:00 2001 From: Yongkang Chen Date: Thu, 21 May 2015 17:08:41 +0800 Subject: [PATCH] Revert "Merge branch 'spec'" This reverts commit b0583c14bda5f75e69a9d70765875b910ad214eb, reversing changes made to 813ea7ef26a60c08179c5d9624b23d0c6e669133. --- spec/ctags-spec.coffee | 17 +---------------- spec/fixtures/tagged-duplicate.js | 6 ------ spec/fixtures/tagged.js | 11 ----------- spec/fixtures/tags | 8 ++++---- 4 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 spec/fixtures/tagged-duplicate.js delete mode 100644 spec/fixtures/tagged.js diff --git a/spec/ctags-spec.coffee b/spec/ctags-spec.coffee index 5e3e4d0..a07708b 100644 --- a/spec/ctags-spec.coffee +++ b/spec/ctags-spec.coffee @@ -26,13 +26,11 @@ describe 'ctags', -> expect(tags[0].name).toBe 'duplicate' expect(tags[0].pattern).toBe '/^function duplicate() {$/' expect(tags[0].kind).toBe 'f' - expect(tags[0].lineNumber).toBe 3 expect(tags[1].file).toBe 'tagged.js' expect(tags[1].name).toBe 'duplicate' expect(tags[1].pattern).toBe '/^function duplicate() {$/' - expect(tags[1].kind).toBe 'f' - expect(tags[1].lineNumber).toBe 7 + expect(tags[0].kind).toBe 'f' describe 'when partialMatch is set to true', -> it 'returns tags that partially match the name', -> @@ -51,14 +49,10 @@ describe 'ctags', -> expect(tags[0].file).toBe 'tagged-duplicate.js' expect(tags[0].name).toBe 'duplicate' expect(tags[0].pattern).toBe '/^function duplicate() {$/' - expect(tags[0].kind).toBe 'f' - expect(tags[0].lineNumber).toBe 3 expect(tags[1].file).toBe 'tagged.js' expect(tags[1].name).toBe 'duplicate' expect(tags[1].pattern).toBe '/^function duplicate() {$/' - expect(tags[1].kind).toBe 'f' - expect(tags[1].lineNumber).toBe 7 describe 'when caseInsensitive is set to true', -> it 'returns tags that match the name case insensitively', -> @@ -78,7 +72,6 @@ describe 'ctags', -> expect(tags[0].name).toBe 'callMeMaybe' expect(tags[0].pattern).toBe '/^function callMeMaybe() {$/' expect(tags[0].kind).toBe 'f' - expect(tags[0].lineNumber).toBe 3 describe '.createReadStream(tagsFilePath)', -> it 'returns a stream that emits data and end events', -> @@ -100,25 +93,21 @@ describe 'ctags', -> expect(tags[0].name).toBe 'callMeMaybe' expect(tags[0].pattern).toBe '/^function callMeMaybe() {$/' expect(tags[0].kind).toBe 'f' - expect(tags[0].lineNumber).toBe 3 expect(tags[1].file).toBe 'tagged-duplicate.js' expect(tags[1].name).toBe 'duplicate' expect(tags[1].pattern).toBe '/^function duplicate() {$/' expect(tags[1].kind).toBe 'f' - expect(tags[1].lineNumber).toBe 3 expect(tags[2].file).toBe 'tagged.js' expect(tags[2].name).toBe 'duplicate' expect(tags[2].pattern).toBe '/^function duplicate() {$/' expect(tags[2].kind).toBe 'f' - expect(tags[2].lineNumber).toBe 7 expect(tags[3].file).toBe 'tagged.js' expect(tags[3].name).toBe 'thisIsCrazy' expect(tags[3].pattern).toBe '/^var thisIsCrazy = true;$/' expect(tags[3].kind).toBe 'v' - expect(tags[3].lineNumber).toBe 2 it "emits an error event when the tags file does not exist", -> missingTagsFile = path.join(__dirname, 'fixtures/not-tags') @@ -152,22 +141,18 @@ describe 'ctags', -> expect(dataHandler.argsForCall[0][0][0].name).toBe 'callMeMaybe' expect(dataHandler.argsForCall[0][0][0].pattern).toBe '/^function callMeMaybe() {$/' expect(dataHandler.argsForCall[0][0][0].kind).toBe 'f' - expect(dataHandler.argsForCall[0][0][0].lineNumber).toBe 3 expect(dataHandler.argsForCall[0][0][1].file).toBe 'tagged-duplicate.js' expect(dataHandler.argsForCall[0][0][1].name).toBe 'duplicate' expect(dataHandler.argsForCall[0][0][1].pattern).toBe '/^function duplicate() {$/' expect(dataHandler.argsForCall[0][0][1].kind).toBe 'f' - expect(dataHandler.argsForCall[0][0][1].lineNumber).toBe 3 expect(dataHandler.argsForCall[0][0][2].file).toBe 'tagged.js' expect(dataHandler.argsForCall[0][0][2].name).toBe 'duplicate' expect(dataHandler.argsForCall[0][0][2].pattern).toBe '/^function duplicate() {$/' expect(dataHandler.argsForCall[0][0][2].kind).toBe 'f' - expect(dataHandler.argsForCall[0][0][2].lineNumber).toBe 7 expect(dataHandler.argsForCall[1][0][0].file).toBe 'tagged.js' expect(dataHandler.argsForCall[1][0][0].name).toBe 'thisIsCrazy' expect(dataHandler.argsForCall[1][0][0].pattern).toBe '/^var thisIsCrazy = true;$/' expect(dataHandler.argsForCall[1][0][0].kind).toBe 'v' - expect(dataHandler.argsForCall[1][0][0].lineNumber).toBe 2 diff --git a/spec/fixtures/tagged-duplicate.js b/spec/fixtures/tagged-duplicate.js deleted file mode 100644 index 2e1e004..0000000 --- a/spec/fixtures/tagged-duplicate.js +++ /dev/null @@ -1,6 +0,0 @@ - - -function duplicate() { - - -} diff --git a/spec/fixtures/tagged.js b/spec/fixtures/tagged.js deleted file mode 100644 index 949d3df..0000000 --- a/spec/fixtures/tagged.js +++ /dev/null @@ -1,11 +0,0 @@ - -var thisIsCrazy = true; -function callMeMaybe() { - -} - -function duplicate() { - - - -} diff --git a/spec/fixtures/tags b/spec/fixtures/tags index 88c7de3..eed6415 100644 --- a/spec/fixtures/tags +++ b/spec/fixtures/tags @@ -4,7 +4,7 @@ !_TAG_PROGRAM_NAME Exuberant Ctags // !_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ !_TAG_PROGRAM_VERSION 5.8 // -callMeMaybe tagged.js /^function callMeMaybe() {$/;" f line:3 -duplicate tagged-duplicate.js /^function duplicate() {$/;" f line:3 -duplicate tagged.js /^function duplicate() {$/;" f line:7 -thisIsCrazy tagged.js /^var thisIsCrazy = true;$/;" v line:2 +callMeMaybe tagged.js /^function callMeMaybe() {$/;" f +duplicate tagged-duplicate.js /^function duplicate() {$/;" f +duplicate tagged.js /^function duplicate() {$/;" f +thisIsCrazy tagged.js /^var thisIsCrazy = true;$/;" v