(#59) Correctly detect cucumber file

moxley · Sep 11, 2015 · 0ab0431 · 0ab0431
1 parent 397f9a5
commit 0ab0431
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 0.9.14
+
+* Correctly detect Cucumber feature file when project has .rspec file (#59)
+
 ## Version 0.9.13
 
 * Configurable spec framework and test framework (#57)

diff --git a/lib/source-info.coffee b/lib/source-info.coffee
@@ -111,8 +111,8 @@ module.exports =
 
     testFramework: ->
       @_testFramework ||= unless @_testFramework
-        (fs.existsSync(@projectPath() + '/.rspec') and 'rspec') or
         ((t = @fileType()) and @frameworkLookup[t]) or
+        (fs.existsSync(@projectPath() + '/.rspec') and 'rspec') or
         @projectType()
 
     fileType: ->

diff --git a/spec/source-info-spec.coffee b/spec/source-info-spec.coffee
@@ -45,9 +45,9 @@ describe "SourceInfo", ->
       for key, value of opts.config
         atom.config.set(key, value)
 
-    if opts.mkdirs
+    if opts.mockPaths
       spyOn(fs, 'existsSync').andCallFake (path) ->
-        path in opts.mkdirs
+        path in opts.mockPaths
 
   beforeEach ->
     editor = null
@@ -157,7 +157,10 @@ describe "SourceInfo", ->
           projectPaths: ['/home/user/project_1']
           testFile: '/home/user/project_1/foo/foo.feature'
           currentLine: 1
-          mkdirs: ['/home/user/project_1/spec']
+          mockPaths: [
+            '/home/user/project_1/spec',
+            '/home/user/project_1/.rspec'
+          ],
           fileContent:
             """
             """
@@ -170,23 +173,23 @@ describe "SourceInfo", ->
       withSetup
         projectPaths: ['/home/user/my_project']
         testFile: null
-        mkdirs: ['/home/user/my_project/test']
+        mockPaths: ['/home/user/my_project/test']
 
       expect(sourceInfo.projectType()).toBe("test")
 
     it "correctly detecs a spec directory", ->
       withSetup
         projectPaths: ['/home/user/my_project']
         testFile: null
-        mkdirs: ['/home/user/my_project/spec']
+        mockPaths: ['/home/user/my_project/spec']
 
       expect(sourceInfo.projectType()).toBe("rspec")
 
     it "correctly detects a cucumber directory", ->
       withSetup
         projectPaths: ['/home/user/my_project']
         testFile: null
-        mkdirs: ['/home/user/my_project/features']
+        mockPaths: ['/home/user/my_project/features']
 
       expect(sourceInfo.projectType()).toBe("cucumber")
 
@@ -196,7 +199,7 @@ describe "SourceInfo", ->
         config: "ruby-test.testAllCommand": "my_ruby -I test test"
         projectPaths: ['/home/user/my_project']
         testFile: null
-        mkdirs: ['/home/user/my_project/test']
+        mockPaths: ['/home/user/my_project/test']
 
       expect(sourceInfo.testAllCommand()).toBe("my_ruby -I test test")
 
@@ -206,7 +209,7 @@ describe "SourceInfo", ->
         config: "ruby-test.rspecAllCommand": "my_rspec spec"
         projectPaths: ['/home/user/my_project']
         testFile: null
-        mkdirs: ['/home/user/my_project/spec']
+        mockPaths: ['/home/user/my_project/spec']
 
       expect(sourceInfo.testAllCommand()).toBe("my_rspec spec")