blacklight 8.2.2 → 8.4.0

data/spec/components/blacklight/document_component_spec.rb

@@ -36,12 +36,8 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
   before do
     # Every call to view_context returns a different object. This ensures it stays stable.
-    allow(controller).to receive(:view_context).and_return(view_context)
-    allow(controller).to receive(:current_or_guest_user).and_return(User.new)
-    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view_context).to receive(:search_session).and_return({})
-    allow(view_context).to receive(:current_search_session).and_return(nil)
-    allow(view_context).to receive(:current_bookmarks).and_return([])
+    allow(controller).to receive_messages(view_context: view_context, current_or_guest_user: User.new, blacklight_config: blacklight_config)
+    allow(view_context).to receive_messages(search_session: {}, current_search_session: nil, current_bookmarks: [])
   end
 
   it 'has some defined content areas' do
@@ -61,8 +57,8 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   it 'has schema.org properties' do
     component.set_slot(:body) { '-' }
 
-    expect(rendered).to have_selector 'article[@itemtype="http://schema.org/Thing"]'
-    expect(rendered).to have_selector 'article[@itemscope]'
+    expect(rendered).to have_css 'article[@itemtype="http://schema.org/Thing"]'
+    expect(rendered).to have_css 'article[@itemscope]'
   end
 
   context 'with a provided body' do
@@ -70,8 +66,8 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
       component.set_slot(:body) { 'Body content' }
 
       expect(rendered).to have_content 'Body content'
-      expect(rendered).not_to have_selector 'header'
-      expect(rendered).not_to have_selector 'dl'
+      expect(rendered).to have_no_css 'header'
+      expect(rendered).to have_no_css 'dl'
     end
   end
 
@@ -85,8 +81,8 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     it 'has data properties' do
       component.set_slot(:body) { '-' }
 
-      expect(rendered).to have_selector 'article[@data-document-id="x"]'
-      expect(rendered).to have_selector 'article[@data-document-counter="5"]'
+      expect(rendered).to have_css 'article[@data-document-id="x"]'
+      expect(rendered).to have_css 'article[@data-document-counter="5"]'
     end
 
     it 'renders a linked title' do
@@ -94,7 +90,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     it 'renders a counter with the title' do
-      expect(rendered).to have_selector 'header', text: '5. Title'
+      expect(rendered).to have_css 'header', text: '5. Title'
     end
 
     context 'with a document rendered as part of a collection' do
@@ -104,24 +100,24 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
       it 'renders a counter with the title' do
         # after ViewComponent 2.5, collection counter params are 1-indexed
-        expect(rendered).to have_selector 'header', text: '111. Title'
+        expect(rendered).to have_css 'header', text: '111. Title'
       end
     end
 
     it 'renders actions' do
-      expect(rendered).to have_selector '.index-document-functions'
+      expect(rendered).to have_css '.index-document-functions'
     end
 
     it 'renders a thumbnail' do
-      expect(rendered).to have_selector 'a[href="/catalog/x"] img[src="http://example.com/image.jpg"]'
+      expect(rendered).to have_css 'a[href="/catalog/x"] img[src="http://example.com/image.jpg"]'
     end
 
     context 'with default metadata component' do
       it 'renders metadata' do
-        expect(rendered).to have_selector 'dl.document-metadata'
-        expect(rendered).to have_selector 'dt', text: 'Title:'
-        expect(rendered).to have_selector 'dd', text: 'Title'
-        expect(rendered).not_to have_selector 'dt', text: 'ISBN:'
+        expect(rendered).to have_css 'dl.document-metadata'
+        expect(rendered).to have_css 'dt', text: 'Title:'
+        expect(rendered).to have_css 'dd', text: 'Title'
+        expect(rendered).to have_no_css 'dt', text: 'ISBN:'
       end
     end
   end
@@ -136,17 +132,17 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     it 'renders with an id' do
       component.set_slot(:body) { '-' }
 
