rspec-rails 2.14.2 → 4.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (112) hide show
  1. checksums.yaml +5 -5
  2. checksums.yaml.gz.sig +0 -0
  3. data/.document +1 -1
  4. data/.yardopts +4 -2
  5. data/Capybara.md +6 -57
  6. data/Changelog.md +715 -37
  7. data/{License.txt → LICENSE.md} +5 -2
  8. data/README.md +287 -362
  9. data/lib/generators/rspec/channel/channel_generator.rb +12 -0
  10. data/lib/generators/rspec/channel/templates/channel_spec.rb.erb +7 -0
  11. data/lib/generators/rspec/controller/controller_generator.rb +23 -5
  12. data/lib/generators/rspec/controller/templates/controller_spec.rb +5 -5
  13. data/lib/generators/rspec/controller/templates/request_spec.rb +19 -0
  14. data/lib/generators/rspec/controller/templates/routing_spec.rb +13 -0
  15. data/lib/generators/rspec/controller/templates/view_spec.rb +2 -2
  16. data/lib/generators/rspec/feature/feature_generator.rb +29 -0
  17. data/lib/generators/rspec/feature/templates/feature_singular_spec.rb +5 -0
  18. data/lib/generators/rspec/feature/templates/feature_spec.rb +5 -0
  19. data/lib/generators/rspec/generator/generator_generator.rb +24 -0
  20. data/lib/generators/rspec/generator/templates/generator_spec.rb +6 -0
  21. data/lib/generators/rspec/helper/helper_generator.rb +2 -1
  22. data/lib/generators/rspec/helper/templates/helper_spec.rb +2 -2
  23. data/lib/generators/rspec/install/install_generator.rb +44 -5
  24. data/lib/generators/rspec/install/templates/spec/rails_helper.rb +79 -0
  25. data/lib/generators/rspec/integration/integration_generator.rb +8 -13
  26. data/lib/generators/rspec/integration/templates/request_spec.rb +4 -9
  27. data/lib/generators/rspec/job/job_generator.rb +12 -0
  28. data/lib/generators/rspec/{observer/templates/observer_spec.rb → job/templates/job_spec.rb.erb} +2 -2
  29. data/lib/generators/rspec/mailbox/mailbox_generator.rb +14 -0
  30. data/lib/generators/rspec/mailbox/templates/mailbox_spec.rb.erb +7 -0
  31. data/lib/generators/rspec/mailer/mailer_generator.rb +9 -1
  32. data/lib/generators/rspec/mailer/templates/mailer_spec.rb +7 -7
  33. data/lib/generators/rspec/mailer/templates/preview.rb +13 -0
  34. data/lib/generators/rspec/model/model_generator.rb +21 -6
  35. data/lib/generators/rspec/model/templates/fixtures.yml +1 -1
  36. data/lib/generators/rspec/model/templates/model_spec.rb +2 -2
  37. data/lib/generators/rspec/request/request_generator.rb +10 -0
  38. data/lib/generators/rspec/scaffold/scaffold_generator.rb +88 -148
  39. data/lib/generators/rspec/scaffold/templates/api_controller_spec.rb +129 -0
  40. data/lib/generators/rspec/scaffold/templates/api_request_spec.rb +131 -0
  41. data/lib/generators/rspec/scaffold/templates/controller_spec.rb +105 -80
  42. data/lib/generators/rspec/scaffold/templates/edit_spec.rb +10 -14
  43. data/lib/generators/rspec/scaffold/templates/index_spec.rb +5 -12
  44. data/lib/generators/rspec/scaffold/templates/new_spec.rb +11 -15
  45. data/lib/generators/rspec/scaffold/templates/request_spec.rb +137 -0
  46. data/lib/generators/rspec/scaffold/templates/routing_spec.rb +19 -12
  47. data/lib/generators/rspec/scaffold/templates/show_spec.rb +5 -12
  48. data/lib/generators/rspec/system/system_generator.rb +26 -0
  49. data/lib/generators/rspec/system/templates/system_spec.rb +9 -0
  50. data/lib/generators/rspec/view/templates/view_spec.rb +2 -2
  51. data/lib/generators/rspec/view/view_generator.rb +3 -2
  52. data/lib/generators/rspec.rb +18 -10
  53. data/lib/rspec/rails/active_record.rb +25 -0
  54. data/lib/rspec/rails/adapters.rb +49 -47
  55. data/lib/rspec/rails/configuration.rb +194 -0
  56. data/lib/rspec/rails/example/channel_example_group.rb +93 -0
  57. data/lib/rspec/rails/example/controller_example_group.rb +188 -138
  58. data/lib/rspec/rails/example/feature_example_group.rb +43 -20
  59. data/lib/rspec/rails/example/helper_example_group.rb +28 -26
  60. data/lib/rspec/rails/example/job_example_group.rb +23 -0
  61. data/lib/rspec/rails/example/mailbox_example_group.rb +80 -0
  62. data/lib/rspec/rails/example/mailer_example_group.rb +30 -14
  63. data/lib/rspec/rails/example/model_example_group.rb +8 -7
  64. data/lib/rspec/rails/example/rails_example_group.rb +4 -2
  65. data/lib/rspec/rails/example/request_example_group.rb +23 -16
  66. data/lib/rspec/rails/example/routing_example_group.rb +49 -40
  67. data/lib/rspec/rails/example/system_example_group.rb +125 -0
  68. data/lib/rspec/rails/example/view_example_group.rb +178 -134
  69. data/lib/rspec/rails/example.rb +4 -33
  70. data/lib/rspec/rails/extensions/active_record/proxy.rb +5 -11
  71. data/lib/rspec/rails/extensions.rb +0 -1
  72. data/lib/rspec/rails/feature_check.rb +47 -0
  73. data/lib/rspec/rails/file_fixture_support.rb +17 -0
  74. data/lib/rspec/rails/fixture_file_upload_support.rb +35 -0
  75. data/lib/rspec/rails/fixture_support.rb +54 -23
  76. data/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb +170 -0
  77. data/lib/rspec/rails/matchers/action_cable/have_streams.rb +58 -0
  78. data/lib/rspec/rails/matchers/action_cable.rb +65 -0
  79. data/lib/rspec/rails/matchers/action_mailbox.rb +64 -0
  80. data/lib/rspec/rails/matchers/active_job.rb +465 -0
  81. data/lib/rspec/rails/matchers/base_matcher.rb +179 -0
  82. data/lib/rspec/rails/matchers/be_a_new.rb +69 -62
  83. data/lib/rspec/rails/matchers/be_new_record.rb +24 -21
  84. data/lib/rspec/rails/matchers/be_valid.rb +42 -33
  85. data/lib/rspec/rails/matchers/have_enqueued_mail.rb +198 -0
  86. data/lib/rspec/rails/matchers/have_http_status.rb +385 -0
  87. data/lib/rspec/rails/matchers/have_rendered.rb +55 -31
  88. data/lib/rspec/rails/matchers/redirect_to.rb +30 -29
  89. data/lib/rspec/rails/matchers/relation_match_array.rb +2 -2
  90. data/lib/rspec/rails/matchers/routing_matchers.rb +107 -93
  91. data/lib/rspec/rails/matchers.rb +22 -14
  92. data/lib/rspec/rails/tasks/rspec.rake +8 -18
  93. data/lib/rspec/rails/vendor/capybara.rb +12 -11
  94. data/lib/rspec/rails/version.rb +3 -1
  95. data/lib/rspec/rails/view_assigns.rb +18 -18
  96. data/lib/rspec/rails/view_path_builder.rb +29 -0
  97. data/lib/rspec/rails/view_rendering.rb +100 -63
  98. data/lib/rspec/rails/view_spec_methods.rb +56 -0
  99. data/lib/rspec/rails.rb +10 -10
  100. data/lib/rspec-rails.rb +67 -3
  101. data.tar.gz.sig +0 -0
  102. metadata +121 -94
  103. metadata.gz.sig +0 -0
  104. data/lib/autotest/rails_rspec2.rb +0 -85
  105. data/lib/generators/rspec/install/templates/.rspec +0 -1
  106. data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt +0 -49
  107. data/lib/generators/rspec/observer/observer_generator.rb +0 -12
  108. data/lib/rspec/rails/extensions/active_record/base.rb +0 -58
  109. data/lib/rspec/rails/matchers/have_extension.rb +0 -36
  110. data/lib/rspec/rails/mocks.rb +0 -274
  111. data/lib/rspec/rails/module_inclusion.rb +0 -19
  112. data/lib/rspec/rails/vendor/webrat.rb +0 -33
