gorgon 0.4.0.rc1 → 0.4.0.rc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.4.0.rc1)
+    gorgon (0.4.0.rc2)
       amqp (~> 0.9.7)
       awesome_print
       bunny (~> 0.8.0)

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.4.0.rc1"
+  VERSION = "0.4.0.rc2"
 end

data/lib/gorgon/worker.rb

@@ -125,7 +125,7 @@ class Worker
   def test_framework(filename)
     if filename =~ /_spec.rb$/i && defined?(RSpec)
       :rspec
-    elsif defined?(MiniTest)
+    elsif defined?(MiniTest) && !test_unit_gem?
       :mini_test
     elsif defined?(Test)
       :test_unit
@@ -134,6 +134,12 @@ class Worker
     end
   end
 
+  # Is the user using test-unit gem?
+  def test_unit_gem?
+    gemfile_lock = "./Gemfile.lock"
+    File.exists?(gemfile_lock) && File.read(gemfile_lock).scan(/\btest-unit/).any?
+  end
+
   def make_start_message(filename)
     {:action => :start, :hostname => Socket.gethostname, :worker_id => @worker_id, :filename => filename}
   end

data/spec/worker_spec.rb

@@ -166,9 +166,10 @@ few lines of output and send it to originator. Order matters" do
         # ruby 1.9 defines MiniTest by default, so let's remove it for these test cases
         Object.send(:remove_const, :MiniTest)
         file_queue.stub!(:pop).and_return("file_test.rb", nil)
+        File.stub!(:read).and_return("")
       end
 
-      it "runs file using TestUnitRunner when file doesn't ends in _spec and Test is defined" do
+      it "runs file using TestUnitRunner when file doesn't end in _spec and Test is defined" do
         stub_const("Test", :test_unit)
 
         @worker.should_receive(:require_relative).with "test_unit_runner"
@@ -194,6 +195,17 @@ few lines of output and send it to originator. Order matters" do
         @worker.work
       end
 
+      it "runs file using TestUnitRunner when file doesn't end in _spec.rb, MiniTest is defined but project is using test-unit gem" do
+        MiniTest = Temp
+        File.stub!(:read).and_return("test-unit")
+        stub_const("Test", :test_unit)
+
+        @worker.should_receive(:require_relative).with "test_unit_runner"
+        TestRunner.should_receive(:run_file).with("file_test.rb", TestUnitRunner).and_return({})
+
+        @worker.work
+      end
+
       it "uses UnknownRunner if the framework is unknown" do
         stub_const("UnknownRunner", :unknown_runner)
         file_queue.stub!(:pop).and_return("file.rb", nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -278,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2658024620569548158
+      hash: -864570023472014297
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: