re-arrange test helpers / stubs

Author: kares

src/spec/ruby/jruby/rack/rails_booter_spec.rb

@@ -148,7 +148,7 @@ class ::CGI::Session::PStore; end
     it "should set the PUBLIC_ROOT constant to the location of the public root",
       :lib => [ :rails23, :stub ] do
 
-      booter.app_path = File.expand_path("../../../rails", __FILE__)
+      booter.app_path = File.expand_path("../../../rails23", __FILE__)
       booter.boot!
       expect( PUBLIC_ROOT ).to eql booter.public_path
     end
@@ -162,7 +162,7 @@ class ::CGI::Session::PStore; end
       before :each do
         $servlet_context = @servlet_context
         @rack_context.should_receive(:getContextPath).and_return "/foo"
-        booter.app_path = File.expand_path("../../../rails", __FILE__)
+        booter.app_path = File.expand_path("../../../rails23", __FILE__)
         booter.boot!
         silence_warnings { booter.load_environment }
       end
@@ -202,7 +202,7 @@ class ::CGI::Session::PStore; end
 
     before :each do
       $servlet_context = @servlet_context
-      booter.app_path = File.expand_path("../../../rails3", __FILE__)
+      booter.app_path = File.expand_path("../../../rails3x", __FILE__)
       booter.boot!
       silence_warnings { booter.load_environment }
     end
@@ -217,7 +217,9 @@ class ::CGI::Session::PStore; end
 
     it "should set the application configuration's public path" do
       paths = {}
-      %w( public public/javascripts public/stylesheets ).each { |p| paths[p] = [p] }
+      for p in %w( public public/javascripts public/stylesheets )
+        paths[p] = [p]
+      end
       app = double("app"); app.stub_chain(:config, :paths).and_return(paths)
       public_path = Pathname.new(booter.public_path)
 
@@ -331,7 +333,7 @@ def log_initializer
 
     before :each do
       $servlet_context = @servlet_context
-      booter.app_path = File.expand_path("../../../rails3", __FILE__)
+      booter.app_path = File.expand_path("../../../rails3x", __FILE__)
       booter.boot!
       booter.load_environment
     end

src/spec/ruby/rails/config/boot.rb src/spec/ruby/rails23/config/boot.rbsrc/spec/ruby/rails/config/boot.rb renamed to src/spec/ruby/rails23/config/boot.rb

@@ -1,3 +1,4 @@
+
 # This is a fake Rails config/boot file to be used during testing.
 
 RAILS_ROOT = "#{ENV['RAILS_ROOT']}"

src/spec/ruby/rails/config/environment.rb …/spec/ruby/rails23/config/environment.rbsrc/spec/ruby/rails/config/environment.rb renamed to src/spec/ruby/rails23/config/environment.rb src/spec/ruby/rails/config/environment.rb renamed to src/spec/ruby/rails23/config/environment.rb

@@ -1,14 +1,8 @@
-#--
-# Copyright (c) 2010-2012 Engine Yard, Inc.
-# Copyright (c) 2007-2009 Sun Microsystems, Inc.
-# This source code is available under the MIT license.
-# See the file LICENSE.txt for details.
-#++
 
 # This is a fake Rails config/environment file to be used during testing.
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' # unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.18' # unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')