Further rails 5 compat

Author: Sam Phippen

Gemfile-rails-dependencies

@@ -1,12 +1,12 @@
 version_file = File.expand_path("../.rails-version", __FILE__)
 case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp)
 when /master/
-  gem "rails", :git => "git://github.com/rails/rails.git"
+  gem "rails", :path => "/Users/sam/dev/rails"
   gem "arel", :git => "git://github.com/rails/arel.git"
   gem "journey", :git => "git://github.com/rails/journey.git"
   gem "activerecord-deprecated_finders", :git => "git://github.com/rails/activerecord-deprecated_finders.git"
   gem "rails-observers", :git => "git://github.com/rails/rails-observers"
-  gem "web-console", :git => "git://github.com/rails/web-console"
+  gem "web-console", :git => "git://github.com/rails/web-console", :group => :development
   gem 'sass-rails', :git => "git://github.com/rails/sass-rails.git"
   gem 'coffee-rails', :git => "git://github.com/rails/coffee-rails.git"
   gem 'rack', :git => 'git://github.com/rack/rack.git'

lib/rspec/rails/example/view_example_group.rb

@@ -157,8 +157,14 @@ def _include_controller_helpers
           end
 
           controller.controller_path = _controller_path
-          controller.request.path_parameters[:controller] = _controller_path
-          controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
+
+          path_params_to_merge = {}
+          path_params_to_merge[:controller] = _controller_path
+          path_params_to_merge[:action    ] = _inferred_action unless _inferred_action =~ /^_/
+
+          path_params = controller.request.path_parameters
+
+          controller.request.path_parameters = path_params.reverse_merge(path_params_to_merge)
         end
 
         let(:_default_file_to_render) do |example|

lib/rspec/rails/matchers/have_http_status.rb

@@ -46,6 +46,7 @@ def as_test_response(obj)
               resp.headers.clear
               resp.headers.merge!(obj.response_headers)
               resp.body    = obj.body
+              resp.request = ActionDispatch::Request.new({})
             end
             ::ActionDispatch::TestResponse.from_response(obj)
           else

spec/rspec/rails/matchers/have_http_status_spec.rb

@@ -4,21 +4,27 @@
   include RSpec::Rails::Matchers
 
   def create_response(opts = {})
-    ActionDispatch::TestResponse.new(opts.fetch(:status))
+    ActionDispatch::TestResponse.new(opts.fetch(:status)).tap {|x|
+      x.request = ActionDispatch::Request.new({})
+    }
   end
 
   shared_examples_for "supports different response instances" do
     context "given an ActionDispatch::Response" do
       it "returns true for a response with the same code" do
-        response = ::ActionDispatch::Response.new(code)
+        response = ::ActionDispatch::Response.new(code).tap {|x|
+          x.request = ActionDispatch::Request.new({})
+        }
 
         expect( matcher.matches?(response) ).to be(true)
       end
     end
 
     context "given an ActionDispatch::TestResponse" do
       it "returns true for a response with the same code" do
-        response = ::ActionDispatch::TestResponse.new(code)
+        response = ::ActionDispatch::TestResponse.new(code).tap {|x|
+          x.request = ActionDispatch::Request.new({})
+        }
 
         expect( matcher.matches?(response) ).to be(true)
       end
@@ -430,5 +436,4 @@ def create_response(opts = {})
       expect{ have_http_status(nil) }.to raise_error ArgumentError
     end
   end
-
 end