@@ -0,0 +1,385 @@
1
+ # The following code inspired and modified from Rails' `assert_response`:
2
+ #
3
+ # https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/assertions/response.rb#L22-L38
4
+ #
5
+ # Thank you to all the Rails devs who did the heavy lifting on this!
6
+
7
+ module RSpec
8
+ module Rails
9
+ module Matchers
10
+ # Namespace for various implementations of `have_http_status`.
11
+ #
12
+ # @api private
13
+ module HaveHttpStatus
14
+ # Instantiates an instance of the proper matcher based on the provided
15
+ # `target`.
16
+ #
17
+ # @param target [Object] expected http status or code
18
+ # @return response matcher instance
19
+ def self.matcher_for_status(target)
20
+ if GenericStatus.valid_statuses.include?(target)
21
+ GenericStatus.new(target)
22
+ elsif Symbol === target
23
+ SymbolicStatus.new(target)
24
+ else
25
+ NumericCode.new(target)
26
+ end
27
+ end
28
+
29
+ # @api private
30
+ # Conversion function to coerce the provided object into an
31
+ # `ActionDispatch::TestResponse`.
32
+ #
33
+ # @param obj [Object] object to convert to a response
34
+ # @return [ActionDispatch::TestResponse]
35
+ def as_test_response(obj)
36
+ if ::ActionDispatch::Response === obj
37
+ ::ActionDispatch::TestResponse.from_response(obj)
38
+ elsif ::ActionDispatch::TestResponse === obj
39
+ obj
40
+ elsif obj.respond_to?(:status_code) && obj.respond_to?(:response_headers)
41
+ # Acts As Capybara Session
42
+ # Hack to support `Capybara::Session` without having to load
43
+ # Capybara or catch `NameError`s for the undefined constants
44
+ obj = ActionDispatch::Response.new.tap do |resp|
45
+ resp.status = obj.status_code
46
+ resp.headers.clear
47
+ resp.headers.merge!(obj.response_headers)
48
+ resp.body = obj.body
49
+ resp.request = ActionDispatch::Request.new({})
50
+ end
51
+ ::ActionDispatch::TestResponse.from_response(obj)
52
+ else
53
+ raise TypeError, "Invalid response type: #{obj}"
54
+ end
55
+ end
56
+ module_function :as_test_response
57
+
58
+ # @return [String, nil] a formatted failure message if
59
+ # `@invalid_response` is present, `nil` otherwise
60
+ def invalid_response_type_message
61
+ return unless @invalid_response
62
+
63
+ "expected a response object, but an instance of " \
64
+ "#{@invalid_response.class} was received"
65
+ end
66
+
67
+ # @api private
68
+ # Provides an implementation for `have_http_status` matching against
69
+ # numeric http status codes.
70
+ #
71
+ # Not intended to be instantiated directly.
72
+ #
73
+ # @example
74
+ # expect(response).to have_http_status(404)
75
+ #
76
+ # @see RSpec::Rails::Matchers#have_http_status
77
+ class NumericCode < RSpec::Rails::Matchers::BaseMatcher
78
+ include HaveHttpStatus
79
+
80
+ def initialize(code)
81
+ @expected = code.to_i
82
+ @actual = nil
83
+ @invalid_response = nil
84
+ end
85
+
86
+ # @param [Object] response object providing an http code to match
87
+ # @return [Boolean] `true` if the numeric code matched the `response` code
88
+ def matches?(response)
89
+ test_response = as_test_response(response)
90
+ @actual = test_response.response_code.to_i
91
+ expected == @actual
92
+ rescue TypeError => _ignored
93
+ @invalid_response = response
94
+ false
95
+ end
96
+
97
+ # @return [String]
98
+ def description
99
+ "respond with numeric status code #{expected}"
100
+ end
101
+
102
+ # @return [String] explaining why the match failed
103
+ def failure_message
104
+ invalid_response_type_message ||
105
+ "expected the response to have status code #{expected.inspect}" \
106
+ " but it was #{actual.inspect}"
107
+ end
108
+
109
+ # @return [String] explaining why the match failed
110
+ def failure_message_when_negated
111
+ invalid_response_type_message ||
112
+ "expected the response not to have status code " \
113
+ "#{expected.inspect} but it did"
114
+ end
115
+ end
116
+
117
+ # @api private
118
+ # Provides an implementation for `have_http_status` matching against
119
+ # Rack symbol http status codes.
120
+ #
121
+ # Not intended to be instantiated directly.
122
+ #
123
+ # @example
124
+ # expect(response).to have_http_status(:created)
125
+ #
126
+ # @see RSpec::Rails::Matchers#have_http_status
127
+ # @see https://github.com/rack/rack/blob/master/lib/rack/utils.rb `Rack::Utils::SYMBOL_TO_STATUS_CODE`
128
+ class SymbolicStatus < RSpec::Rails::Matchers::BaseMatcher
129
+ include HaveHttpStatus
130
+
131
+ def initialize(status)
132
+ @expected_status = status
133
+ @actual = nil
134
+ @invalid_response = nil
135
+ set_expected_code!
136
+ end
137
+
138
+ # @param [Object] response object providing an http code to match
139
+ # @return [Boolean] `true` if Rack's associated numeric HTTP code matched
140
+ # the `response` code
141
+ def matches?(response)
142
+ test_response = as_test_response(response)
143
+ @actual = test_response.response_code
144
+ expected == @actual
145
+ rescue TypeError => _ignored
146
+ @invalid_response = response
147
+ false
148
+ end
149
+
150
+ # @return [String]
151
+ def description
152
+ "respond with status code #{pp_expected}"
153
+ end
154
+
155
+ # @return [String] explaining why the match failed
156
+ def failure_message
157
+ invalid_response_type_message ||
158
+ "expected the response to have status code #{pp_expected} but it" \
159
+ " was #{pp_actual}"
160
+ end
161
+
162
+ # @return [String] explaining why the match failed
163
+ def failure_message_when_negated
164
+ invalid_response_type_message ||
165
+ "expected the response not to have status code #{pp_expected} " \
166
+ "but it did"
167
+ end
168
+
169
+ # The initialized expected status symbol
170
+ attr_reader :expected_status
171
+ private :expected_status
172
+
173
+ private
174
+
175
+ # @return [Symbol] representing the actual http numeric code
176
+ def actual_status
177
+ return unless actual
178
+
179
+ @actual_status ||= compute_status_from(actual)
180
+ end
181
+
182
+ # Reverse lookup of the Rack status code symbol based on the numeric
183
+ # http code
184
+ #
185
+ # @param code [Fixnum] http status code to look up
186
+ # @return [Symbol] representing the http numeric code
187
+ def compute_status_from(code)
188
+ status, _ = Rack::Utils::SYMBOL_TO_STATUS_CODE.find do |_, c|
189
+ c == code
190
+ end
191
+ status
192
+ end
193
+
194
+ # @return [String] pretty format the actual response status
195
+ def pp_actual
196
+ pp_status(actual_status, actual)
197
+ end
198
+
199
+ # @return [String] pretty format the expected status and associated code
200
+ def pp_expected
201
+ pp_status(expected_status, expected)
202
+ end
203
+
204
+ # @return [String] pretty format the actual response status
205
+ def pp_status(status, code)
206
+ if status
207
+ "#{status.inspect} (#{code})"
208
+ else
209
+ code.to_s
210
+ end
211
+ end
212
+
213
+ # Sets `expected` to the numeric http code based on the Rack
214
+ # `expected_status` status
215
+ #
216
+ # @see Rack::Utils::SYMBOL_TO_STATUS_CODE
217
+ # @raise [ArgumentError] if an associated code could not be found
218
+ def set_expected_code!
219
+ @expected ||=
220
+ Rack::Utils::SYMBOL_TO_STATUS_CODE.fetch(expected_status) do
221
+ raise ArgumentError,
222
+ "Invalid HTTP status: #{expected_status.inspect}"
223
+ end
224
+ end
225
+ end
226
+
227
+ # @api private
228
+ # Provides an implementation for `have_http_status` matching against
229
+ # `ActionDispatch::TestResponse` http status category queries.
230
+ #
231
+ # Not intended to be instantiated directly.
232
+ #
233
+ # @example
234
+ # expect(response).to have_http_status(:success)
235
+ # expect(response).to have_http_status(:error)
236
+ # expect(response).to have_http_status(:missing)
237
+ # expect(response).to have_http_status(:redirect)
238
+ #
239
+ # @see RSpec::Rails::Matchers#have_http_status
240
+ # @see https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
241
+ class GenericStatus < RSpec::Rails::Matchers::BaseMatcher
242
+ include HaveHttpStatus
243
+
244
+ # @return [Array<Symbol>] of status codes which represent a HTTP status
245
+ # code "group"
246
+ # @see https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
247
+ def self.valid_statuses
248
+ [
249
+ :error, :success, :missing,
250
+ :server_error, :successful, :not_found,
251
+ :redirect
252
+ ]
253
+ end
254
+
255
+ def initialize(type)
256
+ unless self.class.valid_statuses.include?(type)
257
+ raise ArgumentError, "Invalid generic HTTP status: #{type.inspect}"
258
+ end
259
+
260
+ @expected = type
261
+ @actual = nil
262
+ @invalid_response = nil
263
+ end
264
+
265
+ # @return [Boolean] `true` if Rack's associated numeric HTTP code matched
266
+ # the `response` code or the named response status
267
+ def matches?(response)
268
+ test_response = as_test_response(response)
269
+ @actual = test_response.response_code
270
+ check_expected_status(test_response, expected)
271
+ rescue TypeError => _ignored
272
+ @invalid_response = response
273
+ false
274
+ end
275
+
276
+ # @return [String]
277
+ def description
278
+ "respond with #{type_message}"
279
+ end
280
+
281
+ # @return [String] explaining why the match failed
282
+ def failure_message
283
+ invalid_response_type_message ||
284
+ "expected the response to have #{type_message} but it was #{actual}"
285
+ end
286
+
287
+ # @return [String] explaining why the match failed
288
+ def failure_message_when_negated
289
+ invalid_response_type_message ||
290
+ "expected the response not to have #{type_message} but it was #{actual}"
291
+ end
292
+
293
+ protected
294
+
295
+ RESPONSE_METHODS = {
296
+ success: 'successful',
297
+ error: 'server_error',
298
+ missing: 'not_found'
299
+ }.freeze
300
+
301
+ def check_expected_status(test_response, expected)
302
+ test_response.send(
303
+ "#{RESPONSE_METHODS.fetch(expected, expected)}?")
304
+ end
305
+
306
+ private
307
+
308
+ # @return [String] formating the expected status and associated code(s)
309
+ def type_message
310
+ @type_message ||= (expected == :error ? "an error" : "a #{expected}") +
311
+ " status code (#{type_codes})"
312
+ end
313
+
314
+ # @return [String] formatting the associated code(s) for the various
315
+ # status code "groups"
316
+ # @see https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
317
+ # @see https://github.com/rack/rack/blob/master/lib/rack/response.rb `Rack::Response`
318
+ def type_codes
319
+ # At the time of this commit the most recent version of
320
+ # `ActionDispatch::TestResponse` defines the following aliases:
321
+ #
322
+ # alias_method :success?, :successful?
323
+ # alias_method :missing?, :not_found?
324
+ # alias_method :redirect?, :redirection?
325
+ # alias_method :error?, :server_error?
326
+ #
327
+ # It's parent `ActionDispatch::Response` includes
328
+ # `Rack::Response::Helpers` which defines the aliased methods as:
329
+ #
330
+ # def successful?; status >= 200 && status < 300; end
331
+ # def redirection?; status >= 300 && status < 400; end
332
+ # def server_error?; status >= 500 && status < 600; end
333
+ # def not_found?; status == 404; end
334
+ #
335
+ # @see https://github.com/rails/rails/blob/ca200378/actionpack/lib/action_dispatch/testing/test_response.rb#L17-L27
336
+ # @see https://github.com/rails/rails/blob/ca200378/actionpack/lib/action_dispatch/http/response.rb#L74
337
+ # @see https://github.com/rack/rack/blob/ce4a3959/lib/rack/response.rb#L119-L122
338
+ @type_codes ||= case expected
339
+ when :error, :server_error
340
+ "5xx"
341
+ when :success, :successful
342
+ "2xx"
343
+ when :missing, :not_found
344
+ "404"
345
+ when :redirect
346
+ "3xx"
347
+ end
348
+ end
349
+ end
350
+ end
351
+
352
+ # @api public
353
+ # Passes if `response` has a matching HTTP status code.
354
+ #
355
+ # The following symbolic status codes are allowed:
356
+ #
357
+ # - `Rack::Utils::SYMBOL_TO_STATUS_CODE`
358
+ # - One of the defined `ActionDispatch::TestResponse` aliases:
359
+ # - `:error`
360
+ # - `:missing`
361
+ # - `:redirect`
362
+ # - `:success`
363
+ #
364
+ # @example Accepts numeric and symbol statuses
365
+ # expect(response).to have_http_status(404)
366
+ # expect(response).to have_http_status(:created)
367
+ # expect(response).to have_http_status(:success)
368
+ # expect(response).to have_http_status(:error)
369
+ # expect(response).to have_http_status(:missing)
370
+ # expect(response).to have_http_status(:redirect)
371
+ #
372
+ # @example Works with standard `response` objects and Capybara's `page`
373
+ # expect(response).to have_http_status(404)
374
+ # expect(page).to have_http_status(:created)
375
+ #
376
+ # @see https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
377
+ # @see https://github.com/rack/rack/blob/master/lib/rack/utils.rb `Rack::Utils::SYMBOL_TO_STATUS_CODE`
378
+ def have_http_status(target)
379
+ raise ArgumentError, "Invalid HTTP status: nil" unless target
380
+
381
+ HaveHttpStatus.matcher_for_status(target)
382
+ end
383
+ end
384
+ end
385
+ end
@@ -1,40 +1,64 @@
1
- module RSpec::Rails::Matchers
2
- module RenderTemplate
3
- class RenderTemplateMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
1
+ module RSpec
2
+ module Rails
3
+ module Matchers
4
+ # Matcher for template rendering.
5
+ module RenderTemplate
6
+ # @private
7
+ class RenderTemplateMatcher < RSpec::Rails::Matchers::BaseMatcher
8
+ def initialize(scope, expected, message = nil)
9
+ @expected = Symbol === expected ? expected.to_s : expected
10
+ @message = message
11
+ @scope = scope
12
+ @redirect_is = nil
13
+ end
4
14
 
