Merge pull request #1426 from projectblacklight/rspec35

Use rspec ~> 3.5
projectblacklight · Jul 1, 2016 · e25d118 · e25d118
2 parents 903821b + 998a552
commit e25d118
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ else
   end
 
   if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
-    gem 'rspec-rails', '>= 3.5.0.beta4', '~> 3.5'
+    # noop
   elsif ENV['RAILS_VERSION'] =~ /^4\.2/
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"

diff --git a/blacklight.gemspec b/blacklight.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency "twitter-typeahead-rails", '~> 0.11'
 
   s.add_development_dependency "solr_wrapper"
-  s.add_development_dependency "rspec-rails", ">= 3.4", "< 4"
+  s.add_development_dependency "rspec-rails", "~> 3.5"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency "capybara", '~> 2.6.0'