-      expect(rendered).to have_selector 'article#document'
+      expect(rendered).to have_css 'article#document'
     end
 
     it 'renders a title' do
-      expect(rendered).to have_selector 'h1', text: 'Title'
+      expect(rendered).to have_css 'h1', text: 'Title'
     end
 
     it 'renders with show-specific metadata' do
-      expect(rendered).to have_selector 'dl.document-metadata'
-      expect(rendered).to have_selector 'dt', text: 'ISBN:'
-      expect(rendered).to have_selector 'dd', text: 'Value'
+      expect(rendered).to have_css 'dl.document-metadata'
+      expect(rendered).to have_css 'dt', text: 'ISBN:'
+      expect(rendered).to have_css 'dd', text: 'Value'
     end
 
     it 'renders an embed' do
@@ -162,6 +158,26 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
       expect(rendered).to have_content 'embed'
     end
 
+    context 'show view with custom translation' do
+      let!(:original_translations) { I18n.backend.send(:translations).deep_dup }
+
+      before do
+        controller.action_name = "show"
+        I18n.backend.store_translations(:en, blacklight: { search: { show: { label: "testing:%{label}" } } })
+      end
+
+      after do
+        I18n.backend.reload!
+        I18n.backend.store_translations(:en, original_translations[:en])
+      end
+
+      it 'renders with show-specific metadata with correct translation' do
+        expect(rendered).to have_css 'dl.document-metadata'
+        expect(rendered).to have_css 'dt', text: 'testing:ISBN'
+        expect(rendered).to have_css 'dd', text: 'Value'
+      end
+    end
+
     context 'with configured metadata component' do
       let(:custom_component_class) do
         Class.new(Blacklight::DocumentMetadataComponent) do

data/spec/components/blacklight/facet_component_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
   let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'field').normalize! }
 
   it 'delegates to the configured component to render something' do
-    expect(rendered).to have_selector 'ul.facet-values'
+    expect(rendered).to have_css 'ul.facet-values'
   end
 
   context 'with a provided component' do
@@ -52,7 +52,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
     before do
       replace_hash = { 'catalog/_facet_partial.html.erb' => 'facet partial' }
 
-      if ::Rails.version.to_f >= 7.1
+      if Rails.version.to_f >= 7.1
         controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
       else
         controller.view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))

data/spec/components/blacklight/facet_field_checkboxes_component_spec.rb

@@ -33,15 +33,15 @@ RSpec.describe Blacklight::FacetFieldCheckboxesComponent, type: :component do
   let(:params) { { f: { field: ['a'] } } }
 
   it 'renders a collapsible card' do
-    expect(rendered).to have_selector '.card'
+    expect(rendered).to have_css '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
-    expect(rendered).to have_selector '#facet-field.collapse.show'
+    expect(rendered).to have_css 'button[data-bs-target="#facet-field"]'
+    expect(rendered).to have_css '#facet-field.collapse.show'
   end
 
   it 'renders the facet items' do
-    expect(rendered).to have_selector 'ul.facet-values'
-    expect(rendered).to have_selector 'li', count: 3
+    expect(rendered).to have_css 'ul.facet-values'
+    expect(rendered).to have_css 'li', count: 3
 
     expect(rendered).to have_field 'f_inclusive[field][]', with: 'a'
     expect(rendered).to have_field 'f_inclusive[field][]', with: 'b'

data/spec/components/blacklight/facet_field_list_component_spec.rb

@@ -31,15 +31,15 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
   end
 
   it 'renders a collapsible card' do
-    expect(rendered).to have_selector '.card'
+    expect(rendered).to have_css '.card'
     expect(rendered).to have_button 'Field'
-    expect(rendered).to have_selector 'button[data-bs-target="#facet-field"]'
-    expect(rendered).to have_selector '#facet-field.collapse.show'
+    expect(rendered).to have_css 'button[data-bs-target="#facet-field"]'
+    expect(rendered).to have_css '#facet-field.collapse.show'
   end
 
   it 'renders the facet items' do
