forking_test_runner 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60ad12f5e9ca46633a91e12106f4fd6e00bb161
-  data.tar.gz: 453d510148cd579c234ed2d136f59fe6dbab7770
+  metadata.gz: 3f4949bda4bf2340ecc2bdbc26e27dcf7997a4e0
+  data.tar.gz: 8d7c6cbd163dd04cf57f5af38f7edeef622a7d00
 SHA512:
-  metadata.gz: d4c72f64b34403c193e2fca528ef30e9f7de3afd4a2176148649ba033fe6e76ba49c87a4800f7b99af1459409b925147c086e1d7c6e576d83b16b95ef35a1f23
-  data.tar.gz: b7fe40d180eabde2317abbf720e0f944e5b4fa94792c11c76225c6d89c328d2768a24c6db0b35c7f761d69bb8ff30dbaa4d2b422106de7318ac92a7e36e98b38
+  metadata.gz: bb20aee7735368aae9210789f9248cd70044018d6234242600c17b4bc84553eb680fbd8eda38791acd0ef3b0d516feae66d72dbe83ac1944a34a5f50461a345f
+  data.tar.gz: 8192705be39e309668fc7fb7c54330b824698b423e9729c271ce8f4698077e46d1ac37ac689070abe2732be023fe2c672ca68cc4d156f7b5318f4ac614aa2c65

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,3 @@
 module ForkingTestRunner
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/forking_test_runner.rb

@@ -1,9 +1,13 @@
+require 'benchmark'
+
 module ForkingTestRunner
   CLEAR = "------"
 
   class << self
     def cli(argv)
-      disable_minitest_autorun
+      @rspec = delete_argv("--rspec", argv, arg: false)
+
+      disable_test_autorun
       load_test_env(delete_argv("--helper", argv))
 
       # figure out what we need to run
@@ -98,7 +102,8 @@ module ForkingTestRunner
     end
 
     def load_test_env(helper=nil)
-      helper = helper || "test/test_helper"
+      require 'rspec' if @rspec
+      helper = helper || (@rspec ? "spec/spec_helper" : "test/test_helper")
       require "./#{helper}"
     end
 
@@ -126,12 +131,12 @@ module ForkingTestRunner
     end
 
     # don't let minitest setup another exit hook
-    def disable_minitest_autorun
-      toggle_minitest_autorun false
+    def disable_test_autorun
+      toggle_test_autorun false
     end
 
-    def enable_minitest_autorun
-      toggle_minitest_autorun true
+    def enable_test_autorun(file)
+      toggle_test_autorun true, file
     end
 
     def run_test(file)
@@ -141,8 +146,7 @@ module ForkingTestRunner
         child = fork do
           key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
           ActiveRecord::Base.establish_connection key
-          enable_minitest_autorun
-          require "./#{file}"
+          enable_test_autorun(file)
         end
         Process.wait(child)
       end
@@ -174,23 +178,47 @@ module ForkingTestRunner
       group.map { |test| [test, (tests[test] if group_by == :runtime)] }
     end
 
-    def delete_argv(name, argv)
+    def delete_argv(name, argv, arg: true)
       return unless index = argv.index(name)
       argv.delete_at(index)
-      argv.delete_at(index) || raise("Missing argument for #{name}")
+      if arg
+        argv.delete_at(index) || raise("Missing argument for #{name}")
+      else
+        true
+      end
     end
 
-    def toggle_minitest_autorun(value)
-      gem 'minitest'
-      klass = if Gem.loaded_specs["minitest"].version.segments.first == 4 # 4.x
-        require 'minitest/unit'
-        MiniTest::Unit
+    def toggle_test_autorun(value, file=nil)
+      if @rspec
+        if value
+          RSpec::Core::Runner.run([file])
+        else
+          require 'bundler/setup'
+          require 'rspec'
+          RSpec::Core::Runner.disable_autorun! # disable autorun in case the user left it in spec_helper.rb
+          $LOAD_PATH.unshift "./lib"
+          $LOAD_PATH.unshift "./spec"
+        end
       else
-        require 'minitest'
-        Minitest
+        @minitest_class ||= begin
+          require 'bundler/setup'
+          gem 'minitest'
+          if Gem.loaded_specs["minitest"].version.segments.first == 4 # 4.x
+            require 'minitest/unit'
+            MiniTest::Unit
+          else
+            require 'minitest'
+            Minitest
+          end
+        end
+
+        @minitest_class.class_variable_set("@@installed_at_exit", !value)
+
+        if value
+          @minitest_class.autorun
+          require "./#{file}"
+        end
       end
-      klass.class_variable_set("@@installed_at_exit", !value)
-      klass.autorun if value
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests