blacklight 5.0.0.pre1 → 5.0.0.pre2

data/spec/controllers/saved_searches_controller_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe SavedSearchesController do
   include Devise::TestHelpers

data/spec/controllers/search_history_controller_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe SearchHistoryController do
   include Devise::TestHelpers
@@ -15,26 +14,26 @@ describe SearchHistoryController do
       session[:history] = [@one.id, @three.id]
       get :index
       @searches = assigns(:searches)
-      @searches.length.should == 2
-      @searches.should include(@one)
-      @searches.should include(@three)
-      @searches.should_not include(@two)
+      expect(@searches).to have(2).searches
+      expect(@searches).to include(@one)
+      expect(@searches).to include(@three)
+      expect(@searches).to_not include(@two)
     end
     
     it "should tolerate bad ids in session" do
       session[:history] = [@one.id, @three.id, "NOT_IN_DB"]
       get :index
       @searches = assigns(:searches)
-      @searches.length.should == 2
-      @searches.should include(@one)
-      @searches.should include(@three)      
+      expect(@searches).to have(2).searches
+      expect(@searches).to include(@one)
+      expect(@searches).to include(@three)      
     end
     
     it "should not fetch any searches if there is no history" do
       session[:history] = []
       get :index
       @searches = assigns(:searches)
-      @searches.length.should == 0
+      expect(@searches).to be_empty
     end
   end
 

data/spec/features/search_pagination_spec.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'spec_helper'
 
 describe "Search Pagination" do

data/spec/features/search_results_spec.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'spec_helper'
 
 describe "Search Results" do

data/spec/features/search_spec.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require 'spec_helper'
 
 describe "Search Page" do

data/spec/helpers/blacklight_helper_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 require 'spec_helper'
 
 def exportable_record
@@ -94,10 +93,10 @@ describe BlacklightHelper do
     it "should use the Rails application config application_name if available" do
       Rails.application.config.stub(:application_name => 'asdf')
       Rails.application.config.should_receive(:respond_to?).with(:application_name).and_return(true)
-      application_name.should == 'asdf'
+      expect(application_name).to eq 'asdf'
     end
     it "should default to 'Blacklight'" do
-      application_name.should == "Blacklight"
+      expect(application_name).to eq "Blacklight"
     end
   end
 
@@ -108,18 +107,18 @@ describe BlacklightHelper do
     it "should build a link tag to catalog using session[:search] for query params" do
       helper.stub(:current_search_session).and_return double(:query_params => query_params)
       tag = helper.link_back_to_catalog
-      tag.should =~ /q=query/
-      tag.should =~ /f=facets/
-      tag.should =~ /per_page=10/
-      tag.should =~ /page=2/
+      expect(tag).to match /q=query/
+      expect(tag).to match /f=facets/
+      expect(tag).to match /per_page=10/
+      expect(tag).to match /page=2/
     end
 
     it "should build a link tag to bookmarks using session[:search] for query params" do
       helper.stub(:current_search_session).and_return double(:query_params => bookmarks_query_params)
       tag = helper.link_back_to_catalog
-      tag.should =~ /Back to Bookmarks/
-      tag.should =~ /\/bookmarks/
-      tag.should =~ /page=2/
+      expect(tag).to match /Back to Bookmarks/
+      expect(tag).to match /\/bookmarks/
+      expect(tag).to match /page=2/
     end
 
     describe "when an alternate scope is passed in" do
@@ -129,11 +128,11 @@ describe BlacklightHelper do
         helper.stub(:current_search_session).and_return double(:query_params => query_params)
         expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
         tag = helper.link_back_to_catalog(route_set: my_engine)
-        tag.should =~ /Back to Search/
-        tag.should =~ /q=query/
-        tag.should =~ /f=facets/
-        tag.should =~ /per_page=10/
-        tag.should =~ /page=2/
+        expect(tag).to match /Back to Search/
+        expect(tag).to match /q=query/
+        expect(tag).to match /f=facets/
+        expect(tag).to match /per_page=10/
+        expect(tag).to match /page=2/
       end
     end
   end
@@ -143,28 +142,28 @@ describe BlacklightHelper do
       query = "brilliant"
       self.should_receive(:params).and_return({})
       tag = link_to_query(query)
-      tag.should =~ /q=#{query}/
-      tag.should =~ />#{query}<\/a>/
+      expect(tag).to match /q=#{query}/
+      expect(tag).to match />#{query}<\/a>/
     end
     it "should build a link tag to catalog using query string and other existing params" do
       query = "wonderful"
       self.should_receive(:params).and_return({:qt => "title_search", :per_page => "50"})
       tag = link_to_query(query)
-      tag.should =~ /qt=title_search/
-      tag.should =~ /per_page=50/
+      expect(tag).to match /qt=title_search/
+      expect(tag).to match /per_page=50/
     end
     it "should ignore existing :page param" do
       query = "yes"
       self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
       tag = link_to_query(query)
-      tag.should =~ /qt=author_search/
-      tag.should_not =~ /page/
+      expect(tag).to match /qt=author_search/
+      expect(tag).to_not match /page/
     end
     it "should be html_safe" do
       query = "brilliant"
       self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
       tag = link_to_query(query)
-      tag.html_safe?.should == true
+      expect(tag).to be_html_safe
     end
   end
 
@@ -175,46 +174,45 @@ describe BlacklightHelper do
 
     it "should default to using the controller's params" do
       result = params_for_search
-      result.should == params
-      params.object_id.should_not == result.object_id
+      expect(result).to eq params
+      expect(params.object_id).to_not eq result.object_id
     end
 
     it "should let you pass in params to use" do
       source_params = { :q => 'query'}
       result = params_for_search(:params => source_params )
-      source_params.should == result
-      source_params.object_id.should_not == result.object_id
+      expect(source_params).to eq result
+      expect(source_params.object_id).to_not eq result.object_id
     end
 
     it "should not return blacklisted elements" do
       source_params = { :action => 'action', :controller => 'controller', :id => "id", :commit => 'commit'}
       result = params_for_search(:params => source_params )
-      result.keys.should_not include(:action, :controller, :commit, :id)
-
+      expect(result.keys).to_not include(:action, :controller, :commit, :id)
     end
 
     it "should adjust the current page if the per_page changes" do
       source_params = { :per_page => 20, :page => 5}
       result = params_for_search(:params => source_params, :per_page => 100)
-      result[:page].should == 1
+      expect(result[:page]).to eq 1
     end
 
     it "should not adjust the current page if the per_page is the same as it always was" do
       source_params = { :per_page => 20, :page => 5}
       result = params_for_search(:params => source_params, :per_page => 20)
-      result[:page].should == 5
+      expect(result[:page]).to eq 5
     end
 
     it "should adjust the current page if the sort changes" do
       source_params = { :sort => 'field_a', :page => 5}
       result = params_for_search(:params => source_params, :sort => 'field_b')
-      result[:page].should == 1
+      expect(result[:page]).to eq 1
     end
 
     it "should not adjust the current page if the sort is the same as it always was" do
       source_params = { :sort => 'field_a', :page => 5}
       result = params_for_search(:params => source_params, :sort => 'field_a')
-      result[:page].should == 5
+      expect(result[:page]).to eq 5
     end
 
     describe "omit keys parameter" do
@@ -223,21 +221,21 @@ describe BlacklightHelper do
         result = params_for_search(:params => source_params, :omit_keys => [:a, :b] )
 
         result.keys.should_not include(:a, :b)
-        result[:c].should == 3
+        expect(result[:c]).to eq 3
       end
 
       it "should remove keys if a key/value pair was passed and no values are left for that key" do
         source_params = { :f => ['a']}
         result = params_for_search(:params => source_params, :omit_keys => [{:f => 'a' }])
-        result.keys.should_not include(:f)
+        expect(result.keys).to_not include(:f)
       end
 
       it "should only remove keys when a key/value pair is based that are in that pair" do
 
         source_params = { :f => ['a', 'b']}
         result = params_for_search(:params => source_params, :omit_keys => [{:f => 'a' }])
-        result[:f].should_not include('a')
-        result[:f].should include('b')
+        expect(result[:f]).to_not include('a')
+        expect(result[:f]).to include('b')
       end
     end
 
@@ -249,7 +247,7 @@ describe BlacklightHelper do
     end
     describe "for default arguments" do
       it "should default to omitting :page" do
-        search_as_hidden_fields.should_not have_selector("input[name='page']")
+        expect(search_as_hidden_fields).to_not have_selector("input[name='page']")
       end
     end
  end
@@ -261,7 +259,7 @@ describe BlacklightHelper do
         @controller.stub(:controller_name).and_return("123456")
         @controller.stub(:action_name).and_return("abcdef")
 
-	render_body_class.split(' ').should include('blacklight-123456')
+	      expect(render_body_class.split(' ')).to include('blacklight-123456')
       end
 
       it "should include a serialization of the current action name" do
@@ -269,7 +267,7 @@ describe BlacklightHelper do
         @controller.stub(:controller_name).and_return("123456")
         @controller.stub(:action_name).and_return("abcdef")
 
-	render_body_class.split(' ').should include('blacklight-123456-abcdef')
+	      expect(render_body_class.split(' ')).to include('blacklight-123456-abcdef')
       end
    end
 
@@ -278,12 +276,12 @@ describe BlacklightHelper do
      it "should consist of the show heading field when available" do
       @document = SolrDocument.new('title_display' => "A Fake Document")
 
-      document_heading.should == "A Fake Document"
+      expect(document_heading).to eq "A Fake Document"
      end
 
      it "should fallback on the document id if no title is available" do
        @document = SolrDocument.new(:id => '123456')
-       document_heading.should == '123456'
+       expect(document_heading).to eq '123456'
      end
    end
 
@@ -291,36 +289,43 @@ describe BlacklightHelper do
      it "should consist of #document_heading wrapped in a <h1>" do
       @document = SolrDocument.new('title_display' => "A Fake Document")
 
-      render_document_heading.should have_selector("h4", :text => "A Fake Document", :count => 1)
-      render_document_heading.html_safe?.should == true
+      expect(render_document_heading).to have_selector("h4", :text => "A Fake Document", :count => 1)
+      expect(render_document_heading).to be_html_safe
+     end
+
+     it "should have a schema.org itemprop for name" do
+      @document = SolrDocument.new('title_display' => "A Fake Document")
+
+      expect(render_document_heading).to have_selector("h4[@itemprop='name']", :text => "A Fake Document")
      end
+
      it "should join the values if it is an array" do
       @document = SolrDocument.new('title_display' => ["A Fake Document", 'Something Else'])
 
-      render_document_heading.should have_selector("h4", :text => "A Fake Document, Something Else", :count => 1)
-      render_document_heading.html_safe?.should == true
+      expect(render_document_heading).to have_selector("h4", :text => "A Fake Document, Something Else", :count => 1)
+      expect(render_document_heading).to be_html_safe
      end
    end
 
    describe "document_show_html_title" do
      it "should join the values if it is an array" do
       @document = SolrDocument.new('title_display' => ["A Fake Document", 'Something Else'])
-      document_show_html_title.should == "A Fake Document, Something Else"
+      expect(document_show_html_title).to eq "A Fake Document, Something Else"
      end
    end
 
    describe "document_index_view_type" do
      it "should default to 'list'" do
-       document_index_view_type.should == 'list'
+       expect(document_index_view_type).to eq 'list'
      end
 
      it "should pluck values out of params" do
        blacklight_config.stub(:document_index_view_types) { ['list', 'asdf'] }
        params[:view] = 'asdf'
-       document_index_view_type.should == 'asdf'
+       expect(document_index_view_type).to eq 'asdf'
 
        params[:view] = 'not_in_list'
-       document_index_view_type.should == 'list'
+       expect(document_index_view_type).to eq 'list'
      end
    end
 
@@ -342,26 +347,26 @@ describe BlacklightHelper do
 
    describe "document_partial_name" do
      it "should default to 'default' when a format blank" do
-       document_partial_name({}).should == "default"
+       expect(document_partial_name({})).to eq "default"
      end
      it "should handle normal formats correctly" do
-       document_partial_name({"format" => "myformat"}).should == "myformat"
+       expect(document_partial_name({"format" => "myformat"})).to eq "myformat"
      end
      it "should handle spaces correctly" do
-       document_partial_name({"format" => "my format"}).should == "my_format"
+       expect(document_partial_name({"format" => "my format"})).to eq "my_format"
      end
      it "should handle capitalization correctly" do
-       document_partial_name({"format" => "MyFormat"}).should == "myformat"
+       expect(document_partial_name({"format" => "MyFormat"})).to eq "myformat"
      end
      it "should handle puncuation correctly" do
-       document_partial_name({"format" => "My.Format"}).should == "my_format"
+       expect(document_partial_name({"format" => "My.Format"})).to eq "my_format"
      end
      it "should handle multi-valued fields correctly" do
-       document_partial_name({"format" => ["My Format", "My OtherFormat"]}).should == "my_format_my_otherformat"
+       expect(document_partial_name({"format" => ["My Format", "My OtherFormat"]})).to eq "my_format_my_otherformat"
      end
      it "should remove - characters because they will throw errors" do
-       document_partial_name({"format" => "My-Format"}).should == "my_format"
-       document_partial_name({"format" => ["My-Format",["My Other-Format"]]}).should == "my_format_my_other_format"
+       expect(document_partial_name({"format" => "My-Format"})).to eq "my_format"
+       expect(document_partial_name({"format" => ["My-Format",["My Other-Format"]]})).to eq "my_format_my_other_format"
      end
    end
 
@@ -369,45 +374,46 @@ describe BlacklightHelper do
      it "should consist of the document title wrapped in a <a>" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display }).should have_selector("a", :text => '654321', :count => 1)
+      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '654321', :count => 1)
      end
+
      it "should accept and return a string label" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => "title_display" }).should have_selector("a", :text => 'title_display', :count => 1)
+      expect(link_to_document(@document, { :label => "title_display" })).to have_selector("a", :text => 'title_display', :count => 1)
      end
 
      it "should accept and return a Proc" do
       data = {'id'=>'123456','title_display'=>['654321'] }
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } }).should have_selector("a", :text => '123456: 654321', :count => 1)
+      expect(link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } })).to have_selector("a", :text => '123456: 654321', :count => 1)
      end
      it "should return id when label is missing" do
       data = {'id'=>'123456'}
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display }).should have_selector("a", :text => '123456', :count => 1)
+      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '123456', :count => 1)
      end
 
      it "should be html safe" do
       data = {'id'=>'123456'}
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display }).html_safe?.should == true
+      expect(link_to_document(@document, { :label => :title_display })).to be_html_safe
      end
 
      it "should convert the counter parameter into a data- attribute" do
       data = {'id'=>'123456','title_display'=>['654321']}
       @document = SolrDocument.new(data)
-      link_to_document(@document, { :label => :title_display, :counter => 5  }).should =~ /data-counter="5"/
+      expect(link_to_document(@document, { :label => :title_display, :counter => 5  })).to match /data-counter="5"/
      end
 
      it "passes on the title attribute to the link_to_with_data method" do
        @document = SolrDocument.new('id'=>'123456')
-       link_to_document(@document,:label=>"Some crazy long label...",:title=>"Some crazy longer label").should match(/title=\"Some crazy longer label\"/)
+       expect(link_to_document(@document,:label=>"Some crazy long label...",:title=>"Some crazy longer label")).to match(/title=\"Some crazy longer label\"/)
      end
 
      it "doesn't add an erroneous title attribute if one isn't provided" do
        @document = SolrDocument.new('id'=>'123456')
-       link_to_document(@document,:label=>"Some crazy long label...").should_not match(/title=/)
+       expect(link_to_document(@document,:label=>"Some crazy long label...")).to_not match(/title=/)
      end
    end
 
@@ -444,11 +450,11 @@ describe BlacklightHelper do
       Capybara.ignore_hidden_elements = false
       @document.export_formats.each_pair do |format, spec|
         response.should have_selector("link[href$='.#{ format  }']") do |matches|
-          matches.length.should == 1
+          expect(matches).to have(1).match
           tag = matches[0]
-          tag.attributes["rel"].value.should == "alternate"
-          tag.attributes["title"].value.should == format.to_s
-          tag.attributes["href"].value.should === mock_document_app_helper_url(@document, :format =>format)
+          expect(tag.attributes["rel"].value).to eq "alternate"
+          expect(tag.attributes["title"].value).to eq format.to_s
+          expect(tag.attributes["href"].value).to eq mock_document_app_helper_url(@document, :format =>format)
         end
       end
       Capybara.ignore_hidden_elements = tmp_value
@@ -457,7 +463,7 @@ describe BlacklightHelper do
       response = render_link_rel_alternates(@document, :unique => true)
       tmp_value = Capybara.ignore_hidden_elements
       Capybara.ignore_hidden_elements = false
-      response.should have_selector("link[type='application/weird']", :count => 1)
+      expect(response).to have_selector("link[type='application/weird']", :count => 1)
       Capybara.ignore_hidden_elements = tmp_value
     end
     it "excludes formats from :exclude" do
@@ -465,13 +471,13 @@ describe BlacklightHelper do
 
       tmp_value = Capybara.ignore_hidden_elements
       Capybara.ignore_hidden_elements = false
-      response.should_not have_selector("link[href$='.weird_dup']")
+      expect(response).to_not have_selector("link[href$='.weird_dup']")
       Capybara.ignore_hidden_elements = tmp_value
     end
 
     it "should be html safe" do
       response = render_link_rel_alternates(@document)
-      response.html_safe?.should == true
+      expect(response).to be_html_safe
     end
   end
 
@@ -494,13 +500,13 @@ describe BlacklightHelper do
     describe "render_index_doc_actions" do
       it "should render partials" do
         response = helper.render_index_doc_actions(@document)
-        response.should have_selector(".bookmark_toggle")
+        expect(response).to have_selector(".bookmark_toggle")
       end
     end
     describe "render_show_doc_actions" do
       it "should render partials" do
         response = helper.render_show_doc_actions(@document)
-        response.should have_selector(".bookmark_toggle")
+        expect(response).to have_selector(".bookmark_toggle")
       end
     end
   end
@@ -521,7 +527,7 @@ describe BlacklightHelper do
       doc = double()
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       value = helper.render_index_field_value :value => 'asdf', :document => doc, :field => 'asdf'
-      value.should == 'asdf'
+      expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
@@ -529,21 +535,21 @@ describe BlacklightHelper do
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_index_field).and_return('custom asdf value')
       value = helper.render_index_field_value :document => doc, :field => 'asdf'
-      value.should == 'custom asdf value'
+      expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
       doc = double()
       doc.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       value = helper.render_index_field_value :document => doc, :field => 'link_to_search_true'
-      value.should == helper.link_to("x", helper.search_action_url(:f => { :link_to_search_true => ['x'] }))
+      expect(value).to eq helper.link_to("x", helper.search_action_url(:f => { :link_to_search_true => ['x'] }))
     end
 
     it "should check for a link_to_search with a field name" do
       doc = double()
       doc.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       value = helper.render_index_field_value :document => doc, :field => 'link_to_search_named'
-      value.should == helper.link_to("x", helper.search_action_url(:f => { :some_field => ['x'] }))
+      expect(value).to eq helper.link_to("x", helper.search_action_url(:f => { :some_field => ['x'] }))
     end
 
     it "should gracefully handle when no highlight field is available" do
@@ -551,7 +557,7 @@ describe BlacklightHelper do
       doc.should_not_receive(:get)
       doc.should_receive(:has_highlight_field?).and_return(false)
       value = helper.render_index_field_value :document => doc, :field => 'highlight'
-      value.should be_blank
+      expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
@@ -560,21 +566,21 @@ describe BlacklightHelper do
       doc.should_receive(:has_highlight_field?).and_return(true)
       doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_index_field_value :document => doc, :field => 'highlight'
-      value.should == '<em>highlight</em>'
+      expect(value).to eq '<em>highlight</em>'
     end
 
     it "should check the document field value" do
       doc = double()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_index_field_value :document => doc, :field => 'qwer'
-      value.should == 'document qwer value'
+      expect(value).to eq 'document qwer value'
     end
 
     it "should work with index fields that aren't explicitly defined" do
       doc = double()
       doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_index_field_value :document => doc, :field => 'mnbv'
-      value.should == 'document mnbv value'
+      expect(value).to eq 'document mnbv value'
     end
   end
 
@@ -596,7 +602,7 @@ describe BlacklightHelper do
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.should_not_receive(:render_asdf_document_show_field)
       value = helper.render_document_show_field_value :value => 'asdf', :document => doc, :field => 'asdf'
-      value.should == 'asdf'
+      expect(value).to eq 'asdf'
     end
 
     it "should check for a helper method to call" do
@@ -604,21 +610,21 @@ describe BlacklightHelper do
       doc.should_not_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_document_show_field).and_return('custom asdf value')
       value = helper.render_document_show_field_value :document => doc, :field => 'asdf'
-      value.should == 'custom asdf value'
+      expect(value).to eq 'custom asdf value'
     end
 
     it "should check for a link_to_search" do
       doc = double()
       doc.should_receive(:get).with('link_to_search_true', :sep => nil).and_return('x')
       value = helper.render_document_show_field_value :document => doc, :field => 'link_to_search_true'
-      value.should == helper.link_to("x", helper.search_action_url(:f => { :link_to_search_true => ['x'] }))
+      expect(value).to eq helper.link_to("x", helper.search_action_url(:f => { :link_to_search_true => ['x'] }))
     end
 
     it "should check for a link_to_search with a field name" do
       doc = double()
       doc.should_receive(:get).with('link_to_search_named', :sep => nil).and_return('x')
       value = helper.render_document_show_field_value :document => doc, :field => 'link_to_search_named'
-      value.should == helper.link_to("x", helper.search_action_url(:f => { :some_field => ['x'] }))
+      expect(value).to eq helper.link_to("x", helper.search_action_url(:f => { :some_field => ['x'] }))
     end
 
     it "should gracefully handle when no highlight field is available" do
@@ -626,7 +632,7 @@ describe BlacklightHelper do
       doc.should_not_receive(:get)
       doc.should_receive(:has_highlight_field?).and_return(false)
       value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
-      value.should be_blank
+      expect(value).to be_blank
     end
 
     it "should check for a highlighted field" do
@@ -635,7 +641,7 @@ describe BlacklightHelper do
       doc.should_receive(:has_highlight_field?).and_return(true)
       doc.should_receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
       value = helper.render_document_show_field_value :document => doc, :field => 'highlight'
-      value.should == '<em>highlight</em>'
+      expect(value).to eq '<em>highlight</em>'
     end
 
 
@@ -643,14 +649,14 @@ describe BlacklightHelper do
       doc = double()
       doc.should_receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
       value = helper.render_document_show_field_value :document => doc, :field => 'qwer'
-      value.should == 'document qwer value'
+      expect(value).to eq 'document qwer value'
     end
 
     it "should work with show fields that aren't explicitly defined" do
       doc = double()
       doc.should_receive(:get).with('mnbv', :sep => nil).and_return('document mnbv value')
       value = helper.render_document_show_field_value :document => doc, :field => 'mnbv'
-      value.should == 'document mnbv value'
+      expect(value).to eq 'document mnbv value'
     end
   end
 
@@ -677,7 +683,7 @@ describe BlacklightHelper do
       doc = double()
       doc.stub(:has?).with('asdf').and_return(true)
       field_config = double(:field => 'asdf')
-      helper.should_render_show_field?(doc, field_config).should == true
+      expect(helper.should_render_show_field?(doc, field_config)).to be_true
     end
 
     it "should if the document has a highlight field value" do
@@ -685,7 +691,7 @@ describe BlacklightHelper do
       doc.stub(:has?).with('asdf').and_return(false)
       doc.stub(:has_highlight_field?).with('asdf').and_return(true)
       field_config = double(:field => 'asdf', :highlight => true)
-      helper.should_render_show_field?(doc, field_config).should == true
+      expect(helper.should_render_show_field?(doc, field_config)).to be_true
     end
   end
 
@@ -718,7 +724,11 @@ describe BlacklightHelper do
     end
 
     it "should use the separator from the Blacklight field configuration by default" do
-      expect(helper.render_field_value(['c', 'd'], double(:separator => '; '))).to eq "c; d"
+      expect(helper.render_field_value(['c', 'd'], double(:separator => '; ', :itemprop => nil))).to eq "c; d"
+    end
+
+    it "should include schema.org itemprop attributes" do
+      expect(helper.render_field_value('a', double(:separator => nil, :itemprop => 'some-prop'))).to have_selector("span[@itemprop='some-prop']", :text => "a") 
     end
   end
 end