-    expect(rendered).to have_selector 'ul.facet-values'
-    expect(rendered).to have_selector 'li', count: 2
+    expect(rendered).to have_css 'ul.facet-values'
+    expect(rendered).to have_css 'li', count: 2
   end
 
   context 'with an active facet' do
@@ -58,7 +58,7 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     end
 
     it 'adds the facet-limit-active class' do
-      expect(rendered).to have_selector 'div.facet-limit-active'
+      expect(rendered).to have_css 'div.facet-limit-active'
     end
   end
 
@@ -78,13 +78,13 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
     end
 
     it 'renders a collapsed facet' do
-      expect(rendered).to have_selector '.facet-content.collapse'
-      expect(rendered).not_to have_selector '.facet-content.collapse.show'
+      expect(rendered).to have_css '.facet-content.collapse'
+      expect(rendered).to have_no_css '.facet-content.collapse.show'
     end
 
     it 'renders the toggle button in the collapsed state' do
-      expect(rendered).to have_selector '.btn.collapsed'
-      expect(rendered).to have_selector '.btn[aria-expanded="false"]'
+      expect(rendered).to have_css '.btn.collapsed'
+      expect(rendered).to have_css '.btn[aria-expanded="false"]'
     end
   end
 
@@ -134,11 +134,11 @@ RSpec.describe Blacklight::FacetFieldListComponent, type: :component do
 
     it 'displays the constraint above the list' do
       expect(rendered).to have_content 'Any of:'
-      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'a'
+      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'a'
       expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=b&f_inclusive%5Bfield%5D%5B%5D=c'
-      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'b'
+      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'b'
       expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=c'
-      expect(rendered).to have_selector '.inclusive_or .facet-label', text: 'c'
+      expect(rendered).to have_css '.inclusive_or .facet-label', text: 'c'
       expect(rendered).to have_link '[remove]', href: 'http://test.host/catalog?f_inclusive%5Bfield%5D%5B%5D=a&f_inclusive%5Bfield%5D%5B%5D=b'
     end
   end

data/spec/components/blacklight/facet_item_component_spec.rb

@@ -19,11 +19,11 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
   end
 
   it 'links to the facet and shows the number of hits' do
-    expect(rendered).to have_selector 'li'
+    expect(rendered).to have_css 'li'
     expect(rendered).to have_link 'x', href: '/catalog?f=x' do |link|
       link['rel'] == 'nofollow'
     end
-    expect(rendered).to have_selector '.facet-count', text: '10'
+    expect(rendered).to have_css '.facet-count', text: '10'
   end
 
   context 'with a selected facet' do
@@ -39,12 +39,12 @@ RSpec.describe Blacklight::FacetItemComponent, type: :component do
     end
 
     it 'links to the facet and shows the number of hits' do
-      expect(rendered).to have_selector 'li'
-      expect(rendered).to have_selector '.selected', text: 'x'
+      expect(rendered).to have_css 'li'
+      expect(rendered).to have_css '.selected', text: 'x'
       expect(rendered).to have_link '[remove]', href: '/catalog' do |link|
         link['rel'] == 'nofollow'
       end
-      expect(rendered).to have_selector '.selected.facet-count', text: '10'
+      expect(rendered).to have_css '.selected.facet-count', text: '10'
     end
   end
 end

data/spec/components/blacklight/facet_item_pivot_component_spec.rb

@@ -34,13 +34,13 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
   let(:facet_config) { Blacklight::Configuration::NullField.new(key: 'z', item_component: Blacklight::FacetItemComponent, item_presenter: Blacklight::FacetItemPivotPresenter) }
 
   it 'links to the facet and shows the number of hits' do
-    expect(rendered).to have_selector 'li'
+    expect(rendered).to have_css 'li'
     expect(rendered).to have_link 'x', href: nokogiri_mediated_href(facet_item.href)
-    expect(rendered).to have_selector '.facet-count', text: '10'
+    expect(rendered).to have_css '.facet-count', text: '10'
   end
 
   it 'has the facet hierarchy' do
-    expect(rendered).to have_selector 'li ul.pivot-facet'
+    expect(rendered).to have_css 'li ul.pivot-facet'
     expect(rendered).to have_link 'x:1', href: nokogiri_mediated_href(facet_item.facet_item_presenters.first.href)
   end
 
@@ -60,10 +60,10 @@ RSpec.describe Blacklight::FacetItemPivotComponent, type: :component do
     end
 
     it 'links to the facet and shows the number of hits' do
-      expect(rendered).to have_selector 'li'
-      expect(rendered).to have_selector '.selected', text: 'x'
+      expect(rendered).to have_css 'li'
+      expect(rendered).to have_css '.selected', text: 'x'
       expect(rendered).to have_link '[remove]', href: '/catalog'
-      expect(rendered).to have_selector '.selected.facet-count', text: '10'
+      expect(rendered).to have_css '.selected.facet-count', text: '10'
     end
   end
 end

data/spec/components/blacklight/header_component_spec.rb

@@ -3,8 +3,7 @@
 RSpec.describe Blacklight::HeaderComponent, type: :component do
   before do
     with_controller_class(CatalogController) do
-      allow(controller).to receive(:current_user).and_return(nil)
-      allow(controller).to receive(:search_action_url).and_return('/search')
+      allow(controller).to receive_messages(current_user: nil, search_action_url: '/search')
       render
     end
   end

data/spec/components/blacklight/hidden_search_state_component_spec.rb

@@ -13,11 +13,11 @@ RSpec.describe Blacklight::HiddenSearchStateComponent, type: :component do
   let(:instance) { described_class.new(params: params) }
 
   it "converts a hash with nested complex data to Rails-style hidden form fields" do
-    expect(rendered).to have_selector("input[type='hidden'][name='q'][value='query']", visible: :hidden)
-    expect(rendered).to have_selector("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
-    expect(rendered).to have_selector("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
-    expect(rendered).to have_selector("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
-    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
-    expect(rendered).to have_selector("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='q'][value='query']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='per_page'][value='10']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='extra_arbitrary_key'][value='arbitrary_value']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='f[field2][]'][value='z']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='f[field1][]'][value='a']", visible: :hidden)
+    expect(rendered).to have_css("input[type='hidden'][name='f[field1][]'][value='b']", visible: :hidden)
   end
 end

data/spec/components/blacklight/icons/icon_component_spec.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Icons::IconComponent, type: :component do
+  subject(:component) { sub_component.new }
+
+  let(:sub_component) do
+    Class.new(described_class) do
+      def self.name
+        'TestIconComponent'
+      end
+    end
+  end
+
+  context 'when no classes are passed in' do
+    subject(:component) { sub_component.new }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-test_icon']"
+    end
+  end
+
+  context 'when classes are passed in' do
+    subject(:component) { sub_component.new(classes: 'my-icon') }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='my-icon blacklight-icons blacklight-icons-test_icon']"
+    end
+  end
+
+  context 'when name is passed in' do
+    subject(:component) { sub_component.new(name: 'my-icon') }
+
+    it "renders component" do
+      render_inline(component)
+      expect(page).to have_css "span[class='blacklight-icons blacklight-icons-my-icon']"
+    end
+  end
+end

data/spec/components/blacklight/metadata_field_component_spec.rb

@@ -16,11 +16,11 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
   end
 
   it 'renders the field label' do
-    expect(rendered).to have_selector 'dt.blacklight-field', text: 'Field label'
+    expect(rendered).to have_css 'dt.blacklight-field', text: 'Field label'
   end
 
   it 'renders the field value' do
-    expect(rendered).to have_selector 'dd.blacklight-field', text: 'Value'
+    expect(rendered).to have_css 'dd.blacklight-field', text: 'Value'
   end
 
   context 'from a show view' do
@@ -31,7 +31,7 @@ RSpec.describe Blacklight::MetadataFieldComponent, type: :component do
     it 'renders the right field label' do
       allow(field).to receive(:label).with('show').and_return('custom label')
 
-      expect(rendered).to have_selector 'dt.blacklight-field', text: 'custom label'
+      expect(rendered).to have_css 'dt.blacklight-field', text: 'custom label'
     end
   end
 end

data/spec/components/blacklight/response/pagination_component_spec.rb

@@ -18,10 +18,10 @@ RSpec.describe Blacklight::Response::PaginationComponent, type: :component do
       before { render }
 
       it "has links to deep pages" do
-        expect(page).not_to have_link '98'
+        expect(page).to have_no_link '98'
         expect(page).to have_link '99'
         expect(page).to have_link '100'
-        expect(page).not_to have_link '101'
+        expect(page).to have_no_link '101'
       end
     end
 
@@ -32,7 +32,7 @@ RSpec.describe Blacklight::Response::PaginationComponent, type: :component do
 
       it "does not link to deep pages" do
         expect(page).to have_link '1'
-        expect(page).not_to have_link '100'
+        expect(page).to have_no_link '100'
       end
     end
 
@@ -46,7 +46,7 @@ RSpec.describe Blacklight::Response::PaginationComponent, type: :component do
 
       it "does not link to deep pages" do
         expect(page).to have_link '1'
-        expect(page).not_to have_link '100'
+        expect(page).to have_no_link '100'
       end
     end
   end

data/spec/components/blacklight/search_context/server_applied_params_component_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Blacklight::SearchContext::ServerAppliedParamsComponent, type: :c
     # https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
     # https://github.com/rspec/rspec-rails/issues/2696
     replace_hash = { 'application/_start_over.html.erb' => 'start over' }
-    if ::Rails.version.to_f >= 7.1
+    if Rails.version.to_f >= 7.1
       controller.prepend_view_path(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))
     else
       view_context.view_paths.unshift(RSpec::Rails::ViewExampleGroup::StubResolverCache.resolver_for(replace_hash))

data/spec/components/blacklight/search_context/server_item_pagination_component_spec.rb

@@ -30,14 +30,12 @@ RSpec.describe Blacklight::SearchContext::ServerItemPaginationComponent, type: :
 
     before do
       # allow(controller).to receive(:controller_tracking_method).and_return('track_catalog_path')
-      allow(controller).to receive(:controller_name).and_return('catalog')
 
-      allow(controller).to receive(:link_to_previous_document).and_return('')
-      allow(controller).to receive(:link_to_next_document).and_return('')
+      allow(controller).to receive_messages(controller_name: 'catalog', link_to_previous_document: '', link_to_next_document: '')
     end
 
     it "renders content" do
-      expect(render.css('.pagination-search-widgets').to_html).not_to be_blank
+      expect(render.css('.search-context.page-links').to_html).not_to be_blank
     end
 
     context "session and document are out of sync" do

data/spec/components/blacklight/system/flash_message_component_spec.rb

@@ -17,14 +17,14 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
   let(:type) { 'whatever' }
 
   it 'renders a message inside an alert' do
-    expect(rendered).to have_selector 'div.alert.alert-whatever', text: message
+    expect(rendered).to have_css 'div.alert.alert-whatever', text: message
   end
 
   context 'with a success message' do
     let(:type) { 'success' }
 
     it 'adds some styling' do
-      expect(rendered).to have_selector 'div.alert-success'
+      expect(rendered).to have_css 'div.alert-success'
     end
   end
 
@@ -32,7 +32,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'notice' }
 
     it 'adds some styling' do
-      expect(rendered).to have_selector 'div.alert-info'
+      expect(rendered).to have_css 'div.alert-info'
     end
   end
 
@@ -40,7 +40,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'alert' }
 
     it 'adds some styling' do
-      expect(rendered).to have_selector 'div.alert-warning'
+      expect(rendered).to have_css 'div.alert-warning'
     end
   end
 
@@ -48,7 +48,7 @@ RSpec.describe Blacklight::System::FlashMessageComponent, type: :component do
     let(:type) { 'error' }
 
     it 'adds some styling' do
-      expect(rendered).to have_selector 'div.alert-danger'
+      expect(rendered).to have_css 'div.alert-danger'
     end
   end
 end

data/spec/controllers/blacklight/catalog_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Blacklight::Catalog do
   describe "#search_state" do
     subject { controller.send(:search_state) }
 
-    let(:raw_params) { HashWithIndifferentAccess.new a: 1 }
+    let(:raw_params) { ActiveSupport::HashWithIndifferentAccess.new a: 1 }
     let(:params) { ActionController::Parameters.new raw_params }
 
     before do
@@ -17,7 +17,7 @@ RSpec.describe Blacklight::Catalog do
     end
 
     it "creates a path object" do
-      expect(subject).to be_kind_of Blacklight::SearchState
+      expect(subject).to be_a Blacklight::SearchState
       expect(subject.params).to eq raw_params
     end
   end

data/spec/controllers/blacklight/{catalog/component_configuration_spec.rb → configurable_spec.rb}

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

data/spec/controllers/bookmarks_controller_spec.rb

@@ -15,8 +15,8 @@ RSpec.describe BookmarksController do
     it "has a 200 status code when creating a new one" do
       put :update, xhr: true, params: { id: '2007020969', format: :js }
       expect(response).to be_successful
-      expect(response.code).to eq "200"
-      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 1
+      expect(response).to have_http_status :ok
+      expect(response.parsed_body["bookmarks"]["count"]).to eq 1
     end
 
     it "has a 500 status code when create is not success" do
@@ -26,7 +26,7 @@ RSpec.describe BookmarksController do
       allow(@controller).to receive_message_chain(:current_or_guest_user, :bookmarks, :create!).and_raise(ActiveRecord::RecordInvalid)
       allow(@controller).to receive_message_chain(:current_or_guest_user, :errors, :full_messages).and_return([1])
       put :update, xhr: true, params: { id: 'iamabooboo', format: :js }
-      expect(response.code).to eq "500"
+      expect(response).to have_http_status :internal_server_error
     end
   end
 
@@ -44,8 +44,8 @@ RSpec.describe BookmarksController do
       }
 
       expect(response).to be_successful
-      expect(response.code).to eq "200"
-      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 3
+      expect(response).to have_http_status :ok
+      expect(response.parsed_body["bookmarks"]["count"]).to eq 3
     end
   end
 
@@ -58,8 +58,8 @@ RSpec.describe BookmarksController do
     it "has a 200 status code when delete is success" do
       delete :destroy, xhr: true, params: { id: '2007020969', format: :js }
       expect(response).to be_successful
-      expect(response.code).to eq "200"
-      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 0
+      expect(response).to have_http_status :ok
+      expect(response.parsed_body["bookmarks"]["count"]).to eq 0
     end
 
     it "can handle bookmark deletion via :bookmarks param" do
@@ -74,8 +74,8 @@ RSpec.describe BookmarksController do
         format: :js
       }
       expect(response).to be_successful
-      expect(response.code).to eq "200"
-      expect(JSON.parse(response.body)["bookmarks"]["count"]).to eq 0
+      expect(response).to have_http_status :ok
+      expect(response.parsed_body["bookmarks"]["count"]).to eq 0
     end
 
     it "has a 500 status code when delete is not success" do
@@ -85,7 +85,7 @@ RSpec.describe BookmarksController do
 
       delete :destroy, xhr: true, params: { id: 'pleasekillme', format: :js }
 
-      expect(response.code).to eq "500"
+      expect(response).to have_http_status :internal_server_error
     end
   end