5
- def initialize(scope, expected, message=nil)
6
- @expected = Symbol === expected ? expected.to_s : expected
7
- @message = message
8
- @scope = scope
9
- end
15
+ # @api private
16
+ def matches?(*)
17
+ match_check = match_unless_raises ActiveSupport::TestCase::Assertion do
18
+ @scope.assert_template expected, @message
19
+ end
20
+ check_redirect unless match_check
21
+ match_check
22
+ end
23
+
24
+ # Uses normalize_argument_to_redirection to find and format
25
+ # the redirect location. normalize_argument_to_redirection is private
26
+ # in ActionDispatch::Assertions::ResponseAssertions so we call it
27
+ # here using #send. This will keep the error message format consistent
28
+ # @api private
29
+ def check_redirect
30
+ response = @scope.response
31
+ return unless response.respond_to?(:redirect?) && response.redirect?
32
+
33
+ @redirect_is = @scope.send(:normalize_argument_to_redirection, response.location)
34
+ end
10
35
 
11
- # @api private
12
- def matches?(*)
13
- match_unless_raises ActiveSupport::TestCase::Assertion do
14
- @scope.assert_template expected, @message
36
+ # @api private
37
+ def failure_message
38
+ if @redirect_is
39
+ rescued_exception.message[/(.*?)( but|$)/, 1] +
40
+ " but was a redirect to <#{@redirect_is}>"
41
+ else
42
+ rescued_exception.message
43
+ end
44
+ end
45
+
46
+ # @api private
47
+ def failure_message_when_negated
48
+ "expected not to render #{expected.inspect}, but did"
49
+ end
15
50
  end
