Don't use the deprecated devise helpers

samvera-deprecated · Aug 10, 2016 · ac92119 · ac92119
1 parent ce08c8b
commit ac92119
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/curation_concerns.gemspec b/curation_concerns.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'solrizer', '~> 3.4'
   spec.add_dependency 'rdf', '>= 1.99'
-  spec.add_dependency 'rdf-vocab', '~> 0'
+  spec.add_dependency 'rdf-vocab', '>= 0.8'
   spec.add_dependency 'awesome_nested_set', '~> 3.0'
   spec.add_dependency 'browse-everything', '~> 0.10'
   spec.add_dependency 'clipboard-rails', '~> 1.5'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -74,8 +74,13 @@
   end
 
   config.include FactoryGirl::Syntax::Methods
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
+  if defined? Devise::Test::ControllerHelpers
+    config.include Devise::Test::ControllerHelpers, type: :controller
+    config.include Devise::Test::ControllerHelpers, type: :view
+  else
+    config.include Devise::TestHelpers, type: :controller
+    config.include Devise::TestHelpers, type: :view
+  end
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
   config.include Controllers::EngineHelpers, type: :controller