bmabey-spork 0.4.4 → 0.5.9

data/spec/spork/server/rspec_spec.rb

@@ -2,10 +2,24 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Spork::Server::RSpec do
   before(:each) do
-    @adapter = Spork::Adapter::RSpec.new
+    @server = Spork::Server::RSpec.new
   end
   
-  it "uses the RSPEC_PORT for it's port" do
-    @adapter.port.should == Spork::Adapter::RSpec::RSPEC_PORT
+  it "uses the RSPEC_PORT for it's default port" do
+    @server.port.should == Spork::Server::RSpec::RSPEC_PORT
+  end
+
+  it "uses ENV['RSPEC_DRB'] as port if present" do
+    orig = ENV['RSPEC_DRB']
+    begin
+      ENV['RSPEC_DRB'] = "9000"
+      @server.port.should == 9000
+    ensure
+      ENV['RSPEC_DRB'] = orig
+    end
+  end
+  
+  it "uses the RSPEC_HELPER_FILE for it's helper_file" do
+    @server.helper_file.should == Spork::Server::RSpec::RSPEC_HELPER_FILE
   end
 end

data/spec/spork/server_spec.rb

@@ -1,7 +1,11 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+
 class FakeServer < Spork::Server
   attr_accessor :wait_time
+  
+  include Spork::TestIOStreams
+  
   def self.helper_file
     SPEC_TMP_DIR + "/fake/test_helper.rb"
   end
@@ -10,16 +14,9 @@ class FakeServer < Spork::Server
     1000
   end
   
-  def self.puts(string)
-    $test_stdout.puts(string)
-  end
-  
-  def puts(string)
-    $test_stdout.puts(string)
-  end
-  
   def run_tests(argv, input, output)
     sleep(@wait_time || 0.5)
+    true
   end
 end
 
@@ -57,8 +54,7 @@ describe Spork::Server do
   
   describe "a fake server" do
     def create_helper_file
-      FileUtils.mkdir_p(File.dirname(FakeServer.helper_file))
-      FileUtils.touch(FakeServer.helper_file)
+      create_file(FakeServer.helper_file, "# stub spec helper file")
     end
   
     before(:each) do
@@ -93,19 +89,19 @@ describe Spork::Server do
       create_helper_file
       FakeServer.bootstrap
     
-      $test_stdout.string.should include("Bootstrapping")
-      $test_stdout.string.should include("Edit")
-      $test_stdout.string.should include("favorite text editor")
+      $test_stderr.string.should include("Bootstrapping")
+      $test_stderr.string.should include("Edit")
+      $test_stderr.string.should include("favorite text editor")
     
       File.read(FakeServer.helper_file).should include(File.read(FakeServer::BOOTSTRAP_FILE))
     end
   
-    it "prevents you from running specs twice in parallel" do
+    it "aborts the current running thread when another run is started" do
       create_helper_file
       @fake.wait_time = 0.25
-      first_run = Thread.new { @fake.run("test", STDOUT, STDIN).should == true }
+      first_run = Thread.new { @fake.run("test", STDOUT, STDIN).should == nil }
       sleep(0.05)
-      @fake.run("test", STDOUT, STDIN).should == false
+      @fake.run("test", STDOUT, STDIN).should == true
     
       # wait for the first to finish
       first_run.join
@@ -119,8 +115,27 @@ describe Spork::Server do
       sleep(0.05)
       @fake.send(:abort)
       sleep(0.01) while @fake.running?
-    
+      
       (Time.now - started_at).should < @fake.wait_time
     end
+    
+    it "returns the result of the run_tests method from the forked child" do
+      create_helper_file
+      @fake.stub!(:run_tests).and_return("tests were ran")
+      @fake.run("test", STDOUT, STDIN).should == "tests were ran"
+    end
+
+    it "accepts a port" do
+      create_helper_file
+      @fake.class.port = 12345
+      @fake.port.should == 12345
+    end
+
+    it "falls back to a default port" do
+      create_helper_file
+      @fake.class.port = nil
+      @fake.port.should == FakeServer.port
+    end
+
   end
 end

data/spec/spork_spec.rb

@@ -3,8 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 Spork.class_eval do
   def self.reset!
     @state = nil
-    @already_run = nil
-    @already_preforked = nil
+    @already_ran = nil
   end
 end
 
@@ -14,31 +13,131 @@ describe Spork do
   end
   
   def spec_helper_simulator
-    ran = []
+    @ran ||= []
     Spork.prefork do
-      ran << :prefork
+      @ran << :prefork
     end
     
     Spork.each_run do
-      ran << :each_run
+      @ran << :each_run
     end
-    ran
+    @ran
   end
   
   it "only runs the preload block when preforking" do
-    ran = []
-    Spork.preforking!
-    spec_helper_simulator.should == [:prefork]
+    Spork.exec_prefork { spec_helper_simulator }
+    @ran.should == [:prefork]
   end
   
   it "only runs the each_run block when running" do
