Merge pull request #1951 from wbreeze/successful

Prevent "have_http_status" from using deprecated methods in Rails 5.2+

Author: JonRowe

.travis.yml

@@ -135,6 +135,8 @@ matrix:
       env: RAILS_VERSION=3-2-stable
     - rvm: 2.4.2
       env: RAILS_VERSION='~> 3.1.12'
+    - rvm: 2.4.2
+      env: RAILS_VERSION=5.2.0.rc1
   allow_failures:
     - rvm: 2.2.2
       env: RAILS_VERSION=master

Changelog.md

@@ -8,7 +8,7 @@ Enhancements:
 
 Bug Fixes:
 
-* Escape quotation characters when producing method names for system spec 
+* Escape quotation characters when producing method names for system spec
   screenshots. (Shane Cavanaugh, #1955)
 
 ### 3.7.2 / 2017-11-20

lib/rspec/rails/matchers/have_http_status.rb

@@ -243,7 +243,11 @@ class GenericStatus < RSpec::Matchers::BuiltIn::BaseMatcher
           #   code "group"
           # @see https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
           def self.valid_statuses
-            [:error, :success, :missing, :redirect]
+            [
+              :error, :success, :missing,
+              :server_error, :successful, :not_found,
+              :redirect
+            ]
           end
 
           def initialize(type)
@@ -256,11 +260,11 @@ def initialize(type)
           end
 
           # @return [Boolean] `true` if Rack's associated numeric HTTP code matched
-          #   the `response` code
+          #   the `response` code or the named response status
           def matches?(response)
             test_response = as_test_response(response)
             @actual = test_response.response_code
-            test_response.send("#{expected}?")
+            check_expected_status(test_response, expected)
           rescue TypeError => _ignored
             @invalid_response = response
             false
@@ -283,6 +287,28 @@ def failure_message_when_negated
             "expected the response not to have #{type_message} but it was #{actual}"
           end
 
+        protected
+
+          if 5 < ::Rails::VERSION::MAJOR ||
+             (::Rails::VERSION::MAJOR == 5 && 2 <= ::Rails::VERSION::MINOR)
+            RESPONSE_METHODS = {
+              :success => 'successful',
+              :error => 'server_error',
+              :missing => 'not_found'
+            }.freeze
+          else
+            RESPONSE_METHODS = {
+              :successful => 'success',
+              :server_error => 'error',
+              :not_found => 'missing'
+            }.freeze
+          end
+
+          def check_expected_status(test_response, expected)
+            test_response.send(
+              "#{RESPONSE_METHODS.fetch(expected, expected)}?")
+          end
+
         private
 
           # @return [String] formating the expected status and associated code(s)
@@ -316,11 +342,11 @@ def type_codes
             # @see https://github.com/rails/rails/blob/ca200378/actionpack/lib/action_dispatch/http/response.rb#L74
             # @see https://github.com/rack/rack/blob/ce4a3959/lib/rack/response.rb#L119-L122
             @type_codes ||= case expected
-                            when :error
+                            when :error, :server_error
                               "5xx"
-                            when :success
+                            when :success, :successful
                               "2xx"
-                            when :missing
+                            when :missing, :not_found
                               "404"
                             when :redirect
                               "3xx"