update Rails 4.0 stub (from stable release now) + handle some rspec warns

Author: kares

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

@@ -14,9 +14,9 @@
 java_import org.jruby.rack.rails.RailsRackApplicationFactory
 
 describe "integration" do
-  
+
   #after(:all) { JRuby::Rack.context = nil }
-  
+
   describe 'rack (lambda)' do
 
     before do
@@ -96,11 +96,11 @@
       set_compat_version servlet_context
       servlet_context
     end
-    
+
     it "initializes (pooling by default)" do
       listener = org.jruby.rack.rails.RailsServletContextListener.new
       listener.contextInitialized javax.servlet.ServletContextEvent.new(servlet_context)
-      
+
       rack_factory = servlet_context.getAttribute("rack.factory")
       rack_factory.should be_a(RackApplicationFactory)
       rack_factory.should be_a(PoolingRackApplicationFactory)
@@ -128,12 +128,12 @@
     end
 
   end
-    
+
   describe 'rails 3.0', :lib => :rails30 do
 
     before(:all) { copy_gemfile("rails30") }
 
-    let(:base_path) { "file://#{STUB_DIR}/rails30" }
+    def base_path; "file://#{STUB_DIR}/rails30" end
 
     it_should_behave_like 'a rails app'
 
@@ -153,7 +153,7 @@
         @runtime = @rack_factory.getApplication.getRuntime
         expect_to_have_monkey_patched_chunked
       end
-      
+
     end
 
     context "initialized (custom)" do
@@ -178,7 +178,7 @@
 
     before(:all) { copy_gemfile("rails31") }
 
-    let(:base_path) { "file://#{STUB_DIR}/rails31" }
+    def base_path; "file://#{STUB_DIR}/rails31" end
 
     it_should_behave_like 'a rails app'
 
@@ -213,7 +213,7 @@
         @runtime = @rack_factory.getApplication.getRuntime
         expect_to_have_monkey_patched_chunked
       end
-      
+
     end
 
   end
@@ -222,7 +222,7 @@
 
     before(:all) { copy_gemfile("rails32") }
 
-    let(:base_path) { "file://#{STUB_DIR}/rails32" }
+    def base_path; "file://#{STUB_DIR}/rails32" end
 
     it_should_behave_like 'a rails app'
 
@@ -249,36 +249,36 @@
 
         should_eval_as_eql_to "Rails.logger.level", Logger::INFO
       end
-      
+
       it "sets up public_path (as for a war)" do
         @runtime = @rack_factory.getApplication.getRuntime
         should_eval_as_eql_to "Rails.public_path", "#{STUB_DIR}/rails32"
         # make sure it was set early on (before initializers run) :
         should_eval_as_not_nil "defined? Rails32::Application::PUBLIC_PATH"
         should_eval_as_eql_to "Rails32::Application::PUBLIC_PATH", "#{STUB_DIR}/rails32"
         # check if image_tag resolves path to images correctly :
-        should_eval_as_eql_to %q{ 
+        should_eval_as_eql_to %q{
           config = ActionController::Base.config;
           asset_paths = ActionView::Helpers::AssetTagHelper::AssetPaths.new(config);
           image_path = asset_paths.compute_public_path('image.jpg', 'images');
           image_path[0, 18]
         }, '/images/image.jpg?'
       end
-      
+
       it "disables rack's chunked support (by default)" do
         @runtime = @rack_factory.getApplication.getRuntime
         expect_to_have_monkey_patched_chunked
       end
-      
+
     end
-    
+
   end
 
   describe 'rails 4.0', :lib => :rails40 do
 
     before(:all) { copy_gemfile("rails40") }
 
-    let(:base_path) { "file://#{STUB_DIR}/rails40" }
+    def base_path; "file://#{STUB_DIR}/rails40" end
 
     it_should_behave_like 'a rails app'
 
@@ -300,26 +300,26 @@
         should_eval_as_not_nil "Rails.logger"
         # NOTE: TaggedLogging is a module that extends the instance now :
         should_eval_as_eql_to "Rails.logger.is_a? ActiveSupport::TaggedLogging", true
-        should_eval_as_eql_to "Rails.logger.instance_variable_get(:'@logdev').dev.class.name", 
+        should_eval_as_eql_to "Rails.logger.instance_variable_get(:'@logdev').dev.class.name",
                               'JRuby::Rack::ServletLog'
         should_eval_as_eql_to "Rails.logger.level", Logger::INFO
       end
-      
+
       it "sets up public_path (as for a war)" do
         @runtime = @rack_factory.getApplication.getRuntime
         should_eval_as_eql_to "Rails.public_path.to_s", "#{STUB_DIR}/rails40"
-        should_eval_as_eql_to %q{ 
-          config = ActionController::Base.config;
-          asset_paths = ActionView::Helpers::AssetTagHelper::AssetPaths.new(config);
-          image_path = asset_paths.compute_public_path('image.jpg', 'images');
-          image_path[0, 18]
-        }, '/images/image.jpg?'
+        should_eval_as_eql_to %q{
+          class AssetPathTest; include ActionView::Helpers::AssetUrlHelper end;
+          asset_helper = AssetPathTest.new;
+          image_path = asset_helper.image_path('image.jpg');
+          image_path[0, 17]
+        }, '/images/image.jpg'
       end
-      
+
     end
-    
+
   end
-  
+
   describe 'rails 2.3', :lib => :rails23 do
 
     before(:all) do
@@ -343,31 +343,31 @@
         should_eval_as_not_nil "defined?(Rack.release)"
         should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.1'
       end
-      
+
       it "booted with a servlet logger" do
         @runtime = @rack_factory.getApplication.getRuntime
         should_eval_as_not_nil "defined?(Rails)"
         should_eval_as_not_nil "defined?(Rails.logger)"
-        
+
         should_eval_as_not_nil "defined?(ActiveSupport::BufferedLogger) && Rails.logger.is_a?(ActiveSupport::BufferedLogger)"
         should_eval_as_not_nil "Rails.logger.send(:instance_variable_get, '@log')"
-        should_eval_as_eql_to "log = Rails.logger.send(:instance_variable_get, '@log');" + 
+        should_eval_as_eql_to "log = Rails.logger.send(:instance_variable_get, '@log');" +
                               "log.class.name", 'JRuby::Rack::ServletLog'
         should_eval_as_eql_to "Rails.logger.level", Logger::INFO
-        
+
         @runtime.evalScriptlet "Rails.logger.debug 'logging works'"
       end
-      
+
     end
 
   end
-  
+
   def expect_to_have_monkey_patched_chunked
     @runtime.evalScriptlet "require 'rack/chunked'"
     script = %{
       headers = { 'Transfer-Encoding' => 'chunked' }
 
-      body = [ \"1\".freeze, \"\", \"\nsecond\" ] 
+      body = [ \"1\".freeze, \"\", \"\nsecond\" ]
 
       if defined? Rack::Chunked::Body # Rails 3.x
         body = Rack::Chunked::Body.new body
@@ -382,7 +382,7 @@ def expect_to_have_monkey_patched_chunked
     }
     should_eval_as_eql_to script, "1\nsecond"
   end
-  
+
   def initialize_rails(env = nil, servlet_context = @servlet_context)
     if ! servlet_context || servlet_context.is_a?(String)
       base = servlet_context.is_a?(String) ? servlet_context : nil
@@ -407,7 +407,7 @@ def new_servlet_context(base_path = nil)
     set_compat_version servlet_context
     servlet_context
   end
-  
+
   def set_compat_version(servlet_context = @servlet_context)
     if JRuby.runtime.is1_9
       servlet_context.addInitParameter("jruby.compat.version", '1.9')

src/spec/ruby/spec_helper.rb

@@ -17,13 +17,13 @@
 Maven.set_classpath
 
 module SharedHelpers
-  
+
   java_import 'org.jruby.rack.RackContext'
   java_import 'org.jruby.rack.RackConfig'
   java_import 'org.jruby.rack.servlet.ServletRackContext'
   java_import 'javax.servlet.ServletContext'
   java_import 'javax.servlet.ServletConfig'
-  
+
   def mock_servlet_context
     @rack_config ||= RackConfig.impl {}
     @rack_context ||= ServletRackContext.impl {}
@@ -40,11 +40,11 @@ def mock_servlet_context
     @servlet_config.stub!(:getServletName).and_return "A Servlet"
     @servlet_config.stub!(:getServletContext).and_return @servlet_context
   end
-  
+
   def silence_warnings(&block)
     JRuby::Rack::Helpers.silence_warnings(&block)
   end
-  
+
   def unwrap_native_exception(e)
     # JRuby 1.6.8 issue :
     #  begin
@@ -59,17 +59,17 @@ def unwrap_native_exception(e)
       e
     end
   end
-  
+
   def set_rack_input(servlet_env)
     require 'jruby'
     input_class = org.jruby.rack.RackInput.getRackInputClass(JRuby.runtime)
     input = input_class.new(servlet_env.getInputStream)
     servlet_env.set_io input # servlet_env.instance_variable_set :@_io, input
     input
   end
-  
+
   @@raise_logger = nil
-  
+
   def raise_logger
     @@raise_logger ||= org.jruby.rack.RackLogger.impl do |name, *args|
       if name.to_s == 'log' && args[0] =~ /^(ERROR|WARN):/
@@ -81,7 +81,7 @@ def raise_logger
       end
     end
   end
-  
+
   # org.jruby.Ruby.evalScriptlet helpers - comparing values from different runtimes
 
   def should_eval_as_eql_to(code, expected, options = {})
@@ -91,36 +91,36 @@ def should_eval_as_eql_to(code, expected, options = {})
       runtime, options = options, {}
     end
     message = options[:message] || "expected eval #{code.inspect} to be == $expected but was $actual"
-    be_flag = options.has_key?(:should) ? options[:should] : be_true
-    
+    be_flag = options.has_key?(:should) ? options[:should] : be(true)
+
     expected = expected.inspect.to_java
     actual = runtime.evalScriptlet(code).inspect.to_java
     actual.equals(expected).should be_flag, message.gsub('$expected', expected.to_s).gsub('$actual', actual.to_s)
   end
-  
+
   def should_eval_as_not_eql_to(code, expected, options = {})
-    should_eval_as_eql_to(code, expected, options.merge(:should => be_false, 
+    should_eval_as_eql_to(code, expected, options.merge(:should => be(false),
         :message => options[:message] || "expected eval #{code.inspect} to be != $expected but was not")
     )
   end
-  
+
   def should_eval_as_nil(code, runtime = @runtime)
-    should_eval_as_eql_to code, nil, :runtime => runtime, 
+    should_eval_as_eql_to code, nil, :runtime => runtime,
       :message => "expected eval #{code.inspect} to be nil but was $actual"
   end
 
   def should_eval_as_not_nil(code, runtime = @runtime)
-    should_eval_as_eql_to code, nil, :should => be_false, :runtime => runtime, 
+    should_eval_as_eql_to code, nil, :should => be(false), :runtime => runtime,
       :message => "expected eval #{code.inspect} to not be nil but was"
   end
-  
+
   def should_not_eval_as_nil(code, runtime = @runtime) # alias
     should_eval_as_not_nil(code, runtime)
   end
-  
+
 end
 
-# NOTE: avoid chunked-patch (loaded by default from a hook at 
+# NOTE: avoid chunked-patch (loaded by default from a hook at
 # DefaultRackApplicationFactory.initRuntime) to be loaded in (spec) runtime :
 $LOADED_FEATURES << 'jruby/rack/chunked.rb'
 
@@ -140,13 +140,13 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
 $LOAD_PATH.unshift File.expand_path('../rails/stub', __FILE__) unless defined?(Rails::VERSION)
 
 # current 'library' environment (based on appraisals) e.g. :rails31
-CURRENT_LIB = defined?(Rails::VERSION) ? 
+CURRENT_LIB = defined?(Rails::VERSION) ?
   :"rails#{Rails::VERSION::MAJOR}#{Rails::VERSION::MINOR}" : :stub
 
 RSpec.configure do |config|
 
   config.include SharedHelpers
-  
+
   config.before :each do
     @env_save = ENV.to_hash
     mock_servlet_context
@@ -158,7 +158,7 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
     Dir.chdir(WD_START) unless Dir.getwd == WD_START
     $servlet_context = nil if defined? $servlet_context
   end
-  
+
   config.filter_run_excluding :lib => lambda { |lib|
     return false if lib.nil? # no :lib => specified run with all
     lib = lib.is_a?(Array) ? lib : [ lib ]
@@ -170,14 +170,14 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
     end
     ! lib.include?(CURRENT_LIB)
   }
-  
+
   config.backtrace_clean_patterns = [
     /bin\//,
     #/gems/,
     /spec\/spec_helper\.rb/,
     /lib\/rspec\/(core|expectations|matchers|mocks)/
   ]
-  
+
 end
 
 java_import org.jruby.rack.mock.MockServletConfig