Disable RSpec monkeypatching

spec/controllers/alternate_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe AlternateController do
+RSpec.describe AlternateController do
   describe "the search results tools" do
     it "inherits tools from CatalogController" do
       expect(AlternateController.blacklight_config.index.document_actions).to have_key(:bookmark)

spec/controllers/application_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
 
   describe "#blacklight_config" do
 

spec/controllers/blacklight/base_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Base do
+RSpec.describe Blacklight::Base do
   let(:controller) { (Class.new(ApplicationController) { include Blacklight::Base }).new }
   subject { controller}
 

spec/controllers/blacklight/catalog/component_configuration_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::DefaultComponentConfiguration do
+RSpec.describe Blacklight::DefaultComponentConfiguration do
   subject do
     Class.new do
       include Blacklight::Configurable

spec/controllers/blacklight/facet_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Facet do
+RSpec.describe Blacklight::Facet do
   subject do
     Class.new do
       include Blacklight::Facet

spec/controllers/blacklight/search_fields_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::SearchFields do
+RSpec.describe Blacklight::SearchFields do
 
   class MockConfig
     include Blacklight::SearchFields

spec/controllers/bookmarks_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe BookmarksController do
+RSpec.describe BookmarksController do
   describe '#blacklight_config' do
     it 'uses POST requests for querying solr' do
       expect(@controller.blacklight_config.http_method).to eq :post

spec/controllers/catalog_controller_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-describe CatalogController do
+RSpec.describe CatalogController do
   let(:doc_id) { '2007020969' }
   let(:mock_response) { instance_double(Blacklight::Solr::Response) }
   let(:mock_document) { instance_double(SolrDocument) }

spec/controllers/saved_searches_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe SavedSearchesController do
+RSpec.describe SavedSearchesController do
   routes { Blacklight::Engine.routes }
 
   before(:all) do

spec/controllers/search_history_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe SearchHistoryController do
+RSpec.describe SearchHistoryController do
   routes { Blacklight::Engine.routes }
 
   describe "index" do

spec/features/alternate_controller_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Alternate Controller Behaviors" do
+RSpec.describe "Alternate Controller Behaviors" do
   it "has the correct per-page form" do
     visit search_alternate_path
     expect(page).to have_selector("form[action='#{search_alternate_url}']")

spec/features/autocomplete_spec.rb

@@ -1,4 +1,4 @@
-describe 'Autocomplete suggestions' do
+RSpec.describe 'Autocomplete suggestions' do
   it 'search form has suggest path' do
     visit root_path
     expect(page).to have_css 'input[data-autocomplete-path="/catalog/suggest"]'

spec/features/bookmarks_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Bookmarks" do
+RSpec.describe "Bookmarks" do
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       sign_in 'user1'

spec/features/did_you_mean_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Did You Mean" do
+RSpec.describe "Did You Mean" do
   before { visit root_path }
 
   describe "searching all fields" do

spec/features/facets_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Facets" do
+RSpec.describe "Facets" do
   it "shows a single facet's values" do
     visit facet_catalog_path("language_facet")
     expect(page).to have_selector ".modal-title", :text => "Language"

spec/features/record_view_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Record View" do
+RSpec.describe "Record View" do
   it "displays a normal record" do
     visit solr_document_path('2007020969')
     expect(page).to have_content "Title:" 

spec/features/saved_searches_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Saved Searches" do
+RSpec.describe "Saved Searches" do
   before do
     sign_in 'user1'
     visit root_path

spec/features/search_context_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Results context", js: true do
+RSpec.describe "Search Results context", js: true do
   it "passes the current search id through" do
     search_for ''
     search_id =  Search.last.id.to_s

spec/features/search_filters_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Facets" do
+RSpec.describe "Facets" do
   it "works without a search term" do
     visit root_path
     within "#facet-language_facet" do

spec/features/search_formats_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Formats" do
+RSpec.describe "Search Formats" do
   it "has an RSS XML response" do
     visit "/catalog.rss?q="
     expect(page).to have_content "Blacklight Search Results"

spec/features/search_history_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search History Page" do
+RSpec.describe "Search History Page" do
   describe "navigating from the homepage" do
     it "has a link to the history page" do
       visit root_path

spec/features/search_pagination_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Pagination" do
+RSpec.describe "Search Pagination" do
   it "has results with pagination" do
     visit root_path
     fill_in "q", with: ''

spec/features/search_results_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Results" do
+RSpec.describe "Search Results" do
   it "has for an empty query" do
     search_for ''
     expect(number_of_results_from_page(page)).to eq 30

spec/features/search_sort_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Sort" do
+RSpec.describe "Search Sort" do
   it "sorts on facet results with no search terms" do
     visit root_path
     within "#facet-language_facet" do

spec/features/search_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Search Page" do
+RSpec.describe "Search Page" do
   it "shows welcome" do
     visit root_path
     expect(page).to have_selector("input#q")

spec/helpers/blacklight/configuration_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::ConfigurationHelperBehavior do
+RSpec.describe Blacklight::ConfigurationHelperBehavior do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:config_value) { double() }
 

spec/helpers/blacklight/facets_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::FacetsHelperBehavior do
+RSpec.describe Blacklight::FacetsHelperBehavior do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before(:each) do

spec/helpers/blacklight/hash_as_hidden_fields_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::HashAsHiddenFieldsHelperBehavior do
+RSpec.describe Blacklight::HashAsHiddenFieldsHelperBehavior do
   before(:each) do
     @hash = {:q => "query", :search_field => "search_field", :per_page=>10, :page=>5, :extra_arbitrary_key=>"arbitrary_value", :f=> {:field1 => ["a", "b"], :field2=> ["z"]}}
   end

spec/helpers/blacklight/layout_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::LayoutHelperBehavior do
+RSpec.describe Blacklight::LayoutHelperBehavior do
   describe '#show_content_classes' do
     it 'returns a string of classes' do
       expect(helper.show_content_classes).to be_an String

spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::RenderConstraintsHelperBehavior do
+RSpec.describe Blacklight::RenderConstraintsHelperBehavior do
   let(:config) do
     Blacklight::Configuration.new do |config|
       config.add_facet_field 'type'

spec/helpers/blacklight/render_partials_helper_behavior_spec.rb

@@ -1,4 +1,4 @@
-describe Blacklight::RenderPartialsHelperBehavior do
+RSpec.describe Blacklight::RenderPartialsHelperBehavior do
   describe "#type_field_to_partial_name" do
     let(:document) { double }
     context "with default value" do

spec/helpers/blacklight/search_history_constraints_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::SearchHistoryConstraintsHelperBehavior do
+RSpec.describe Blacklight::SearchHistoryConstraintsHelperBehavior do
 
   before(:all) do
     @config = Blacklight::Configuration.new do |config|

spec/helpers/blacklight/suggest_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::SuggestHelperBehavior do
+RSpec.describe Blacklight::SuggestHelperBehavior do
   before do
     allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
   end

spec/helpers/blacklight/url_helper_behavior_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::UrlHelperBehavior do
+RSpec.describe Blacklight::UrlHelperBehavior do
 
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|

spec/helpers/blacklight_helper_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-describe BlacklightHelper do
+RSpec.describe BlacklightHelper do
   before(:each) do
     allow(helper).to receive(:current_or_guest_user).and_return(User.new)
     allow(helper).to receive(:search_action_path) do |*args|

spec/helpers/catalog_helper_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe CatalogHelper do
+RSpec.describe CatalogHelper do
   include ERB::Util
   include CatalogHelper
 

spec/integration/generators/blacklight/solr5_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'generators/blacklight/solr5_generator'
 
-describe Blacklight::Solr5Generator do
+RSpec.describe Blacklight::Solr5Generator do
   let(:destination) { Dir.mktmpdir }
 
   describe "#solr_wrapper_config" do

spec/lib/blacklight/configuration/field_spec.rb

@@ -1,4 +1,4 @@
-describe Blacklight::Configuration::Field do
+RSpec.describe Blacklight::Configuration::Field do
   subject { described_class.new(key: key, label: label) }
   let(:key) { 'some_key' }
   let(:label) { 'some label' }

spec/lib/blacklight/parameters_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Parameters do
+RSpec.describe Blacklight::Parameters do
   describe "sanitize_search_params" do
     subject { described_class.sanitize(params) }
 

spec/lib/blacklight/search_state_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::SearchState do
+RSpec.describe Blacklight::SearchState do
   let(:blacklight_config) do
     Blacklight::Configuration.new.configure do |config|
       config.index.title_field = 'title_display'

spec/lib/blacklight/utils_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Blacklight::Utils' do
+RSpec.describe 'Blacklight::Utils' do
   describe Blacklight::OpenStructWithHashAccess do
     it "provides hash-like accessors for OpenStruct data" do
       a = Blacklight::OpenStructWithHashAccess.new :foo => :bar, :baz => 1

spec/lib/blacklight_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight do
+RSpec.describe Blacklight do
   context 'root' do
     let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
 

spec/lib/tasks/blacklight_task_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'rake'
 
-describe "blacklight:delete_old_searches" do
+RSpec.describe "blacklight:delete_old_searches" do
 
   before do
     @rake = Rake::Application.new      

spec/models/blacklight/configurable_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Blacklight::Configurable" do
+RSpec.describe "Blacklight::Configurable" do
 
   describe "inheritence" do
     before(:all) do

spec/models/blacklight/configuration/context_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Configuration::Context do
+RSpec.describe Blacklight::Configuration::Context do
 
   subject { described_class.new(context) }
   let(:context) { double }

spec/models/blacklight/configuration_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Blacklight::Configuration" do
+RSpec.describe "Blacklight::Configuration" do
 
   before(:each) do
     @config = Blacklight::Configuration.new

spec/models/blacklight/document/active_model_shim_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Blacklight::Document::ActiveModelShim' do
+RSpec.describe 'Blacklight::Document::ActiveModelShim' do
 
   class MockDocument
     include Blacklight::Document

spec/models/blacklight/document/cache_key_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Document::CacheKey do
+RSpec.describe Blacklight::Document::CacheKey do
   let(:attributes) { {} }
   let(:subject) { SolrDocument.new(attributes) }
   it 'SolrDocument includes the module' do

spec/models/blacklight/document/dublin_core_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Blacklight::Document::DublinCore" do
+RSpec.describe "Blacklight::Document::DublinCore" do
   before(:all) do
     @mock_class = Class.new do
       include Blacklight::Document

spec/models/blacklight/document/email_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe "Blacklight::Document::Email" do
+RSpec.describe "Blacklight::Document::Email" do
   before(:all) do
     SolrDocument.use_extension( Blacklight::Document::Email )
   end