spork 0.5.2 → 0.5.3

data/features/cucumber_rails_integration.feature

@@ -34,6 +34,7 @@ Feature: Cucumber integration with rails
             end
           end
         end
+        ($loaded_stuff ||= []) << 'prefork block'
       end
 
       Spork.each_run do
@@ -42,6 +43,7 @@ Feature: Cucumber integration with rails
         Cucumber::Rails.use_transactional_fixtures
         Cucumber::Rails.bypass_rescue # Comment out this line if you want Rails own error handling
                                       # (e.g. rescue_action_in_public / rescue_responses / rescue_from)
+        ($loaded_stuff ||= []) << 'each_run block'
       end
       """
     And a file named "features/cucumber_rails.feature" with:
@@ -65,6 +67,8 @@ Feature: Cucumber integration with rails
         $loaded_stuff.should include('ApplicationHelper')
         $loaded_stuff.should include('config/routes.rb')
         $loaded_stuff.should include('features/support/cucumber_rails_helper.rb')
+        $loaded_stuff.should include('each_run block')
+        $loaded_stuff.should include('prefork block')
         puts "It worked!"
       end
       """

data/features/rails_integration.feature

@@ -15,11 +15,13 @@ Feature: Rails Integration
       Spork.prefork do
         ENV["RAILS_ENV"] = "testeroni"
         $run_phase = :prefork
+        ($loaded_stuff ||= []) << 'prefork block'
         require File.dirname(__FILE__) + '/../config/environment.rb'
       end
 
       Spork.each_run do
         $run_phase = :each_run
+        ($loaded_stuff ||= []) << 'each_run block'
         puts "I'm loading the stuff just for this run..."
       end
       
@@ -54,6 +56,8 @@ Feature: Rails Integration
           $loaded_stuff.should include('UserObserver')
           $loaded_stuff.should include('ApplicationHelper')
           $loaded_stuff.should include('config/routes.rb')
+          $loaded_stuff.should include('each_run block')
+          $loaded_stuff.should include('prefork block')
           puts "Specs successfully run within spork, and all initialization files were loaded"
         end
       end

data/lib/spork.rb

@@ -51,7 +51,7 @@ module Spork
     def expanded_caller(caller_line)
       file, line = caller_line.split(":")
       line.gsub(/:.+/, '')
-      File.expand_path(Dir.pwd, file) + ":" + line
+      File.expand_path(file, Dir.pwd) + ":" + line
     end
     
     def trap_method(klass, method_name)

data/lib/spork/app_framework/rails.rb

@@ -63,7 +63,7 @@ class Spork::AppFramework::Rails < Spork::AppFramework
     def auto_reestablish_db_connection
       if Object.const_defined?(:ActiveRecord)
         Spork.each_run do
-          # spec/rails is very aggressive about overriding RAILS_ENV and will switch it back to test after the cucumber env was loaded
+          # rails lib/test_help.rb is very aggressive about overriding RAILS_ENV and will switch it back to test after the cucumber env was loaded
           reset_rails_env
           ActiveRecord::Base.establish_connection
         end

data/spec/spork_spec.rb

@@ -55,4 +55,8 @@ describe Spork do
     Spork.each_run { }
     spec_helper_simulator.should == [:prefork, :each_run]
   end
+  
+  it "expands a caller line, preserving the line number" do
+    Spork.expanded_caller("/boo/../yah.rb:31").should == "/yah.rb:31"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Tim Harper