correctly roll specs while only the minimal (rack) dependencies are set-up

Author: kares

src/spec/ruby/action_controller/session/java_servlet_store_spec.rb

@@ -1,28 +1,22 @@
-#--
-# 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.
-#++
-
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
-
-require 'active_support'
-require 'action_controller'
-begin # help Rails 3.0 up
-  require 'action_dispatch/middleware/session/abstract_store'
-rescue LoadError
-end
-begin # a Rails 2.3 require
-  require 'action_controller/session/abstract_store'
-rescue LoadError
-end
-
-require 'jruby/rack/session_store'
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 
 describe "ActionController::Session::JavaServletStore" do
 
   before :all do
+
+    require 'active_support'
+    require 'action_controller'
+    begin # help Rails 3.0 up
+      require 'action_dispatch/middleware/session/abstract_store'
+    rescue LoadError
+    end
+    begin # a Rails 2.3 require
+      require 'action_controller/session/abstract_store'
+    rescue LoadError
+    end
+
+    require 'jruby/rack/session_store'
+
     require 'action_controller/session/java_servlet_store'
   end
 
@@ -322,4 +316,4 @@ def new_session_hash(*args)
     ::JRuby::Rack::Session::SessionHash.new(store, env)
   end
 
-end
+end if defined? Rails

src/spec/ruby/jruby/rack/queues/activemq_spec.rb

@@ -5,7 +5,7 @@
 # See the file LICENSE.txt for details.
 #++
 
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../../..')
+require File.expand_path('../../../spec_helper', File.dirname(__FILE__))
 require 'jruby/rack/queues/activemq'
 
 describe JRuby::Rack::Queues::ActiveMQ do

src/spec/ruby/jruby/rack/queues/pubsub_spec.rb

@@ -5,9 +5,7 @@
 # See the file LICENSE.txt for details.
 #++
 
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../../..')
-require 'action_controller'
-require 'active_record'
+require File.expand_path('../../../spec_helper', File.dirname(__FILE__))
 require 'jruby/rack/queues'
 
 describe JRuby::Rack::Queues::MessagePublisher do

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

@@ -5,9 +5,7 @@
 # See the file LICENSE.txt for details.
 #++
 
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
-require 'action_controller'
-require 'active_record'
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 require 'jruby/rack/queues'
 
 describe JRuby::Rack::Queues do

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

@@ -5,16 +5,22 @@
 # See the file LICENSE.txt for details.
 #++
 
-require File.expand_path('spec_helper', File.dirname(__FILE__) + '/../..')
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
 require 'jruby/rack/rails_booter'
-require 'jruby/rack/rails/extensions'
-
-require 'active_support'
-require 'cgi/session/java_servlet_store'
-class ::CGI::Session::PStore; end
 
 describe JRuby::Rack::RailsBooter do
 
+  before :all do
+
+    require 'jruby/rack/rails/extensions'
+
+    require 'active_support'
+
+    require 'cgi/session/java_servlet_store'
+    class ::CGI::Session::PStore; end
+
+  end
+
   let(:booter) do
     JRuby::Rack::RailsBooter.new JRuby::Rack.context = @rack_context
   end
@@ -101,7 +107,7 @@ class ::CGI::Session::PStore; end
     booter.logger.instance_variable_get(:@logdev).write "hello"
   end
 
-  describe "Rails 2 environment", :lib => :stub do
+  describe "Rails 2.3", :lib => :stub do
 
     before do
       booter.stub(:rails2?).and_return true
@@ -198,7 +204,7 @@ class ::CGI::Session::PStore; end
   end
 
   # NOTE: specs currently only test with a stubbed Rails::Railtie
-  describe "Rails 3 environment", :lib => :stub do
+  describe "Rails 3.x", :lib => :stub do
 
     before :each do
       $servlet_context = @servlet_context
@@ -304,9 +310,9 @@ def initialize(logger); @logger = logger end
 
       private
 
-        def log_initializer
-          Rails::Railtie.__initializer.detect { |i| i[0] =~ /log/ }
-        end
+      def log_initializer
+        Rails::Railtie.__initializer.detect { |i| i[0] =~ /log/ }
+      end
 
     end
 
@@ -329,7 +335,7 @@ def log_initializer
   end
 
   # NOTE: specs currently only test with a stubbed Rails::Railtie
-  describe "Rails 3.1 environment", :lib => [ :stub ] do
+  describe "Rails 3.1", :lib => [ :stub ] do
 
     before :each do
       $servlet_context = @servlet_context
@@ -366,9 +372,14 @@ def log_initializer
     end
   end
 
-end
+end if defined? Rails
 
 describe JRuby::Rack, "Rails controller extensions" do
+
+  before :all do
+    require 'action_controller'
+  end
+
   before :each do
     @controller = ActionController::Base.new
     @controller.stub(:request).and_return(request = double("request"))
@@ -389,4 +400,5 @@ def log_initializer
 
     @controller.forward_to "/forward.jsp"
   end
-end
+
+end if defined? Rails