Merge pull request #1350 from projecthydra/remove-deprecation-warnings

Remove deprecation warnings
samvera-deprecated · Nov 12, 2015 · df3a55c · df3a55c
2 parents 53bb93b + b97109e
commit df3a55c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/app/controllers/concerns/sufia/homepage_controller.rb b/app/controllers/concerns/sufia/homepage_controller.rb
@@ -4,7 +4,7 @@ module Sufia::HomepageController
   included do
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
-    include Blacklight::Catalog::SearchContext
+    include Blacklight::SearchContext
     include Sufia::Controller
     include Blacklight::SearchHelper
     include Hydra::Controller::SearchBuilder

diff --git a/app/controllers/concerns/sufia/users_controller_behavior.rb b/app/controllers/concerns/sufia/users_controller_behavior.rb
@@ -2,7 +2,7 @@ module Sufia::UsersControllerBehavior
   extend ActiveSupport::Concern
 
   included do
-    include Blacklight::Catalog::SearchContext
+    include Blacklight::SearchContext
     layout "sufia-one-column"
     prepend_before_action :find_user, except: [:index, :search, :notifications_number]
     before_action :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]

diff --git a/spec/forms/collection_edit_form_spec.rb b/spec/forms/collection_edit_form_spec.rb
@@ -11,10 +11,10 @@
                             :identifier, :based_near, :related_url] }
   end
 
-  describe "unique?" do
+  describe "multiple?" do
     context "with :title" do
-      subject { described_class.unique?(:title) }
-      it { is_expected.to be true }
+      subject { described_class.multiple?(:title) }
+      it { is_expected.to be false }
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -37,7 +37,7 @@
 
 Capybara.default_driver = :rack_test      # This is a faster driver
 Capybara.javascript_driver = :poltergeist # This is slower
-Capybara.default_wait_time = ENV['TRAVIS'] ? 30 : 15
+Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
 # HttpLogger.logger = Logger.new(STDOUT)
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false

diff --git a/sufia-models/app/models/concerns/sufia/generic_file/metadata.rb b/sufia-models/app/models/concerns/sufia/generic_file/metadata.rb
@@ -18,33 +18,33 @@ module Metadata
           index.as :symbol
         end
 
-        property :part_of, predicate: ::RDF::DC.isPartOf
-        property :resource_type, predicate: ::RDF::DC.type do |index|
+        property :part_of, predicate: RDF::Vocab::DC.isPartOf
+        property :resource_type, predicate: RDF::Vocab::DC.type do |index|
           index.as :stored_searchable, :facetable
         end
-        property :title, predicate: ::RDF::DC.title do |index|
+        property :title, predicate: RDF::Vocab::DC.title do |index|
           index.as :stored_searchable, :facetable
         end
-        property :creator, predicate: ::RDF::DC.creator do |index|
+        property :creator, predicate: RDF::Vocab::DC.creator do |index|
           index.as :stored_searchable, :facetable
         end
-        property :contributor, predicate: ::RDF::DC.contributor do |index|
+        property :contributor, predicate: RDF::Vocab::DC.contributor do |index|
           index.as :stored_searchable, :facetable
         end
-        property :description, predicate: ::RDF::DC.description do |index|
+        property :description, predicate: RDF::Vocab::DC.description do |index|
           index.type :text
           index.as :stored_searchable
         end
-        property :tag, predicate: ::RDF::DC.relation do |index|
+        property :tag, predicate: RDF::Vocab::DC.relation do |index|
           index.as :stored_searchable, :facetable
         end
-        property :rights, predicate: ::RDF::DC.rights do |index|
+        property :rights, predicate: RDF::Vocab::DC.rights do |index|
           index.as :stored_searchable
         end
-        property :publisher, predicate: ::RDF::DC.publisher do |index|
+        property :publisher, predicate: RDF::Vocab::DC.publisher do |index|
           index.as :stored_searchable, :facetable
         end
-        property :date_created, predicate: ::RDF::DC.created do |index|
+        property :date_created, predicate: RDF::Vocab::DC.created do |index|
           index.as :stored_searchable
         end
 
@@ -53,34 +53,34 @@ module Metadata
         # fedora's system created date will reflect the date when the record
         # was created in fedora4, but the date_uploaded will preserve the
         # original creation date from the old repository.
-        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted, multiple: false do |index|
+        property :date_uploaded, predicate: RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
         end
 
-        property :date_modified, predicate: ::RDF::DC.modified, multiple: false do |index|
+        property :date_modified, predicate: RDF::Vocab::DC.modified, multiple: false do |index|
           index.type :date
           index.as :stored_sortable
         end
-        property :subject, predicate: ::RDF::DC.subject do |index|
+        property :subject, predicate: RDF::Vocab::DC.subject do |index|
           index.as :stored_searchable, :facetable
         end
-        property :language, predicate: ::RDF::DC.language do |index|
+        property :language, predicate: RDF::Vocab::DC.language do |index|
           index.as :stored_searchable, :facetable
         end
-        property :identifier, predicate: ::RDF::DC.identifier do |index|
+        property :identifier, predicate: RDF::Vocab::DC.identifier do |index|
           index.as :stored_searchable
         end
-        property :based_near, predicate: ::RDF::FOAF.based_near do |index|
+        property :based_near, predicate: RDF::Vocab::FOAF.based_near do |index|
           index.as :stored_searchable, :facetable
         end
         property :related_url, predicate: ::RDF::RDFS.seeAlso do |index|
           index.as :stored_searchable
         end
-        property :bibliographic_citation, predicate: ::RDF::DC.bibliographicCitation do |index|
+        property :bibliographic_citation, predicate: RDF::Vocab::DC.bibliographicCitation do |index|
           index.as :stored_searchable
         end
-        property :source, predicate: ::RDF::DC.source do |index|
+        property :source, predicate: RDF::Vocab::DC.source do |index|
           index.as :stored_searchable
         end
 

diff --git a/sufia.gemspec b/sufia.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight_advanced_search', ['>= 5.1.4', '< 6.0']
-  gem.add_dependency 'blacklight', '~> 5.12'
+  gem.add_dependency 'blacklight', '~> 5.16'
   gem.add_dependency 'railties', '>= 4.2.0'
   gem.add_dependency 'tinymce-rails', '~> 4.1'
   gem.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'