-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Attempt to fix random CI failures #1495
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,42 @@ | ||
RSpec.configure do |config| | ||
config.before(:suite) do | ||
if config.use_transactional_fixtures? | ||
raise(<<-MSG) | ||
Delete line `config.use_transactional_fixtures = true` from rails_helper.rb | ||
(or set it to false) to prevent uncommitted transactions being used in | ||
JavaScript-dependent specs. | ||
|
||
During testing, the app-under-test that the browser driver connects to | ||
uses a different database connection to the database connection used by | ||
the spec. The app's database connection would not be able to access | ||
uncommitted transaction data setup over the spec's database connection. | ||
MSG | ||
end | ||
DatabaseCleaner.clean_with(:truncation) | ||
end | ||
|
||
config.before(:each) do | ||
DatabaseCleaner.strategy = :transaction | ||
end | ||
|
||
config.before(:each, :js => true) do | ||
DatabaseCleaner.strategy = :truncation | ||
config.before(:each, type: :feature) do | ||
# :rack_test driver's Rack app under test shares database connection | ||
# with the specs, so continue to use transaction strategy for speed. | ||
driver_shares_db_connection_with_specs = Capybara.current_driver == :rack_test | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Metrics/LineLength: Line is too long. [82/80] |
||
|
||
unless driver_shares_db_connection_with_specs | ||
# Driver is probably for an external browser with an app | ||
# under test that does *not* share a database connection with the | ||
# specs, so use truncation strategy. | ||
DatabaseCleaner.strategy = :truncation | ||
end | ||
end | ||
|
||
config.before(:each) do | ||
DatabaseCleaner.start | ||
end | ||
|
||
config.after(:each) do | ||
config.append_after(:each) do | ||
DatabaseCleaner.clean | ||
end | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.