adding more tests

adding initial tests adding support for minitest removing deprecated api removing console logs
moxley · Apr 21, 2015 · 29f4a0e · 29f4a0e
1 parent 80b5c53
commit 29f4a0e
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 5 deletions.
diff --git a/lib/ruby-test.coffee b/lib/ruby-test.coffee
@@ -2,6 +2,15 @@ RubyTestView = require './ruby-test-view'
 
 module.exports =
   config:
+    minitestAllCommand:
+      type: 'string'
+      default: "ruby -I test test"
+    minitestFileCommand:
+      type: 'string'
+      default: "ruby -I test {relative_path}"
+    minitestSingleCommand:
+      type: 'string'
+      default: "ruby {relative_path} -n \"/{regex}/\""
     testAllCommand:
       type: 'string'
       default: "ruby -I test test"

diff --git a/lib/source-info.coffee b/lib/source-info.coffee
@@ -8,6 +8,7 @@ module.exports =
       test:    'test'
       spec:    'rspec'
       feature: 'cucumber'
+      minitest: 'minitest'
 
     currentShell: ->
       atom.config.get('ruby-test.shell') || 'bash'
@@ -31,12 +32,32 @@ module.exports =
     currentLine: ->
       @_currentLine ||= unless @_currentLine
         editor = atom.workspace.getActiveTextEditor()
-        cursor = editor and editor.getCursor()
+        cursor = editor and editor.getLastCursor()
         if cursor
           cursor.getBufferRow() + 1
         else
           null
 
+    minitestRegExp: (text)->
+      @_minitestRegExp ||= unless @_minitestRegExp 
+        value = text.match(/"(.*?)"/) if text?
+        if value
+          value[1]
+        else
+          ""
+
+    isMiniTest: ->
+      i = @currentLine() - 1
+      regExp = new RegExp(/^(\s+)(should|test|it)\s+['""'](.*)['""']\s+do\s*(?:#.*)?$/)
+      editor = atom.workspace.getActiveTextEditor()
+      while i > 0
+        text = editor.lineTextForBufferRow(i)
+        if regExp.test(text)
+          @minitestRegExp(text)
+          return true
+        i--
+      return false
+
     testFramework: ->
       @_testFramework ||= unless @_testFramework
         (t = @fileType()) and @frameworkLookup[t] or
@@ -47,7 +68,10 @@ module.exports =
         if not @activeFile()
           null
         else if matches = @activeFile().match(/_(test|spec)\.rb$/)
-          matches[1]
+          if @isMiniTest()
+            "minitest"
+          else
+            matches[1]
         else if matches = @activeFile().match(/\.(feature)$/)
           matches[1]
 

diff --git a/lib/test-runner.coffee b/lib/test-runner.coffee
@@ -30,7 +30,8 @@ module.exports =
         else
           @testParams.testFileCommand()
       cmd.replace('{relative_path}', @testParams.activeFile()).
-          replace('{line_number}', @testParams.currentLine())
+          replace('{line_number}', @testParams.currentLine()).
+          replace('{regex}', @testParams.minitestRegExp())
 
     cancel: ->
       @shell.kill()
diff --git a/spec/source-info-spec.coffee b/spec/source-info-spec.coffee
@@ -26,8 +26,14 @@ describe "SourceInfo", ->
       atom.config.set("ruby-test.#{framework}SingleCommand", "foo-#{framework}SingleCommand")
 
 
-  setUpOpenFile = ->
+  setUpOpenFile = ()->
     editor = {buffer: {file: {path: "foo_test.rb"}}}
+    cursor =
+      getBufferRow: ->
+        99
+    editor.getLastCursor = -> cursor
+    editor.lineTextForBufferRow = (line) ->
+      ""
     spyOn(atom.workspace, 'getActiveTextEditor').andReturn(editor)
 
   setUpWithOpenFile = ->
@@ -52,6 +58,13 @@ describe "SourceInfo", ->
       setUpWithoutOpenFile()
       expect(sourceInfo.cwd()).toBe("fooPath")
 
+  describe "::fileType", ->
+    it "correctly detects a minitest file", ->
+      setUpWithOpenFile()
+      editor.lineTextForBufferRow = (line) ->
+        " it \"test something\" do"
+      expect(sourceInfo.fileType()).toBe("minitest")
+
   describe "::projectType", ->
     it "correctly detects a test directory", ->
       spyOn(fs, 'existsSync').andCallFake (filePath) ->
@@ -118,14 +131,36 @@ describe "SourceInfo", ->
       cursor =
         getBufferRow: ->
           99
-      editor.getCursor = -> cursor
+      editor.getLastCursor = -> cursor
       expect(sourceInfo.currentLine()).toBe(100)
 
     describe "without editor", ->
       it "is null", ->
         setUpWithoutOpenFile()
         expect(sourceInfo.currentLine()).toBeNull()
 
+  describe "::minitestRegExp", ->
+    it "correctly returns the matching regex", ->
+      setUpWithoutOpenFile()
+      expect(sourceInfo.minitestRegExp(" it \"test something\" do")).toBe("test something")
+
+    it "should return empty string if no match", ->
+      setUpWithoutOpenFile()
+      expect(sourceInfo.minitestRegExp("test something")).toBe("")
+
+  describe "::isMiniTest", ->
+    it "correctly returns true if it is minitest spec file", ->
+      setUpWithOpenFile()
+      editor.lineTextForBufferRow = (line) ->
+        " it \"test something\" do"
+      expect(sourceInfo.isMiniTest("")).toBe(true)
+
+    it "returns false if it is not a minitest spec file", ->
+      setUpWithOpenFile()
+      editor.lineTextForBufferRow = (line) ->
+        "def something"
+      expect(sourceInfo.isMiniTest("")).toBe(false)
+
   describe "::currentShell", ->
     it "when ruby-test.shell is null", ->
       setUpWithoutOpenFile()

diff --git a/spec/test-runner-spec.coffee b/spec/test-runner-spec.coffee
@@ -14,6 +14,7 @@ describe "TestRunner", ->
     spyOn(@testRunnerParams, 'setTestInfo')
     spyOn(SourceInfo.prototype, 'activeFile').andReturn('fooTestFile')
     spyOn(SourceInfo.prototype, 'currentLine').andReturn(100)
+    spyOn(SourceInfo.prototype, 'minitestRegExp').andReturn('test foo')
     spyOn(SourceInfo.prototype, 'testFileCommand').andReturn('fooTestCommand {relative_path}')
     spyOn(SourceInfo.prototype, 'testSingleCommand').andReturn('fooTestCommand {relative_path}:{line_number}')
 
@@ -31,3 +32,10 @@ describe "TestRunner", ->
       runner = new TestRunner(@testRunnerParams)
       runner.run()
       expect(@testRunnerParams.setTestInfo).toHaveBeenCalledWith("fooTestCommand fooTestFile:100")
+
+    it "constructs a single-minitest command when testScope is 'single'", ->
+      SourceInfo.prototype.testSingleCommand.andReturn('fooTestCommand {relative_path} -n \"/{regex}/\"')
+      @testRunnerParams.testScope = "single"
+      runner = new TestRunner(@testRunnerParams)
+      runner.run()
+      expect(@testRunnerParams.setTestInfo).toHaveBeenCalledWith("fooTestCommand fooTestFile -n \"/test foo/\"")