diff --git a/Gemfile b/Gemfile index 5537e2f25d..04c052f71e 100644 --- a/Gemfile +++ b/Gemfile @@ -175,7 +175,10 @@ group :test do gem 'rspec-legacy_formatters', require: false # brings back testing for 'assigns' and 'assert_template' extracted in rails 5 - gem 'rails-controller-testing', '~> 1.0.1' + # TODO: 1.0.1 still contains an issue that breaks helper inclusion in view specs + # Constrain value once new version released. + # More information: https://github.com/rspec/rspec-rails/issues/1644 + gem 'rails-controller-testing', git: 'https://github.com/rails/rails-controller-testing/' gem 'capybara', '~> 2.8.1' gem 'capybara-screenshot', '~> 1.0.13' diff --git a/Gemfile.lock b/Gemfile.lock index 4ee735dfc5..dccbe8eb84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,15 @@ GIT rails (~> 5.0.0) rubyzip +GIT + remote: https://github.com/rails/rails-controller-testing/ + revision: d942a5d239a4b34cf93e86ca35e49f464e516ede + specs: + rails-controller-testing (1.0.1) + actionpack (~> 5.x) + actionview (~> 5.x) + activesupport (~> 5.x) + GIT remote: https://github.com/rspec/rspec-activemodel-mocks revision: 14da7397f4c1f297fa9b8be3519419ba9b881577 @@ -421,10 +430,6 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 5.0.0.1) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) - activesupport (~> 5.x) rails-dom-testing (2.0.1) activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) @@ -665,7 +670,7 @@ DEPENDENCIES rack_session_access rails (~> 5.0.0) rails-angular-xss! - rails-controller-testing (~> 1.0.1) + rails-controller-testing! rails-observers! rails_12factor rails_autolink (~> 1.1.6)