test_launcher 2.14.0 → 2.14.1.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b59f00b901cff2468945b801e83ea7cf896709
-  data.tar.gz: 657c4065ed96c0c9b965064edbc0ddf6dac808b1
+  metadata.gz: d4a45be4f0446aca788daa527994210037afe9a7
+  data.tar.gz: 100256d6001d57eca614037a69def2499e86b08a
 SHA512:
-  metadata.gz: d4a978c3bdd1b7e569722c19923249f883e290024b2380e1077e79b9c9c23c42b8a9ca0e93c6065aa243bd9741ca34c897ea98608474041055bfb0094388d6d2
-  data.tar.gz: bc82003b5c1e82a701fa7777af459f184999d293f0f05eac52ed1e82b7f90711e5db53012142d1d05e92277030a2801adc3c92f79585af87cbd6fb0ce6ef4941
+  metadata.gz: 80e4ba43679d1e492bf8427113b798f188fa3bb5211c4876a2ab034c09b90cba155f7d55ebac2fd3ce09576546744c97ad05b2edc659a4a9e7adf2ac4e553b92
+  data.tar.gz: e52381314b0d8136ba4c2937c403440d0517161921466e6ebf2f76097174acfd0c872a58151568c11037ee10ab6c4cde8050ffa37f5df4d9135590c1905d21c9

data/README.md

@@ -362,63 +362,33 @@ If you don't want to use spring to run your tests, but test_launcher tries to us
 
 # Visual Studio Code Support
 
-To run tests from the editor, we need to define some tasks. I like to have three tasks defined: run the test that contains the cursor, run the whole test file, and rerun the last test.
-
-You can add these to your `.vscode/tasks.json` file:
-
-```
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "taskName": "run-test-line",
-      "command": "test_launcher",
-      "runner": "terminal",
-      "args": [
-        "${file}:${lineNumber}",
-        "--disable-spring"
-      ]
-    },
-    {
-      "taskName": "run-test-file",
-      "command": "test_launcher",
-      "runner": "terminal",
-      "args": [
-        "${file}",
-        "--disable-spring"
-      ]
-    },
-    {
-      "taskName": "rerun-last-test",
-      "command": "test_launcher",
-      "runner": "terminal",
-      "args": [
-        "--rerun"
-      ]
-    }
-  ]
-}
-```
-
-Next, we need some key-combos to trigger each task. Add this to your `.vscode/keybindings.json` and tweak the key-combos to your liking:
-```
-...
-    {
-        "key": "shift+cmd+r",
-        "command": "workbench.action.tasks.runTask",
-        "args": "run-test-line"
-    },
-    {
-        "key": "alt+cmd+r",
-        "command": "workbench.action.tasks.runTask",
-        "args": "run-test-file"
-    },
-    {
-        "key": "cmd+r",
-        "command": "workbench.action.tasks.runTask",
-        "args": "rerun-last-test"
-    }
-...
+Install the [Run in Terminal](https://marketplace.visualstudio.com/items?itemName=kortina.run-in-terminal) extension. This allows us to assign keybindings to specific terminal commands.  Then we can add TestLauncher keybindings to our `keybindings.json`. Here is an example configuration:
+
+```
+  {
+      "key": "shift+cmd+r",
+      "command": "runInTerminal.run",
+      "args": {
+          "cmd": "test_launcher ${file}:${line}",
+          "match": ".*"
+      }
+  },
+  {
+      "key": "alt+cmd+r",
+      "command": "runInTerminal.run",
+      "args": {
+          "cmd": "test_launcher ${file}",
+          "match": ".*"
+      }
+  },
+  {
+      "key": "cmd+r",
+      "command": "runInTerminal.run",
+      "args": {
+          "cmd": "test_launcher --rerun",
+          "match": ".*"
+      }
+  },
 ```
 
 # Atom Support

data/lib/test_launcher/cli.rb

@@ -37,7 +37,7 @@ module TestLauncher
       end
     end
 
-    def self.launch(argv, env, shell: Shell::HistoryRunner.new, searcher: Search.searcher(shell))
+    def self.launch(argv, env, shell: Shell::HistoryRunner.new(shell: Shell::Runner.new(log_path: '/tmp/test_launcher.log')), searcher: Search.searcher(shell))
       options = CLI::InputParser.new(
         argv,
         env

data/lib/test_launcher/cli/input_parser.rb

@@ -6,6 +6,7 @@ require "test_launcher/frameworks/rspec"
 require "test_launcher/frameworks/minitest"
 require "test_launcher/frameworks/ex_unit"
 require "test_launcher/frameworks/generic"
+require "test_launcher/frameworks/mochajs"
 require "test_launcher/cli/options"
 
 module TestLauncher
@@ -60,7 +61,12 @@ VERSION: #{TestLauncher::VERSION}
           elsif @options[:framework] == "generic"
             [Frameworks::Generic]
           else
-            [Frameworks::Minitest, Frameworks::RSpec, Frameworks::ExUnit, Frameworks::Generic]
+            [Frameworks::Minitest,
+            Frameworks::RSpec,
+            Frameworks::ExUnit,
+            Frameworks::Mochajs,
+            Frameworks::Generic,
+          ]
           end
 
         Options.new(

data/lib/test_launcher/frameworks/mochajs.rb

@@ -0,0 +1,109 @@
+require "shellwords"
+require "test_launcher/frameworks/base"
+
+module TestLauncher
+  module Frameworks
+    module Mochajs
+
+      def self.active?
+        output = `find . -name package-lock.json -exec grep mocha {} \;`
+        !output.chomp.strip.empty?.tap {|r| puts "mochajs: #{r}"}
+      end
+
+      def self.test_case(*a)
+        TestCase.new(*a)
+      end
+
+      def self.searcher(*a)
+        Searcher.new(*a)
+      end
+
+      def self.runner(*a)
+        Runner.new(*a)
+      end
+
+      class Searcher < Base::Searcher
+
+        def by_line(file_pattern, line_number)
+          files = test_files(file_pattern)
+          return [] unless files.any?
+          raise multiple_files_error if files.size > 1
+          #
+          file = files.first
+          grep_results = raw_searcher.grep(example_name_regex, file_pattern: file)
+
+          if grep_results.empty?
+            # the file exists, but doesn't appear to contain any tests...
+            # we'll try to run it anyway
+            return [file: file]
+          end
+
+          best_result =
+            grep_results
+              .select {|r| line_number >= r[:line_number]}
+              .min_by {|r| line_number - r[:line_number]}
+
+          if best_result
+            [{
+              file: best_result[:file],
+              example_name: best_result[:line].match(/(it|describe)\(["'](.*)['"],/)[2],
+              line_number: best_result[:line_number]
+            }]
+          else
+            # line number outside of example. Run whole file
+            [{
+              file: grep_results.first[:file]
+            }]
+          end
+        end
+
+        private
+
+        def file_name_regex
+          /.*pec\.js/
+        end
+
+        def file_name_pattern
+          '*pec.js'
+        end
+
+        def example_name_regex(query="")
+          "^\s*(it|describe).*(#{query}).*,.*"
+        end
+      end
+
+      class Runner < Base::Runner
+        def by_line_number(test_case)
+          if test_case.example
+            single_example(test_case, exact_match: true)
+          else
+            single_file(test_case)
+          end
+        end
+
+        def single_example(test_case, **_)
+          multiple_examples_same_root([test_case])
+        end
+
+        def multiple_examples_same_file(test_cases)
+          test_case = test_cases.first
+          single_example(test_case)
+        end
+
+        def multiple_examples_same_root(test_cases)
+          %{cd #{test_cases.first.app_root} && npm run test #{test_cases.map(&:file).join(" ")} -- --grep #{Shellwords.escape(test_cases.first.example)}}
+        end
+
+        def one_or_more_files(test_cases)
+          %{cd #{test_cases.first.app_root} && npm run test #{test_cases.map(&:file).join(" ")}}
+        end
+      end
+
+      class TestCase < Base::TestCase
+        def test_root_dir_name
+          "test"
+        end
+      end
+    end
+  end
+end

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.14.0"
+  VERSION = "2.14.1.pre1"
 end

data/test/test_launcher/rubymine_test.rb

@@ -34,14 +34,14 @@ module TestLauncher
 
     def test_launch__debug__example
       args = "/Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name=some_test_name"
-      expected_command = "cd /Users/username/some_app/engines/some_engine && ruby -I test /Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name=some_test_name"
+      expected_command = "cd /Users/username/some_app/engines/some_engine && bundle exec ruby -I test /Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb --name=some_test_name"
 
       assert_executes(expected_command, args)
     end
 
     def test_launch__debug__file
       args = "/Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb"
-      expected_command = "cd /Users/username/some_app/engines/some_engine && ruby -I test /Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb"
+      expected_command = "cd /Users/username/some_app/engines/some_engine && bundle exec ruby -I test /Users/username/.rvm/gems/ruby-2.2.3/gems/ruby-debug-ide-0.6.1.beta2/bin/rdebug-ide --disable-int-handler --evaluation-timeout 10 --rubymine-protocol-extensions --port 58930 --host 0.0.0.0 --dispatcher-port 58931 -- /Users/username/some_app/bin/spring testunit /Users/username/some_app/engines/some_engine/test/does_something_test.rb"
 
       assert_executes(expected_command, args)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1.pre1
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - lib/test_launcher/frameworks/generic.rb
 - lib/test_launcher/frameworks/implementation/test_case.rb
 - lib/test_launcher/frameworks/minitest.rb
+- lib/test_launcher/frameworks/mochajs.rb
 - lib/test_launcher/frameworks/rspec.rb
 - lib/test_launcher/queries.rb
 - lib/test_launcher/rubymine.rb
@@ -118,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2