-    Spork.preforking!
-    spec_helper_simulator
-    Spork.running!
-    spec_helper_simulator.should == [:each_run]
+    Spork.exec_prefork { spec_helper_simulator }
+    @ran.should == [:prefork]
+    
+    Spork.exec_each_run
+    @ran.should == [:prefork, :each_run]
   end
   
   it "runs both blocks when Spork not activated" do
     spec_helper_simulator.should == [:prefork, :each_run]
   end
+  
+  it "prevents blocks from being ran twice" do
+    Spork.exec_prefork { spec_helper_simulator }
+    Spork.exec_each_run
+    @ran.clear
+    Spork.exec_prefork { spec_helper_simulator }
+    Spork.exec_each_run
+    @ran.should == []
+  end
+  
+  it "runs multiple prefork and each_run blocks at different locations" do
+    Spork.prefork { }
+    Spork.each_run { }
+    spec_helper_simulator.should == [:prefork, :each_run]
+  end
+  
+  it "expands a caller line, preserving the line number" do
+    Spork.send(:expanded_caller, "/boo/../yah.rb:31").should == "/yah.rb:31"
+  end
+  
+  describe "#trap_method" do
+    before(:each) do
+      Spork.using_spork!
+      
+      Object.class_eval do
+        class TrapTest
+          def self.output
+            @output ||= []
+          end
+          
+          def hello
+            TrapTest.output << 'hello'
+          end
+          
+          def goodbye
+            TrapTest.output << 'goodbye'
+          end
+          
+          def say_something!
+            TrapTest.output << 'something'
+          end
+        end
+      end
+      @trap_test = TrapTest.new
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :TrapTest)
+    end
+    
+    it "delays execution of a method until after Spork.exec_each_run is called" do
+      Spork.using_spork!
+      Spork.trap_method(TrapTest, :hello)
+      @trap_test.hello
+      @trap_test.goodbye
+      Spork.exec_each_run
+      TrapTest.output.should == ['goodbye', 'hello']
+    end
+    
+    it "works with methods that have punctuation" do
+      Spork.trap_method(TrapTest, :say_something!)
+      @trap_test.say_something!
+      TrapTest.output.should == []
+      Spork.exec_each_run
+      TrapTest.output.should == ['something']
+    end
+  end
+  
+  describe "#trap_class_method" do
+    before(:each) do
+      Object.class_eval do
+        class TrapTest
+          def self.output
+            @output ||= []
+          end
+          
+          def self.hello
+            output << 'hello'
+          end
+          
+          def self.goodbye
+            output << 'goodbye'
+          end
+        end
+      end
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :TrapTest)
+    end
+    
+    it "delays execution of a method until after Spork.exec_each_run is called" do
+      Spork.using_spork!
+      Spork.trap_class_method(TrapTest, :hello)
+      TrapTest.hello
+      TrapTest.goodbye
+      Spork.exec_each_run
+      TrapTest.output.should == ['goodbye', 'hello']
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmabey-spork
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.9
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-08-15 00:00:00 -07:00
 default_executable: spork
 dependencies: []
 
@@ -27,18 +27,42 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - assets/bootstrap.rb
+- features/cucumber_rails_integration.feature
+- features/diagnostic_mode.feature
+- features/rails_delayed_loading_workarounds.feature
+- features/rspec_rails_integration.feature
+- features/steps/rails_steps.rb
+- features/steps/sandbox_steps.rb
+- features/support/env.rb
+- features/unknown_app_framework.feature
 - lib/spork.rb
+- lib/spork/app_framework.rb
+- lib/spork/app_framework/rails.rb
+- lib/spork/app_framework/rails_stub_files/application.rb
+- lib/spork/app_framework/rails_stub_files/application_controller.rb
+- lib/spork/app_framework/rails_stub_files/application_helper.rb
+- lib/spork/app_framework/unknown.rb
+- lib/spork/custom_io_streams.rb
+- lib/spork/diagnoser.rb
+- lib/spork/forker.rb
 - lib/spork/runner.rb
 - lib/spork/server.rb
 - lib/spork/server/cucumber.rb
 - lib/spork/server/rspec.rb
 - spec/spec_helper.rb
+- spec/spork/app_framework/rails_spec.rb
+- spec/spork/app_framework/unknown_spec.rb
+- spec/spork/app_framework_spec.rb
+- spec/spork/diagnoser_spec.rb
+- spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
+- spec/spork/server/cucumber_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork_spec.rb
 has_rdoc: false
 homepage: http://github.com/timcharper/spork
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -60,13 +84,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spork
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: spork
 test_files: 
 - spec/spec_helper.rb
+- spec/spork/app_framework/rails_spec.rb
+- spec/spork/app_framework/unknown_spec.rb
+- spec/spork/app_framework_spec.rb
+- spec/spork/diagnoser_spec.rb
+- spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
+- spec/spork/server/cucumber_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork_spec.rb