diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-01 13:44:50 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-01 13:44:50 -0600 |
| commit | 66d7acfe4ddec5d5f16bc6a7d758343ff8573fd9 (patch) | |
| tree | bd6640a438ef14d4d4b0a11dfd1e0cd37ebfa388 /spec/spec_helper.rb | |
| parent | 15a2c558022908e23f0ff6ac80a135899aa0899a (diff) | |
| download | gitlab-ce-66d7acfe4ddec5d5f16bc6a7d758343ff8573fd9.tar.gz | |
Update rspec-rails from 3.3.3 to 3.4.2.
This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54
It'll also make it slightly easier to upgrade to 3.5.0 later.
Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 596d607f2a1..576d16e7ea3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -51,10 +51,4 @@ FactoryGirl::SyntaxRunner.class_eval do include RSpec::Mocks::ExampleMethods end -# Work around a Rails 4.2.5.1 issue -# See https://github.com/rspec/rspec-rails/issues/1532 -RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do - alias_method :find_all_anywhere, :find_all -end - ActiveRecord::Migration.maintain_test_schema! |