parallel_tests 0.13.0 → 0.13.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.13.0)
+    parallel_tests (0.13.1)
       parallel
 
 GEM
@@ -15,7 +15,7 @@ GEM
       gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.4)
     gherkin (2.7.6)
       json (>= 1.4.6)
     gherkin (2.7.6-java)
@@ -24,14 +24,14 @@ GEM
     json (1.7.5-java)
     parallel (0.6.4)
     rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     term-ansicolor (1.0.7)
     test-unit (2.4.4)
 

data/lib/parallel_tests/rspec/runtime_logger.rb

@@ -5,15 +5,34 @@ class ParallelTests::RSpec::RuntimeLogger < ParallelTests::RSpec::LoggerBase
   def initialize(*args)
     super
     @example_times = Hash.new(0)
+    @group_nesting = 0 if !RSPEC_1
   end
 
-  def example_started(*args)
-    @time = ParallelTests.now
-  end
+  if RSPEC_1
+    def example_started(*args)
+      @time = ParallelTests.now
+      super
+    end
 
-  def example_passed(example)
-    file = example.location.split(':').first
-    @example_times[file] += ParallelTests.now - @time
+    def example_passed(example)
+      file = example.location.split(':').first
+      @example_times[file] += ParallelTests.now - @time
+      super
+    end
+  else
+    def example_group_started(example_group)
+      @time = ParallelTests.now if @group_nesting == 0
+      @group_nesting += 1
+      super
+    end
+
+    def example_group_finished(example_group)
+      @group_nesting -= 1
+      if @group_nesting == 0
+        @example_times[example_group.file_path] += ParallelTests.now - @time
+      end
+      super
+    end
   end
 
   def dump_summary(*args);end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.13.0'
+  VERSION = Version = '0.13.1'
 end

data/spec/parallel_tests/rspec/runtime_logger_spec.rb

@@ -21,17 +21,9 @@ describe ParallelTests::RSpec::RuntimeLogger do
         ParallelTests::RSpec::RuntimeLogger.new(f)
       end
 
-      example = (mock(:location => "#{Dir.pwd}/spec/foo.rb:123"))
-      logger.example_started example
-      logger.example_passed example
-      if options[:pending]
-        logger.example_pending example
-        logger.dump_pending
-      end
-      if options[:failed]
-        logger.example_failed example
-        logger.dump_failures
-      end
+      example = (mock(:file_path => "#{Dir.pwd}/spec/foo.rb"))
+      logger.example_group_started example
+      logger.example_group_finished example
       logger.start_dump
 
       #f.close
@@ -43,14 +35,6 @@ describe ParallelTests::RSpec::RuntimeLogger do
     log_for_a_file.should =~ @clean_output
   end
 
-  it "does not log pending" do
-    log_for_a_file(:pending => true).should =~ @clean_output
-  end
-
-  it "does not log failures" do
-    log_for_a_file(:failed => true).should =~ @clean_output
-  end
-
   it "does not log if we do not run in parallel" do
     ENV.delete 'TEST_ENV_NUMBER'
     log_for_a_file.should == ""
@@ -87,8 +71,6 @@ describe ParallelTests::RSpec::RuntimeLogger do
     end
 
     it "logs shared examples into the running files" do
-      pending "no support in rspec for this :/"
-
       write "spec/spec_helper.rb", <<-RUBY
         shared_examples "foo" do
           it "is slow" do
@@ -109,9 +91,36 @@ describe ParallelTests::RSpec::RuntimeLogger do
       system("TEST_ENV_NUMBER=1 rspec spec -I #{Bundler.root.join("lib")} --format ParallelTests::RSpec::RuntimeLogger --out runtime.log 2>&1") || raise("nope")
 
       result = File.read("runtime.log")
-      result.should include "a_spec:0.5"
-      result.should include "b_spec:0.5"
+      result.should include "a_spec.rb:0.5"
+      result.should include "b_spec.rb:0.5"
       result.should_not include "spec_helper"
     end
+
+    it "logs multiple describe blocks" do
+      write "spec/a_spec.rb", <<-RUBY
+        describe "xxx" do
+          it "is slow" do
+            sleep 0.5
+          end
+        end
+
+        describe "yyy" do
+          it "is slow" do
+            sleep 0.5
+          end
+
+          describe "yep" do
+            it "is slow" do
+              sleep 0.5
+            end
+          end
+        end
+      RUBY
+
+      system("TEST_ENV_NUMBER=1 rspec spec -I #{Bundler.root.join("lib")} --format ParallelTests::RSpec::RuntimeLogger --out runtime.log 2>&1") || raise("nope")
+
+      result = File.read("runtime.log")
+      result.should include "a_spec.rb:1.5"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1322916282781841977
+      hash: 869070716249185077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1322916282781841977
+      hash: 869070716249185077
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25