This repository has been archived by the owner on Jul 13, 2023. It is now read-only.
Fix specs broken by aruba changes #1939
Merged
Conversation
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
| @@ -20,6 +20,7 @@ | |||
| config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml')) | |||
| ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") | |||
| ActiveRecord::Base.establish_connection(config['test']) | |||
| ActiveRecord::Base.raise_in_transactional_callbacks = true unless ActiveRecord::VERSION::STRING < "4.2" | |||
|
I've also updated the travis config to allow travis's bundler caching to take effect and to run the allow_failures rubies after the primary rubies. It looks like this will allow travis to run about 50% faster. |
| @@ -1,14 +1,11 @@ | |||
| appraise "3.2" do | |||
| gem "rails", "~> 3.2.0" | |||
| gem "paperclip", :path => "../" | |||
| gem "rails", "~> 3.2.15" | |||
There was a problem hiding this comment.
I'd leave this as ~> 3.2.0, as bundler will anyway install latest.
|
Thank you very much for your work. Can you please address my only comment, squash the commits together into one with a good commit message, and rebase on top of latest master? I'll merge right after. Thank you again! |
* update aruba methods for in_current_dir and check_file_presence * switch rspec syntax from should to expect * configure raise_in_transactional_callbacks if AR >= 4.2 * remove paperclip itself from Appraisal This also updates Travis to use the default bundler (to enable caching) and to build primary rubies first
|
Thanks, @tute . Squashed, rebased, and back to green. |
tute
added a commit
that referenced
this pull request
Jul 29, 2015
Fix specs broken by aruba changes
|
That's great, thank you! 👏 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 PR fixes the specs broken by the deprecation of
check_file_presencein the latest aruba. While I was in there I also cleaned up the other deprecation warnings from aruba, rspec, and active record.