parallel_tests 0.15.4 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d936eb5e0bbc52041661dcc09e82096324828819
-  data.tar.gz: ff153670996680697c17ffa1603ee2f0da17aa47
+  metadata.gz: 1bea638a869699f806b9786a6510463e7a287b8a
+  data.tar.gz: 514c300a4d5594db77c111eaa5cc630243d9ee7b
 SHA512:
-  metadata.gz: 97baa7391ea76b2092f6652d437d8166653c9938da739977c02e7f4c7857d4cb9ecea5610466c3dbea6952e0b1a8be0c0daf2ef78f801842adec6eddd817fc9d
-  data.tar.gz: 58dc573cf4b28df8518597a8b7b575506546b789d8cfcff18d08c169d608f941e9dfd64256a4704899fd24680b1bb2314740570c91db20ecad2158896b1e4e33
+  metadata.gz: 5b6cf4cc6d47c2f7ba9a0eef1dd1439122862c8dd88a8c5d00ed0439ee9d01e2c59828a3a5c70cbe810b42874db052154cd841271bcab3a78e7bc63ed204f0f9
+  data.tar.gz: 8a5f241594d80239f63dd075e5d80dc94cceb1ce2d5315468f17c6362ff7ca5b030d60916b6fd58ec8dabb3e589f923089e466ed5e37af93c9583540a86bea99

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.15.4)
+    parallel_tests (0.16.0)
       parallel
 
 GEM
@@ -24,7 +24,7 @@ GEM
     gherkin-ruby (0.3.0)
     json (1.7.5)
     json (1.7.5-java)
-    parallel (0.7.0)
+    parallel (0.8.3)
     rake (10.0.3)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)

data/Readme.md

@@ -17,14 +17,6 @@ As gem
 # add to Gemfile
 gem "parallel_tests", :group => :development
 ```
-OR as plugin
-
-    rails plugin install git://github.com/grosser/parallel_tests.git
-
-```ruby
-# add to Gemfile
-gem "parallel", :group => :development
-```
 
 ### Add to `config/database.yml`
 ParallelTests uses 1 database per test-process.
@@ -294,6 +286,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Micah Geisel](https://github.com/botandrose)
  - [Exoth](https://github.com/Exoth)
  - [sidfarkus](https://github.com/sidfarkus)
+ - [Colin Harris](https://github.com/aberant)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/gherkin/runner.rb

@@ -23,7 +23,7 @@ module ParallelTests
         end
 
         def test_suffix
-          ".feature"
+          /\.feature$/
         end
 
         def line_is_result?(line)

data/lib/parallel_tests/rspec/runner.rb

@@ -39,7 +39,7 @@ module ParallelTests
         end
 
         def test_suffix
-          "_spec.rb"
+          /_spec\.rb$/
         end
 
         private

data/lib/parallel_tests/test/runner.rb

@@ -17,7 +17,7 @@ module ParallelTests
         end
 
         def test_suffix
-          "_test.rb"
+          /_(test|spec).rb$/
         end
 
         def test_file_name
@@ -151,7 +151,7 @@ module ParallelTests
           (tests || []).map do |file_or_folder|
             if File.directory?(file_or_folder)
               files = files_in_folder(file_or_folder, options)
-              files.grep(/#{Regexp.escape test_suffix}$/).grep(options[:pattern]||//)
+              files.grep(test_suffix).grep(options[:pattern]||//)
             else
               file_or_folder
             end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.15.4'
+  VERSION = Version = '0.16.0'
 end

data/spec/parallel_tests/gherkin/runner_behaviour.rb

@@ -174,4 +174,18 @@ EOF
       call(["1 scenario (1 passed)", "1 step (1 passed)"]).should == "1 scenario (1 passed)\n1 step (1 passed)"
     end
   end
+
+  describe ".find_tests" do
+    def call(*args)
+      ParallelTests::Gherkin::Runner.send(:find_tests, *args)
+    end
+
+    it "doesn't find bakup files with the same name as test files" do
+      with_files(['a/x.feature','a/x.feature.bak']) do |root|
+        call(["#{root}/"]).should == [
+          "#{root}/a/x.feature",
+        ]
+      end
+    end
+  end
 end

data/spec/parallel_tests/rspec/runner_spec.rb

@@ -184,4 +184,18 @@ ff.**..
       call(output).should == ['0 examples, 0 failures, 0 pending','1 examples, 1 failures, 1 pending']
     end
   end
+
+  describe ".find_tests" do
+    def call(*args)
+      ParallelTests::RSpec::Runner.send(:find_tests, *args)
+    end
+
+    it "doesn't find bakup files with the same name as test files" do
+      with_files(['a/x_spec.rb','a/x_spec.rb.bak']) do |root|
+        call(["#{root}/"]).should == [
+          "#{root}/a/x_spec.rb",
+        ]
+      end
+    end
+  end
 end

data/spec/parallel_tests/test/runner_spec.rb

@@ -3,6 +3,7 @@ require "parallel_tests/test/runner"
 
 describe ParallelTests::Test::Runner do
   test_tests_in_groups(ParallelTests::Test::Runner, 'test', '_test.rb')
+  test_tests_in_groups(ParallelTests::Test::Runner, 'test', '_spec.rb')
 
   describe ".run_tests" do
     def call(*args)
@@ -132,29 +133,6 @@ EOF
       ParallelTests::Test::Runner.send(:find_tests, *args)
     end
 
-    def with_files(files)
-      begin
-        root = "/tmp/test-find_tests-#{rand(999)}"
-        `mkdir #{root}`
-        files.each do |file|
-          parent = "#{root}/#{File.dirname(file)}"
-          `mkdir -p #{parent}` unless File.exist?(parent)
-          `touch #{root}/#{file}`
-        end
-        yield root
-      ensure
-        `rm -rf #{root}`
-      end
-    end
-
-    def inside_dir(dir)
-      old = Dir.pwd
-      Dir.chdir dir
-      yield
-    ensure
-      Dir.chdir old
-    end
-
     it "finds test in folders with appended /" do
       with_files(['b/a_test.rb']) do |root|
         call(["#{root}/"]).sort.should == [
@@ -210,7 +188,7 @@ EOF
 
     it "does not expand paths" do
       with_files(['a/x_test.rb']) do |root|
-        inside_dir root do
+        Dir.chdir root do
           call(['a']).sort.should == [
             "a/x_test.rb"
           ]
@@ -220,7 +198,7 @@ EOF
 
     it "finds test files in folders by pattern" do
       with_files(['a/x_test.rb','a/y_test.rb','a/z_test.rb']) do |root|
-        inside_dir root do
+        Dir.chdir root do
           call(["a"], :pattern => /^a\/(y|z)_test/).sort.should == [
             "a/y_test.rb",
             "a/z_test.rb",
@@ -229,6 +207,22 @@ EOF
       end
     end
 
+    it "doesn't find bakup files with the same name as test files" do
+      with_files(['a/x_test.rb','a/x_test.rb.bak']) do |root|
+        call(["#{root}/"]).should == [
+          "#{root}/a/x_test.rb",
+        ]
+      end
+    end
+
+    it "finds minispec files" do
+      with_files(['a/x_spec.rb']) do |root|
+        call(["#{root}/"]).should == [
+          "#{root}/a/x_spec.rb",
+        ]
+      end
+    end
+
     it "finds nothing if I pass nothing" do
       call(nil).should == []
     end

data/spec/spec_helper.rb

@@ -155,3 +155,14 @@ def test_tests_in_groups(klass, folder, suffix)
     end
   end
 end
+
+def with_files(files)
+  Dir.mktmpdir do |root|
+    files.each do |file|
+      parent = "#{root}/#{File.dirname(file)}"
+      `mkdir -p #{parent}` unless File.exist?(parent)
+      `touch #{root}/#{file}`
+    end
+    yield root
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.16.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel