Skip to content

Commit 9651570

Browse files
committed
Update logic
1 parent f2bcd5b commit 9651570

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

lib/cypress_on_rails/railtie.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ class Railtie < Rails::Railtie
1313
app.middleware.use Vcr::InsertEjectMiddleware
1414
end
1515
if CypressOnRails.configuration.use_vcr_use_cassette_middleware?
16+
if CypressOnRails.configuration.use_vcr_middleware?
17+
raise 'Configure only one VCR middleware at a time: use_vcr_middleware OR use_vcr_use_cassette_middleware'
18+
end
19+
1620
require 'cypress_on_rails/vcr/use_cassette_middleware'
1721
app.middleware.use Vcr::UseCassetteMiddleware
1822
end

lib/generators/cypress_on_rails/templates/config/initializers/cypress_on_rails.rb.erb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ if defined?(CypressOnRails)
66
# please use with extra caution if enabling on hosted servers or starting your local server on 0.0.0.0
77
c.use_middleware = !Rails.env.production?
88
<% unless options.experimental %># <% end %> c.use_vcr_middleware = !Rails.env.production?
9-
# Use this if you want to use use_cassette wrapper instead of manual insert/eject
10-
# c.use_vcr_use_cassette_middleware = !Rails.env.production?
11-
# Pass custom VCR options
12-
# c.vcr_options = {
13-
# hook_into: :webmock,
14-
# default_cassette_options: { record: :once },
15-
# cassette_library_dir: File.expand_path("#{__dir__}/../../<%= options.install_folder %>/<%= options.framework %>/fixtures/vcr_cassettes")
16-
# }
9+
<% unless options.experimental %># <% end %> # Use this if you want to use use_cassette wrapper instead of manual insert/eject
10+
<% unless options.experimental %># <% end %> # c.use_vcr_use_cassette_middleware = !Rails.env.production?
11+
<% unless options.experimental %># <% end %> # Pass custom VCR options
12+
<% unless options.experimental %># <% end %> c.vcr_options = {
13+
<% unless options.experimental %># <% end %> hook_into: :webmock,
14+
<% unless options.experimental %># <% end %> default_cassette_options: { record: :once },
15+
<% unless options.experimental %># <% end %> cassette_library_dir: File.expand_path("#{__dir__}/../../<%= options.install_folder %>/<%= options.framework %>/fixtures/vcr_cassettes")
16+
<% unless options.experimental %># <% end %> }
1717
c.logger = Rails.logger
1818

1919
# If you want to enable a before_request logic, such as authentication, logging, sending metrics, etc.

lib/generators/cypress_on_rails/templates/spec/e2e/e2e_helper.rb.erb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,3 @@ CypressOnRails::SmartFactoryWrapper.configure(
3636
Rails.root.join('spec', 'factories', '**', '*.rb')
3737
]
3838
)
39-
40-
<% unless options.experimental %># <% end %>require 'vcr'
41-
<% unless options.experimental %># <% end %>VCR.configure do |config|
42-
<% unless options.experimental %># <% end %> config.hook_into :webmock
43-
<% unless options.experimental %># <% end %>end

0 commit comments

Comments
 (0)