Disable rspec monkeypatching

spec/controllers/application_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ApplicationController do
+RSpec.describe ApplicationController do
   describe '#feature_flags' do
     before do
       allow(controller).to receive(:current_exhibit)

spec/controllers/login_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe LoginController do
+RSpec.describe LoginController do
   let(:user) { create(:curator) }
 
   before do

spec/controllers/spotlight/catalog_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Spotlight::CatalogController do
+RSpec.describe Spotlight::CatalogController do
   include ActiveJob::TestHelper
   routes { Spotlight::Engine.routes }
 

spec/controllers/spotlight/contact_forms_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Spotlight::ContactFormsController do
+RSpec.describe Spotlight::ContactFormsController do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { create(:exhibit) }
   let(:honeypot_field_name) { Spotlight::Engine.config.spambot_honeypot_email_field }

spec/features/alt_text_instructions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Alt text instructions', :js do
+RSpec.describe 'Alt text instructions', :js do
   include JavascriptFeatureHelpers
 
   let(:exhibit) { create(:exhibit) }

spec/features/browse_category_admin_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Browse category adminstration', :js do
+RSpec.describe 'Browse category adminstration', :js do
   let(:exhibit) { create(:exhibit) }
   let(:exhibit_curator) { create(:exhibit_curator, exhibit: exhibit) }
   let(:title) { 'New category title' }

spec/features/canvas_display_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Canvas Display' do
+RSpec.describe 'Canvas Display' do
   let(:exhibit) { create(:exhibit, slug: 'default-exhibit') }
 
   let(:canvas_data) { JSON.parse(File.read('spec/fixtures/iiif/fh878gz0315-canvas-521.json')) }

spec/features/exhibit_index_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'the exhibit home page' do
+RSpec.describe 'the exhibit home page' do
   it 'loads the home page' do
     visit '/'
   end

spec/features/exhibit_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'an exhibit' do
+RSpec.describe 'an exhibit' do
   let!(:exhibit) { create(:exhibit) }
 
   it 'loads the home page' do

spec/helpers/application_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ApplicationHelper do
+RSpec.describe ApplicationHelper do
   describe '#collection_title' do
     it 'unmangles the collection title from the compound field' do
       expect(helper.collection_title('foo-|-bar')).to eq 'bar'

spec/helpers/catalog_helper_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe CatalogHelper do
+RSpec.describe CatalogHelper do
   describe '#has_thumbnail?' do
     context 'for references' do
       let(:document) { SolrDocument.new(format_main_ssim: ['Reference']) }

spec/jobs/send_publish_state_change_notification_job_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SendPublishStateChangeNotificationJob do
+RSpec.describe SendPublishStateChangeNotificationJob do
   let(:job) { described_class.perform_now(exhibit: exhibit, published: published) }
   let(:exhibit) { FactoryBot.create(:exhibit) }
 

spec/models/dor_harvester_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe DorHarvester do
+RSpec.describe DorHarvester do
   subject(:harvester) { described_class.create druid_list: druid, exhibit: exhibit }
 
   let(:exhibit) { create(:exhibit) }

spec/models/exhibit_bot_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe ExhibitBot do
+RSpec.describe ExhibitBot do
   let(:bot) { described_class.new }
 
   context 'when notifications are configured' do

spec/models/feature_flags_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FeatureFlags do
+RSpec.describe FeatureFlags do
   subject(:feature_flags) { described_class.new(settings).for(exhibit) }
 
   let(:exhibit) { create(:exhibit) }

spec/models/full_text_parser_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe FullTextParser do
+RSpec.describe FullTextParser do
   subject(:parser) { described_class.new(purl_object) }
 
   let(:purl_object) { double('PurlObject', bare_druid: 'cc842mn9348', public_xml: public_xml) }

spec/models/purl_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Purl do
+RSpec.describe Purl do
   subject(:purl) { described_class.new(druid) }
 
   before do

spec/models/solr_document_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SolrDocument do
+RSpec.describe SolrDocument do
   describe '#export_as_mods' do
     subject { described_class.new(modsxml: '123') }
 

spec/models/spotlight/exhibit_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Spotlight::Exhibit do
+RSpec.describe Spotlight::Exhibit do
   describe 'exhibit extensions' do
     context 'when an exhibit is published' do
       let(:exhibit) { FactoryBot.create(:exhibit, published: false) }

spec/models/spotlight/resources/iiif_manifest_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Spotlight::Resources::IiifManifest do
+RSpec.describe Spotlight::Resources::IiifManifest do
   let(:manifest) do
     {
       'thumbnail' => {

spec/models/spotlight/resources/upload_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Spotlight::Resources::Upload do
+RSpec.describe Spotlight::Resources::Upload do
   subject(:resource) { described_class.create! exhibit: exhibit, upload: upload }
 
   let(:exhibit) { create(:exhibit) }

spec/models/user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe User do
+RSpec.describe User do
   subject { create(:user) }
 
   describe '#shibboleth_groups=' do

spec/models/viewer_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Viewer do
+RSpec.describe Viewer do
   let(:viewer) { create(:viewer) }
 
   it 'belongs to an exhibit' do

spec/requests/exhibit_finder_requests_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Exhibit Finder API' do
+RSpec.describe 'Exhibit Finder API' do
   let(:exhibit) { create(:exhibit) }
 
   describe '#show' do

spec/requests/index_statuses_requests_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Index Statuses' do
+RSpec.describe 'Index Statuses' do
   let(:exhibit) { create(:exhibit) }
   let(:user) { nil }
   let(:resource) { DorHarvester.create(exhibit: exhibit) }

spec/requests/viewers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'Viewer Configuration' do
+RSpec.describe 'Viewer Configuration' do
   let(:exhibit) { create(:exhibit) }
   let(:user) { nil }
   let(:viewer) { Viewer.create(exhibit_id: exhibit.id) }

spec/services/search_across_search_builder_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe SearchAcrossSearchBuilder do
+RSpec.describe SearchAcrossSearchBuilder do
   subject(:search_builder) { described_class.new(scope) }
 
   let(:scope) do

spec/spec_helper.rb

@@ -30,12 +30,7 @@
     mocks.verify_partial_doubles = true
   end
 
-  # Limits the available syntax to the non-monkey patched syntax that is recommended.
-  # For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  # config.disable_monkey_patching!
+  config.disable_monkey_patching!
 
   config.default_formatter = 'doc' if config.files_to_run.one?
 

spec/views/catalog/_bibliography_buttons_default.html.erb_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'catalog/_bibliography_buttons_default' do
+RSpec.describe 'catalog/_bibliography_buttons_default' do
   let(:document) { SolrDocument.new(format_main_ssim: 'Reference', bibtex_key_ss: url) }
 
   before do

spec/views/catalog/_embedded_mirador3.html.erb_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'catalog/_embedded_mirador3' do
+RSpec.describe 'catalog/_embedded_mirador3' do
   let(:document) { SolrDocument.new(id: 'abc', iiif_manifest_url_ssi: manifest_url) }
   let(:manifest_url) { 'http://example.com/iiif/manifest' }
 

spec/views/catalog/_metadata_button_default.html.erb_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'catalog/_metadata_button_default' do
+RSpec.describe 'catalog/_metadata_button_default' do
   let(:document) { SolrDocument.new(modsxml: 'stuff', id: 'abc') }
   let(:current_exhibit) { create(:exhibit) }
 

spec/views/viewers/edit.html.erb_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe 'viewers/edit' do
+RSpec.describe 'viewers/edit' do
   let(:exhibit) { create(:exhibit) }
   let(:viewer) { Viewer.create(exhibit_id: exhibit.id) }