16
- end
17
51
 
18
- # @api private
19
- def failure_message_for_should
20
- rescued_exception.message
21
- end
52
+ # Delegates to `assert_template`.
53
+ #
54
+ # @example
55
+ # expect(response).to have_rendered("new")
56
+ def have_rendered(options, message = nil)
57
+ RenderTemplateMatcher.new(self, options, message)
58
+ end
22
59
 
23
- # @api private
24
- def failure_message_for_should_not
25
- "expected not to render #{expected.inspect}, but did"
60
+ alias_method :render_template, :have_rendered
26
61
  end
27
62
  end
28
-
29
- # Delegates to `assert_template`
30
- #
31
- # @example
32
- #
33
- # response.should have_rendered("new")
34
- def have_rendered(options, message=nil)
35
- RenderTemplateMatcher.new(self, options, message)
36
- end
37
-
38
- alias_method :render_template, :have_rendered
39
63
  end
40
64
  end
@@ -1,37 +1,38 @@
1
- module RSpec::Rails::Matchers
2
- module RedirectTo
3
- class RedirectTo < RSpec::Matchers::BuiltIn::BaseMatcher
1
+ module RSpec
2
+ module Rails
3
+ module Matchers
4
+ # Matcher for redirects.
5
+ module RedirectTo
6
+ # @private
7
+ class RedirectTo < RSpec::Rails::Matchers::BaseMatcher
8
+ def initialize(scope, expected)
9
+ @expected = expected
10
+ @scope = scope
11
+ end
4
12
 
