Backport bug fixes #1380
Merged
Backport bug fixes #1380
Conversation
This file contains hidden or 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
…t attempt to load a helper based on the example description.
This removes the unnecessary warning about a preview path set to a location other than `/spec/mailers/preview`. This does not force `ActionMailer` to load when the Railtie runs by removing the `defined?` check. This is necessary because the `ActionMailer` class only loads it's settings once, after it is first loaded. If we load the class in our Railtie any custom settings declared in a config block in an initializer will be ignored. An improved spec suite for the different permutations of availability of action mailer previews is included as well.
This fixes an "undefined method `fixture_path`" error caused in `RSpec::Core::Configuration`. The issue occurs when a spec is created before rspec-rails is loaded. The cause is rspec-core attempts to include the `RSpec::Rails::FixtureSupport` module into the existing spec as soon as we tell the configuration about it, but have not told the configuration about the new related options. This moves the including of the module until after we have told the configuration about the dependent options. This includes a spec which is named in a manner to attempt to ensure it is the first spec loaded by rspec-core; which loads spec files alphabetically. To ensure we test the issue the run script is updated to also run this spec file standalone. When discussing #1355 it was agreed that we need to consider removing this global inclusion of the fixture support. Instead favoring including it in the `RailsExampleGroup`. A deprecation comment has been included to remind us later.
|
LGTM. Any particular reason you waited to backport these? And any reason you want to wait until 3.3 is released to release 3.2.2 with these? |
No. 😦 just didn't do it sooner.
Nope. We can release whenever. |
Do you need my assistance to release? (I forget if you're all sorted with the new gem signing key and all that...) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This back ports the following bug fixes onto the 3-2-maintenance branch:
Helperobject for view specs sitting in theapp/viewsroot (David Daniell, If a view example's description contains no path elements, then do not attempt to load a helper based on the example description. #1289)need_auto_run=error when using Ruby 2.1 and Rails 3.2without the test-unit gem (Orien Madgwick, Check
need_auto_run=method is defined also #1350)fixture_patherrorwhen loading rspec-rails after a spec has been created. (Aaron Kromer, Update fixture support #1372)
/cc @myronmarston