rspec-rails 3.9.0 → 4.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/Capybara.md +5 -54
- data/Changelog.md +156 -78
- data/README.md +8 -7
- data/lib/generators/rspec/channel/channel_generator.rb +12 -0
- data/lib/generators/rspec/{observer/templates/observer_spec.rb → channel/templates/channel_spec.rb.erb} +1 -1
- data/lib/generators/rspec/controller/controller_generator.rb +21 -4
- data/lib/generators/rspec/controller/templates/request_spec.rb +14 -0
- data/lib/generators/rspec/controller/templates/routing_spec.rb +13 -0
- data/lib/generators/rspec/feature/feature_generator.rb +2 -2
- data/lib/generators/rspec/{generators → generator}/generator_generator.rb +2 -2
- data/lib/generators/rspec/{generators → generator}/templates/generator_spec.rb +0 -0
- data/lib/generators/rspec/helper/helper_generator.rb +1 -1
- data/lib/generators/rspec/install/install_generator.rb +4 -4
- data/lib/generators/rspec/install/templates/spec/rails_helper.rb +17 -16
- data/lib/generators/rspec/integration/integration_generator.rb +3 -3
- data/lib/generators/rspec/mailbox/mailbox_generator.rb +14 -0
- data/lib/generators/rspec/mailbox/templates/mailbox_spec.rb.erb +7 -0
- data/lib/generators/rspec/mailer/mailer_generator.rb +2 -1
- data/lib/generators/rspec/model/model_generator.rb +5 -4
- data/lib/generators/rspec/model/templates/fixtures.yml +1 -1
- data/lib/generators/rspec/request/request_generator.rb +1 -1
- data/lib/generators/rspec/scaffold/scaffold_generator.rb +29 -19
- data/lib/generators/rspec/scaffold/templates/api_controller_spec.rb +0 -36
- data/lib/generators/rspec/scaffold/templates/api_request_spec.rb +131 -0
- data/lib/generators/rspec/scaffold/templates/controller_spec.rb +10 -10
- data/lib/generators/rspec/scaffold/templates/edit_spec.rb +1 -1
- data/lib/generators/rspec/scaffold/templates/index_spec.rb +2 -2
- data/lib/generators/rspec/scaffold/templates/new_spec.rb +1 -1
- data/lib/generators/rspec/scaffold/templates/request_spec.rb +133 -0
- data/lib/generators/rspec/scaffold/templates/routing_spec.rb +8 -10
- data/lib/generators/rspec/scaffold/templates/show_spec.rb +1 -1
- data/lib/generators/rspec/system/system_generator.rb +1 -1
- data/lib/generators/rspec/view/view_generator.rb +2 -2
- data/lib/generators/rspec.rb +0 -6
- data/lib/rspec/rails/adapters.rb +11 -76
- data/lib/rspec/rails/configuration.rb +43 -33
- data/lib/rspec/rails/example/channel_example_group.rb +93 -0
- data/lib/rspec/rails/example/controller_example_group.rb +4 -4
- data/lib/rspec/rails/example/feature_example_group.rb +6 -26
- data/lib/rspec/rails/example/helper_example_group.rb +2 -9
- data/lib/rspec/rails/example/mailbox_example_group.rb +80 -0
- data/lib/rspec/rails/example/mailer_example_group.rb +2 -2
- data/lib/rspec/rails/example/rails_example_group.rb +1 -1
- data/lib/rspec/rails/example/system_example_group.rb +26 -10
- data/lib/rspec/rails/example/view_example_group.rb +38 -27
- data/lib/rspec/rails/example.rb +2 -0
- data/lib/rspec/rails/extensions/active_record/proxy.rb +1 -9
- data/lib/rspec/rails/feature_check.rb +12 -29
- data/lib/rspec/rails/fixture_file_upload_support.rb +1 -1
- data/lib/rspec/rails/fixture_support.rb +37 -31
- data/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb +170 -0
- data/lib/rspec/rails/matchers/action_cable/have_streams.rb +58 -0
- data/lib/rspec/rails/matchers/action_cable.rb +65 -0
- data/lib/rspec/rails/matchers/action_mailbox.rb +64 -0
- data/lib/rspec/rails/matchers/active_job.rb +148 -22
- data/lib/rspec/rails/matchers/base_matcher.rb +5 -10
- data/lib/rspec/rails/matchers/have_enqueued_mail.rb +52 -28
- data/lib/rspec/rails/matchers/have_http_status.rb +11 -7
- data/lib/rspec/rails/matchers/have_rendered.rb +1 -0
- data/lib/rspec/rails/matchers/routing_matchers.rb +12 -12
- data/lib/rspec/rails/matchers.rb +10 -0
- data/lib/rspec/rails/tasks/rspec.rake +7 -17
- data/lib/rspec/rails/vendor/capybara.rb +10 -15
- data/lib/rspec/rails/version.rb +1 -1
- data/lib/rspec/rails/view_path_builder.rb +1 -1
- data/lib/rspec/rails/view_rendering.rb +15 -4
- data/lib/rspec-rails.rb +8 -9
- data.tar.gz.sig +0 -0
- metadata +46 -34
- metadata.gz.sig +0 -0
- data/lib/generators/rspec/observer/observer_generator.rb +0 -13
@@ -25,44 +25,46 @@ module RSpec
|
|
25
25
|
#
|
26
26
|
# @api private
|
27
27
|
DIRECTORY_MAPPINGS = {
|
28
|
-
:
|
29
|
-
:
|
30
|
-
:
|
31
|
-
:
|
32
|
-
:
|
33
|
-
:
|
34
|
-
:
|
35
|
-
:
|
36
|
-
:
|
37
|
-
:
|
28
|
+
channel: %w[spec channels],
|
29
|
+
controller: %w[spec controllers],
|
30
|
+
helper: %w[spec helpers],
|
31
|
+
job: %w[spec jobs],
|
32
|
+
mailer: %w[spec mailers],
|
33
|
+
model: %w[spec models],
|
34
|
+
request: %w[spec (requests|integration|api)],
|
35
|
+
routing: %w[spec routing],
|
36
|
+
view: %w[spec views],
|
37
|
+
feature: %w[spec features],
|
38
|
+
system: %w[spec system],
|
39
|
+
mailbox: %w[spec mailboxes]
|
38
40
|
}
|
39
41
|
|
40
42
|
# Sets up the different example group modules for the different spec types
|
41
43
|
#
|
42
44
|
# @api private
|
43
45
|
def self.add_test_type_configurations(config)
|
44
|
-
config.include RSpec::Rails::ControllerExampleGroup, :
|
45
|
-
config.include RSpec::Rails::HelperExampleGroup, :
|
46
|
-
config.include RSpec::Rails::ModelExampleGroup, :
|
47
|
-
config.include RSpec::Rails::RequestExampleGroup, :
|
48
|
-
config.include RSpec::Rails::RoutingExampleGroup, :
|
49
|
-
config.include RSpec::Rails::ViewExampleGroup, :
|
50
|
-
config.include RSpec::Rails::FeatureExampleGroup, :
|
46
|
+
config.include RSpec::Rails::ControllerExampleGroup, type: :controller
|
47
|
+
config.include RSpec::Rails::HelperExampleGroup, type: :helper
|
48
|
+
config.include RSpec::Rails::ModelExampleGroup, type: :model
|
49
|
+
config.include RSpec::Rails::RequestExampleGroup, type: :request
|
50
|
+
config.include RSpec::Rails::RoutingExampleGroup, type: :routing
|
51
|
+
config.include RSpec::Rails::ViewExampleGroup, type: :view
|
52
|
+
config.include RSpec::Rails::FeatureExampleGroup, type: :feature
|
51
53
|
config.include RSpec::Rails::Matchers
|
52
|
-
config.include RSpec::Rails::SystemExampleGroup, :
|
54
|
+
config.include RSpec::Rails::SystemExampleGroup, type: :system
|
53
55
|
end
|
54
56
|
|
55
57
|
# @private
|
56
|
-
# rubocop:disable
|
57
|
-
def self.initialize_configuration(config)
|
58
|
+
def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
|
58
59
|
config.backtrace_exclusion_patterns << /vendor\//
|
59
60
|
config.backtrace_exclusion_patterns << %r{lib/rspec/rails}
|
60
61
|
|
61
62
|
# controller settings
|
62
|
-
config.add_setting :infer_base_class_for_anonymous_controllers, :
|
63
|
+
config.add_setting :infer_base_class_for_anonymous_controllers, default: true
|
63
64
|
|
64
65
|
# fixture support
|
65
|
-
config.add_setting :
|
66
|
+
config.add_setting :use_active_record, default: true
|
67
|
+
config.add_setting :use_transactional_fixtures, alias_with: :use_transactional_examples
|
66
68
|
config.add_setting :use_instantiated_fixtures
|
67
69
|
config.add_setting :global_fixtures
|
68
70
|
config.add_setting :fixture_path
|
@@ -78,7 +80,7 @@ module RSpec
|
|
78
80
|
config.include RSpec::Rails::FixtureSupport
|
79
81
|
|
80
82
|
if ::Rails::VERSION::STRING > '5'
|
81
|
-
config.add_setting :file_fixture_path, :
|
83
|
+
config.add_setting :file_fixture_path, default: 'spec/fixtures/files'
|
82
84
|
config.include RSpec::Rails::FileFixtureSupport
|
83
85
|
end
|
84
86
|
|
@@ -91,7 +93,7 @@ module RSpec
|
|
91
93
|
# as a getter. This makes it easier for rspec-rails users because we use
|
92
94
|
# `render_views` directly in example groups, so this aligns the two APIs,
|
93
95
|
# but requires this workaround:
|
94
|
-
config.add_setting :rendering_views, :
|
96
|
+
config.add_setting :rendering_views, default: false
|
95
97
|
|
96
98
|
config.instance_exec do
|
97
99
|
def render_views=(val)
|
@@ -109,7 +111,7 @@ module RSpec
|
|
109
111
|
def infer_spec_type_from_file_location!
|
110
112
|
DIRECTORY_MAPPINGS.each do |type, dir_parts|
|
111
113
|
escaped_path = Regexp.compile(dir_parts.join('[\\\/]') + '[\\\/]')
|
112
|
-
define_derived_metadata(:
|
114
|
+
define_derived_metadata(file_path: escaped_path) do |metadata|
|
113
115
|
metadata[:type] ||= type
|
114
116
|
end
|
115
117
|
end
|
@@ -127,21 +129,29 @@ module RSpec
|
|
127
129
|
|
128
130
|
if defined?(::Rails::Controller::Testing)
|
129
131
|
[:controller, :view, :request].each do |type|
|
130
|
-
config.include ::Rails::Controller::Testing::TestProcess, :
|
131
|
-
config.include ::Rails::Controller::Testing::TemplateAssertions, :
|
132
|
-
config.include ::Rails::Controller::Testing::Integration, :
|
132
|
+
config.include ::Rails::Controller::Testing::TestProcess, type: type
|
133
|
+
config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
|
134
|
+
config.include ::Rails::Controller::Testing::Integration, type: type
|
133
135
|
end
|
134
136
|
end
|
135
137
|
|
136
|
-
if
|
137
|
-
config.include RSpec::Rails::MailerExampleGroup, :
|
138
|
+
if RSpec::Rails::FeatureCheck.has_action_mailer?
|
139
|
+
config.include RSpec::Rails::MailerExampleGroup, type: :mailer
|
140
|
+
config.after { ActionMailer::Base.deliveries.clear }
|
138
141
|
end
|
139
142
|
|
140
|
-
if
|
141
|
-
config.include RSpec::Rails::JobExampleGroup, :
|
143
|
+
if RSpec::Rails::FeatureCheck.has_active_job?
|
144
|
+
config.include RSpec::Rails::JobExampleGroup, type: :job
|
145
|
+
end
|
146
|
+
|
147
|
+
if RSpec::Rails::FeatureCheck.has_action_cable_testing?
|
148
|
+
config.include RSpec::Rails::ChannelExampleGroup, type: :channel
|
149
|
+
end
|
150
|
+
|
151
|
+
if RSpec::Rails::FeatureCheck.has_action_mailbox?
|
152
|
+
config.include RSpec::Rails::MailboxExampleGroup, type: :mailbox
|
142
153
|
end
|
143
154
|
end
|
144
|
-
# rubocop:enable Style/MethodLength
|
145
155
|
|
146
156
|
initialize_configuration RSpec.configuration
|
147
157
|
end
|
@@ -0,0 +1,93 @@
|
|
1
|
+
require "rspec/rails/matchers/action_cable/have_streams"
|
2
|
+
|
3
|
+
module RSpec
|
4
|
+
module Rails
|
5
|
+
# @api public
|
6
|
+
# Container module for channel spec functionality. It is only available if
|
7
|
+
# ActionCable has been loaded before it.
|
8
|
+
module ChannelExampleGroup
|
9
|
+
# @private
|
10
|
+
module ClassMethods
|
11
|
+
# These blank modules are only necessary for YARD processing. It doesn't
|
12
|
+
# handle the conditional check below very well and reports undocumented objects.
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
if RSpec::Rails::FeatureCheck.has_action_cable_testing?
|
19
|
+
module RSpec
|
20
|
+
module Rails
|
21
|
+
# @api public
|
22
|
+
# Container module for channel spec functionality.
|
23
|
+
module ChannelExampleGroup
|
24
|
+
extend ActiveSupport::Concern
|
25
|
+
include RSpec::Rails::RailsExampleGroup
|
26
|
+
include ActionCable::Connection::TestCase::Behavior
|
27
|
+
include ActionCable::Channel::TestCase::Behavior
|
28
|
+
|
29
|
+
# Class-level DSL for channel specs.
|
30
|
+
module ClassMethods
|
31
|
+
# @private
|
32
|
+
def channel_class
|
33
|
+
(_channel_class || described_class).tap do |klass|
|
34
|
+
next if klass <= ::ActionCable::Channel::Base
|
35
|
+
|
36
|
+
raise "Described class is not a channel class.\n" \
|
37
|
+
"Specify the channel class in the `describe` statement " \
|
38
|
+
"or set it manually using `tests MyChannelClass`"
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
# @private
|
43
|
+
def connection_class
|
44
|
+
(_connection_class || described_class).tap do |klass|
|
45
|
+
next if klass <= ::ActionCable::Connection::Base
|
46
|
+
|
47
|
+
raise "Described class is not a connection class.\n" \
|
48
|
+
"Specify the connection class in the `describe` statement " \
|
49
|
+
"or set it manually using `tests MyConnectionClass`"
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
# Checks that the connection attempt has been rejected.
|
55
|
+
#
|
56
|
+
# @example
|
57
|
+
# expect { connect }.to have_rejected_connection
|
58
|
+
def have_rejected_connection
|
59
|
+
raise_error(::ActionCable::Connection::Authorization::UnauthorizedError)
|
60
|
+
end
|
61
|
+
|
62
|
+
# Checks that the subscription is subscribed to at least one stream.
|
63
|
+
#
|
64
|
+
# @example
|
65
|
+
# expect(subscription).to have_streams
|
66
|
+
def have_streams
|
67
|
+
check_subscribed!
|
68
|
+
|
69
|
+
RSpec::Rails::Matchers::ActionCable::HaveStream.new
|
70
|
+
end
|
71
|
+
|
72
|
+
# Checks that the channel has been subscribed to the given stream
|
73
|
+
#
|
74
|
+
# @example
|
75
|
+
# expect(subscription).to have_stream_from("chat_1")
|
76
|
+
def have_stream_from(stream)
|
77
|
+
check_subscribed!
|
78
|
+
|
79
|
+
RSpec::Rails::Matchers::ActionCable::HaveStream.new(stream)
|
80
|
+
end
|
81
|
+
|
82
|
+
# Checks that the channel has been subscribed to a stream for the given model
|
83
|
+
#
|
84
|
+
# @example
|
85
|
+
# expect(subscription).to have_stream_for(user)
|
86
|
+
def have_stream_for(object)
|
87
|
+
check_subscribed!
|
88
|
+
RSpec::Rails::Matchers::ActionCable::HaveStream.new(broadcasting_for(object))
|
89
|
+
end
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
@@ -94,9 +94,9 @@ module RSpec
|
|
94
94
|
self.routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
|
95
95
|
r.draw do
|
96
96
|
resources resource_name,
|
97
|
-
:
|
98
|
-
:
|
99
|
-
:
|
97
|
+
as: resource_as,
|
98
|
+
module: resource_module,
|
99
|
+
path: resource_path
|
100
100
|
end
|
101
101
|
end
|
102
102
|
end
|
@@ -159,7 +159,7 @@ module RSpec
|
|
159
159
|
#
|
160
160
|
# expect do
|
161
161
|
# bypass_rescue
|
162
|
-
# get :show, :
|
162
|
+
# get :show, id: profile.id + 1
|
163
163
|
# end.to raise_error(/403 Forbidden/)
|
164
164
|
# end
|
165
165
|
# end
|
@@ -37,37 +37,17 @@ end
|
|
37
37
|
|
38
38
|
unless RSpec.respond_to?(:feature)
|
39
39
|
opts = {
|
40
|
-
:
|
41
|
-
:
|
42
|
-
:
|
43
|
-
Feature specs require the Capybara (
|
44
|
-
gem, version 2.
|
45
|
-
some deprecation warnings and have support for
|
46
|
-
`config.expose_dsl_globally = false`.
|
40
|
+
capybara_feature: true,
|
41
|
+
type: :feature,
|
42
|
+
skip: <<-EOT.squish
|
43
|
+
Feature specs require the Capybara (https://github.com/teamcapybara/capybara)
|
44
|
+
gem, version 2.13.0 or later.
|
47
45
|
EOT
|
48
46
|
}
|
49
47
|
|
50
|
-
# Capybara's monkey patching causes us to have to jump through some hoops
|
51
|
-
top_level = self
|
52
|
-
main_feature = nil
|
53
|
-
if defined?(Capybara) && ::Capybara::VERSION.to_f < 2.4
|
54
|
-
# Capybara 2.2 and 2.3 do not use `alias_example_xyz`
|
55
|
-
opts[:skip] = <<-EOT.squish
|
56
|
-
Capybara < 2.4.0 does not support RSpec's namespace or
|
57
|
-
`config.expose_dsl_globally = false`. Upgrade to Capybara >= 2.4.0.
|
58
|
-
EOT
|
59
|
-
main_feature = top_level.method(:feature) if top_level.respond_to?(:feature)
|
60
|
-
end
|
61
|
-
|
62
48
|
RSpec.configure do |c|
|
63
|
-
main_feature = nil unless c.expose_dsl_globally?
|
64
49
|
c.alias_example_group_to :feature, opts
|
65
50
|
c.alias_example_to :scenario
|
66
|
-
c.alias_example_to :xscenario, :
|
51
|
+
c.alias_example_to :xscenario, skip: 'Temporarily skipped with xscenario'
|
67
52
|
end
|
68
|
-
|
69
|
-
# Due to load order issues and `config.expose_dsl_globally?` defaulting to
|
70
|
-
# `true` we need to put Capybara's monkey patch method back. Otherwise,
|
71
|
-
# app upgrades have a high likelyhood of having all feature specs skipped.
|
72
|
-
top_level.define_singleton_method(:feature, &main_feature) if main_feature
|
73
53
|
end
|
@@ -12,15 +12,8 @@ module RSpec
|
|
12
12
|
|
13
13
|
# @private
|
14
14
|
module ClassMethods
|
15
|
-
|
16
|
-
|
17
|
-
described_class if yield(described_class)
|
18
|
-
end
|
19
|
-
else
|
20
|
-
def determine_default_helper_class(_ignore)
|
21
|
-
return unless Module === described_class && !(Class === described_class)
|
22
|
-
described_class
|
23
|
-
end
|
15
|
+
def determine_constant_from_test_name(_ignore)
|
16
|
+
described_class if yield(described_class)
|
24
17
|
end
|
25
18
|
end
|
26
19
|
|
@@ -0,0 +1,80 @@
|
|
1
|
+
module RSpec
|
2
|
+
module Rails
|
3
|
+
# @api public
|
4
|
+
# Container module for mailbox spec functionality.
|
5
|
+
module MailboxExampleGroup
|
6
|
+
extend ActiveSupport::Concern
|
7
|
+
|
8
|
+
if RSpec::Rails::FeatureCheck.has_action_mailbox?
|
9
|
+
require 'action_mailbox/test_helper'
|
10
|
+
extend ::ActionMailbox::TestHelper
|
11
|
+
|
12
|
+
# @private
|
13
|
+
def self.create_inbound_email(arg)
|
14
|
+
case arg
|
15
|
+
when Hash
|
16
|
+
create_inbound_email_from_mail(arg)
|
17
|
+
else
|
18
|
+
create_inbound_email_from_source(arg.to_s)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
else
|
22
|
+
def self.create_inbound_email(_arg)
|
23
|
+
raise "Could not load ActionMailer::TestHelper"
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
class_methods do
|
28
|
+
# @private
|
29
|
+
def mailbox_class
|
30
|
+
described_class
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
included do
|
35
|
+
subject { described_class }
|
36
|
+
end
|
37
|
+
|
38
|
+
# @api public
|
39
|
+
# Passes if the inbound email was delivered
|
40
|
+
#
|
41
|
+
# @example
|
42
|
+
# inbound_email = process(args)
|
43
|
+
# expect(inbound_email).to have_been_delivered
|
44
|
+
def have_been_delivered
|
45
|
+
satisfy('have been delivered', &:delivered?)
|
46
|
+
end
|
47
|
+
|
48
|
+
# @api public
|
49
|
+
# Passes if the inbound email bounced during processing
|
50
|
+
#
|
51
|
+
# @example
|
52
|
+
# inbound_email = process(args)
|
53
|
+
# expect(inbound_email).to have_bounced
|
54
|
+
def have_bounced
|
55
|
+
satisfy('have bounced', &:bounced?)
|
56
|
+
end
|
57
|
+
|
58
|
+
# @api public
|
59
|
+
# Passes if the inbound email failed to process
|
60
|
+
#
|
61
|
+
# @example
|
62
|
+
# inbound_email = process(args)
|
63
|
+
# expect(inbound_email).to have_failed
|
64
|
+
def have_failed
|
65
|
+
satisfy('have failed', &:failed?)
|
66
|
+
end
|
67
|
+
|
68
|
+
# Process an inbound email message directly, bypassing routing.
|
69
|
+
#
|
70
|
+
# @param message [Hash, Mail::Message] a mail message or hash of
|
71
|
+
# attributes used to build one
|
72
|
+
# @return [ActionMaibox::InboundMessage]
|
73
|
+
def process(message)
|
74
|
+
MailboxExampleGroup.create_inbound_email(message).tap do |mail|
|
75
|
+
self.class.mailbox_class.receive(mail)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
@@ -21,8 +21,8 @@ if defined?(ActionMailer)
|
|
21
21
|
|
22
22
|
included do
|
23
23
|
include ::Rails.application.routes.url_helpers
|
24
|
-
options = ::Rails.configuration.action_mailer.default_url_options
|
25
|
-
options.each { |key, value| default_url_options[key] = value }
|
24
|
+
options = ::Rails.configuration.action_mailer.default_url_options || {}
|
25
|
+
options.each { |key, value| default_url_options[key] = value }
|
26
26
|
end
|
27
27
|
|
28
28
|
# Class-level DSL for mailer specs.
|
@@ -9,7 +9,7 @@ module RSpec
|
|
9
9
|
module RailsExampleGroup
|
10
10
|
extend ActiveSupport::Concern
|
11
11
|
include RSpec::Rails::SetupAndTeardownAdapter
|
12
|
-
include RSpec::Rails::MinitestLifecycleAdapter
|
12
|
+
include RSpec::Rails::MinitestLifecycleAdapter
|
13
13
|
include RSpec::Rails::MinitestAssertionAdapter
|
14
14
|
include RSpec::Rails::FixtureSupport
|
15
15
|
end
|
@@ -15,7 +15,11 @@ module RSpec
|
|
15
15
|
CHARS_TO_TRANSLATE = ['/', '.', ':', ',', "'", '"', " "].freeze
|
16
16
|
|
17
17
|
# @private
|
18
|
-
module
|
18
|
+
module BlowAwayTeardownHooks
|
19
|
+
# @private
|
20
|
+
def before_teardown
|
21
|
+
end
|
22
|
+
|
19
23
|
# @private
|
20
24
|
def after_teardown
|
21
25
|
end
|
@@ -46,12 +50,14 @@ module RSpec
|
|
46
50
|
end
|
47
51
|
|
48
52
|
included do |other|
|
53
|
+
ActiveSupport.on_load(:action_dispatch_system_test_case) do
|
54
|
+
ActionDispatch::SystemTesting::Server.silence_puma = true
|
55
|
+
end
|
56
|
+
|
49
57
|
begin
|
50
58
|
require 'capybara'
|
51
59
|
require 'action_dispatch/system_test_case'
|
52
|
-
# rubocop:disable Lint/HandleExceptions
|
53
60
|
rescue LoadError => e
|
54
|
-
# rubocop:enable Lint/HandleExceptions
|
55
61
|
abort """
|
56
62
|
LoadError: #{e.message}
|
57
63
|
System test integration requires Rails >= 5.1 and has a hard
|
@@ -61,13 +67,17 @@ module RSpec
|
|
61
67
|
""".gsub(/\s+/, ' ').strip
|
62
68
|
end
|
63
69
|
|
70
|
+
if ::Rails::VERSION::STRING >= '6.0'
|
71
|
+
original_before_teardown =
|
72
|
+
::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:before_teardown)
|
73
|
+
end
|
74
|
+
|
64
75
|
original_after_teardown =
|
65
76
|
::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
|
66
77
|
|
67
|
-
other.include ActionDispatch::IntegrationTest::Behavior
|
68
78
|
other.include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
|
69
79
|
other.include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
|
70
|
-
other.include
|
80
|
+
other.include BlowAwayTeardownHooks
|
71
81
|
|
72
82
|
attr_reader :driver
|
73
83
|
|
@@ -78,16 +88,19 @@ module RSpec
|
|
78
88
|
def initialize(*args, &blk)
|
79
89
|
super(*args, &blk)
|
80
90
|
@driver = nil
|
91
|
+
|
92
|
+
self.class.before do
|
93
|
+
# A user may have already set the driver, so only default if driver
|
94
|
+
# is not set
|
95
|
+
driven_by(:selenium) unless @driver
|
96
|
+
end
|
81
97
|
end
|
82
98
|
|
83
|
-
def driven_by(
|
84
|
-
@driver = ::ActionDispatch::SystemTestCase.driven_by(
|
99
|
+
def driven_by(driver, **driver_options, &blk)
|
100
|
+
@driver = ::ActionDispatch::SystemTestCase.driven_by(driver, **driver_options, &blk).tap(&:use)
|
85
101
|
end
|
86
102
|
|
87
103
|
before do
|
88
|
-
# A user may have already set the driver, so only default if driver
|
89
|
-
# is not set
|
90
|
-
driven_by(:selenium) unless @driver
|
91
104
|
@routes = ::Rails.application.routes
|
92
105
|
end
|
93
106
|
|
@@ -95,6 +108,9 @@ module RSpec
|
|
95
108
|
orig_stdout = $stdout
|
96
109
|
$stdout = StringIO.new
|
97
110
|
begin
|
111
|
+
if ::Rails::VERSION::STRING >= '6.0'
|
112
|
+
original_before_teardown.bind(self).call
|
113
|
+
end
|
98
114
|
original_after_teardown.bind(self).call
|
99
115
|
ensure
|
100
116
|
myio = $stdout
|
@@ -43,16 +43,13 @@ module RSpec
|
|
43
43
|
|
44
44
|
included do
|
45
45
|
include ::Rails.application.routes.url_helpers
|
46
|
-
|
47
|
-
if ::Rails.application.routes.respond_to?(:mounted_helpers)
|
48
|
-
include ::Rails.application.routes.mounted_helpers
|
49
|
-
end
|
46
|
+
include ::Rails.application.routes.mounted_helpers
|
50
47
|
end
|
51
48
|
|
52
49
|
# @overload render
|
53
|
-
# @overload render({:
|
54
|
-
# @overload render({:
|
55
|
-
# @overload render({:
|
50
|
+
# @overload render({partial: path_to_file})
|
51
|
+
# @overload render({partial: path_to_file}, {... locals ...})
|
52
|
+
# @overload render({partial: path_to_file}, {... locals ...}) do ... end
|
56
53
|
#
|
57
54
|
# Delegates to ActionView::Base#render, so see documentation on that
|
58
55
|
# for more info.
|
@@ -62,7 +59,7 @@ module RSpec
|
|
62
59
|
#
|
63
60
|
# describe "widgets/new.html.erb" do
|
64
61
|
# it "shows all the widgets" do
|
65
|
-
# render # => view.render(:
|
62
|
+
# render # => view.render(file: "widgets/new.html.erb")
|
66
63
|
# # ...
|
67
64
|
# end
|
68
65
|
# end
|
@@ -105,7 +102,7 @@ module RSpec
|
|
105
102
|
|
106
103
|
# @deprecated Use `view` instead.
|
107
104
|
def template
|
108
|
-
RSpec.deprecate("template", :
|
105
|
+
RSpec.deprecate("template", replacement: "view")
|
109
106
|
view
|
110
107
|
end
|
111
108
|
|
@@ -128,20 +125,37 @@ module RSpec
|
|
128
125
|
private
|
129
126
|
|
130
127
|
def _default_render_options
|
131
|
-
if ::
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
128
|
+
formats = if ActionView::Template::Types.respond_to?(:symbols)
|
129
|
+
ActionView::Template::Types.symbols
|
130
|
+
else
|
131
|
+
[:html, :text, :js, :css, :xml, :json].map(&:to_s)
|
132
|
+
end.map { |x| Regexp.escape(x) }.join("|")
|
133
|
+
|
134
|
+
handlers = ActionView::Template::Handlers.extensions.map { |x| Regexp.escape(x) }.join("|")
|
135
|
+
locales = "[a-z]{2}(?:-[A-Z]{2})?"
|
136
|
+
variants = "[^.]*"
|
137
|
+
path_regex = %r{
|
138
|
+
\A
|
139
|
+
(?<template>.*?)
|
140
|
+
(?:\.(?<locale>#{locales}))??
|
141
|
+
(?:\.(?<format>#{formats}))??
|
142
|
+
(?:\+(?<variant>#{variants}))??
|
143
|
+
(?:\.(?<handler>#{handlers}))?
|
144
|
+
\z
|
145
|
+
}x
|
146
|
+
|
147
|
+
# This regex should always find a match.
|
148
|
+
# Worst case, everything will be nil, and :template will just be
|
149
|
+
# the original string.
|
150
|
+
match = path_regex.match(_default_file_to_render)
|
151
|
+
|
152
|
+
render_options = {template: match[:template]}
|
153
|
+
render_options[:handlers] = [match[:handler]] if match[:handler]
|
154
|
+
render_options[:formats] = [match[:format].to_sym] if match[:format]
|
155
|
+
render_options[:locales] = [match[:locale]] if match[:locale]
|
156
|
+
render_options[:variants] = [match[:variant]] if match[:variant]
|
157
|
+
|
158
|
+
render_options
|
145
159
|
end
|
146
160
|
|
147
161
|
def _path_parts
|
@@ -171,10 +185,7 @@ module RSpec
|
|
171
185
|
|
172
186
|
before do
|
173
187
|
_include_controller_helpers
|
174
|
-
|
175
|
-
# rails 3.1
|
176
|
-
view.lookup_context.prefixes << _controller_path
|
177
|
-
end
|
188
|
+
view.lookup_context.prefixes << _controller_path
|
178
189
|
|
179
190
|
controller.controller_path = _controller_path
|
180
191
|
|
data/lib/rspec/rails/example.rb
CHANGED
@@ -9,3 +9,5 @@ require 'rspec/rails/example/model_example_group'
|
|
9
9
|
require 'rspec/rails/example/job_example_group'
|
10
10
|
require 'rspec/rails/example/feature_example_group'
|
11
11
|
require 'rspec/rails/example/system_example_group'
|
12
|
+
require 'rspec/rails/example/channel_example_group'
|
13
|
+
require 'rspec/rails/example/mailbox_example_group'
|
@@ -2,15 +2,7 @@ RSpec.configure do |rspec|
|
|
2
2
|
# Delay this in order to give users a chance to configure `expect_with`...
|
3
3
|
rspec.before(:suite) do
|
4
4
|
if defined?(RSpec::Matchers) && RSpec::Matchers.configuration.syntax.include?(:should) && defined?(ActiveRecord::Associations)
|
5
|
-
|
6
|
-
# In 3.1+, it's CollectionProxy.
|
7
|
-
const_name = [:CollectionProxy, :AssociationProxy].find do |const|
|
8
|
-
ActiveRecord::Associations.const_defined?(const)
|
9
|
-
end
|
10
|
-
|
11
|
-
proxy_class = ActiveRecord::Associations.const_get(const_name)
|
12
|
-
|
13
|
-
RSpec::Matchers.configuration.add_should_and_should_not_to proxy_class
|
5
|
+
RSpec::Matchers.configuration.add_should_and_should_not_to ActiveRecord::Associations::CollectionProxy
|
14
6
|
end
|
15
7
|
end
|
16
8
|
end
|