5
- def initialize(scope, expected)
6
- @expected = expected
7
- @scope = scope
8
- end
13
+ def matches?(_)
14
+ match_unless_raises ActiveSupport::TestCase::Assertion do
15
+ @scope.assert_redirected_to(@expected)
16
+ end
17
+ end
9
18
 
10
- # @api private
11
- def matches?(_)
12
- match_unless_raises ActiveSupport::TestCase::Assertion do
13
- @scope.assert_redirected_to(@expected)
14
- end
15
- end
19
+ def failure_message
20
+ rescued_exception.message
21
+ end
16
22
 
17
- # @api private
18
- def failure_message_for_should
19
- rescued_exception.message
20
- end
23
+ def failure_message_when_negated
24
+ "expected not to redirect to #{@expected.inspect}, but did"
25
+ end
26
+ end
21
27
 
22
- # @api private
23
- def failure_message_for_should_not
24
- "expected not to redirect to #{@expected.inspect}, but did"
28
+ # Delegates to `assert_redirected_to`.
29
+ #
30
+ # @example
31
+ # expect(response).to redirect_to(:action => "new")
32
+ def redirect_to(target)
33
+ RedirectTo.new(self, target)
34
+ end
25
35
  end
26
36
  end
27
-
28
- # Delegates to `assert_redirected_to`
29
- #
30
- # @example
31
- #
32
- # response.should redirect_to(:action => "new")
33
- def redirect_to(target)
34
- RedirectTo.new(self, target)
35
- end
36
37
  end
37
38
  end
@@ -1,3 +1,3 @@
1
- if defined?(ActiveRecord::Relation)
2
- RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
1
+ if defined?(ActiveRecord::Relation) && defined?(RSpec::Matchers::BuiltIn::OperatorMatcher) # RSpec 4 removed OperatorMatcher
2
+ RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
3
3
  end