blacklight 4.7.0 → 4.8.0

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -15,7 +15,7 @@ describe "blacklight:delete_old_searches" do
   
   it "should call Search.delete_old_searches" do
     days_old = 7
-    Search.should_receive(:delete_old_searches).with(days_old)  
+    expect(Search).to receive(:delete_old_searches).with(days_old)  
     @rake[@task_name].invoke(days_old)
   end
     

data/spec/lib/tasks/solr_marc_task_spec.rb

@@ -32,7 +32,7 @@ describe "solr:marc:*" do
           @rake['solr:marc:index_test_data'].invoke      
         end
         
-        o.should match(Regexp.escape("SolrMarc command that will be run:"))
+        expect(o).to match(Regexp.escape("SolrMarc command that will be run:"))
       end    
     end
     
@@ -48,11 +48,11 @@ describe "solr:marc:*" do
         output =~ /SolrMarc command that will be run:\n\s*\n\s*(.*)\n/
         java_cmd = $1
         
-        java_cmd.should_not be_nil
-        java_cmd.should match "java -Xmx512m"
-        java_cmd.should match /-jar .*\/SolrMarc\.jar/
-        java_cmd.should match "#{Rails.root}/config/SolrMarc/config-test.properties dummy.mrc"
-        java_cmd.should match "-Dsolr.hosturl=http://127.0.0.1:[0-9]{2,5}/solr"
+        expect(java_cmd).not_to be_nil
+        expect(java_cmd).to match "java -Xmx512m"
+        expect(java_cmd).to match /-jar .*\/SolrMarc\.jar/
+        expect(java_cmd).to match "#{Rails.root}/config/SolrMarc/config-test.properties dummy.mrc"
+        expect(java_cmd).to match "-Dsolr.hosturl=http://127.0.0.1:[0-9]{2,5}/solr"
       end
       
     end  

data/spec/lib/utils_spec.rb

@@ -6,16 +6,16 @@ describe 'Blacklight::Utils' do
     it "should provide hash-like accessors for OpenStruct data" do
       a = Blacklight::OpenStructWithHashAccess.new :foo => :bar, :baz => 1
 
-      a[:foo].should == :bar
-      a[:baz].should == 1
-      a[:asdf].should be_nil
+      expect(a[:foo]).to eq(:bar)
+      expect(a[:baz]).to eq(1)
+      expect(a[:asdf]).to be_nil
     end
 
     it "should provide hash-like writers for OpenStruct data" do
       a = Blacklight::OpenStructWithHashAccess.new :foo => :bar, :baz => 1
 
       a[:asdf] = 'qwerty'
-      a.asdf.should == 'qwerty'
+      expect(a.asdf).to eq('qwerty')
 
     end
     
@@ -23,12 +23,12 @@ describe 'Blacklight::Utils' do
       h = Blacklight::OpenStructWithHashAccess.new
       
       h["string"] = "value"
-      h[:string].should == "value"
-      h.string.should == "value"
+      expect(h[:string]).to eq("value")
+      expect(h.string).to eq("value")
       
       h[:symbol] = "value"
-      h["symbol"].should == "value"
-      h.symbol.should == "value"      
+      expect(h["symbol"]).to eq("value")
+      expect(h.symbol).to eq("value")      
     end
 
     describe "internal hash table" do
@@ -39,12 +39,12 @@ describe 'Blacklight::Utils' do
       end
 
       it "should expose the internal hash table" do
-        @h.to_h.should be_a_kind_of(Hash)
-        @h.to_h[:a].should == 1
+        expect(@h.to_h).to be_a_kind_of(Hash)
+        expect(@h.to_h[:a]).to eq(1)
       end
 
       it "should expose keys" do
-        @h.keys.should include(:a, :b)
+        expect(@h.keys).to include(:a, :b)
       end
     end
 

data/spec/models/bookmark_spec.rb

@@ -5,20 +5,21 @@ describe Bookmark do
   before(:each) do
     @bookmark = Bookmark.new
   end
-  
+
   it "should be valid" do
     @bookmark.id = 1
     @bookmark.user_id = 1
     @bookmark.document_id = 'u001'
-    @bookmark.should be_valid
+    expect(@bookmark).to be_valid
   end
-   
+
   it "should require user_id" do
-    @bookmark.should have(1).error_on(:user_id)
+    expect(@bookmark).not_to be_valid
+    expect(@bookmark.errors[:user_id].length).to eq 1
   end
 
   it "should belong to user" do
-    Bookmark.reflect_on_association(:user).should_not be_nil
+    expect(Bookmark.reflect_on_association(:user)).not_to be_nil
   end
 
   it "should be valid after saving" do
@@ -26,6 +27,6 @@ describe Bookmark do
     @bookmark.user_id = 1
     @bookmark.document_id = 'u001'
     @bookmark.save
-    @bookmark.should be_valid
+    expect(@bookmark).to be_valid
   end
 end

data/spec/models/record_mailer_spec.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RecordMailer do
   before(:each) do
-    RecordMailer.stub(:default) { { :from => 'no-reply@projectblacklight.org' } }
+    allow(RecordMailer).to receive(:default) { { :from => 'no-reply@projectblacklight.org' } }
     SolrDocument.use_extension( Blacklight::Solr::Document::Email )
     SolrDocument.use_extension( Blacklight::Solr::Document::Sms )
     document = SolrDocument.new({:id=>"123456", :format=>["book"], :title_display => "The horn", :language_facet => "English", :author_display => "Janetzky, Kurt"})
@@ -16,26 +16,26 @@ describe RecordMailer do
       @email = RecordMailer.email_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'}) 
     end
     it "should receive the TO paramater and send the email to that address" do
-      @email.to.should == ['test@test.com']
+      expect(@email.to).to eq(['test@test.com'])
     end
     it "should start the subject w/ Item Record:" do
-      @email.subject.should =~ /^Item Record:/
+      expect(@email.subject).to match(/^Item Record:/)
     end
     it "should put the title of the item in the subject" do
-      @email.subject.should =~ /The horn/
+      expect(@email.subject).to match(/The horn/)
     end
     it "should have the correct from address (w/o the port number)" do
-      @email.from.should == ["no-reply@projectblacklight.org"]
+      expect(@email.from).to eq(["no-reply@projectblacklight.org"])
     end
     it "should print out the correct body" do
-      @email.body.should =~ /Title: The horn/
-      @email.body.should =~ /Author: Janetzky, Kurt/
-      @email.body.should =~ /projectblacklight.org/
+      expect(@email.body).to match(/Title: The horn/)
+      expect(@email.body).to match(/Author: Janetzky, Kurt/)
+      expect(@email.body).to match(/projectblacklight.org/)
     end
     it "should use https URLs when protocol is set" do
       details = {:to => 'test@test.com', :message => "This is my message"}
       @https_email = RecordMailer.email_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'})
-      @https_email.body.should =~ %r|https://projectblacklight.org/|
+      expect(@https_email.body).to match(%r|https://projectblacklight.org/|)
     end
   end
   
@@ -45,23 +45,23 @@ describe RecordMailer do
       @sms = RecordMailer.sms_record(@documents,details,{:host =>'projectblacklight.org:3000'})
     end
     it "should create the correct TO address for the SMS email" do
-      @sms.to.should == ['5555555555@txt.att.net']
+      expect(@sms.to).to eq(['5555555555@txt.att.net'])
     end
     it "should not have a subject" do
-      @sms.subject.should == "" unless @sms.subject.nil?
+      expect(@sms.subject).to eq("") unless @sms.subject.nil?
     end
     it "should have the correct from address (w/o the port number)" do
-      @sms.from.should == ["no-reply@projectblacklight.org"]
+      expect(@sms.from).to eq(["no-reply@projectblacklight.org"])
     end
     it "should print out the correct body" do
-      @sms.body.should =~ /The horn/
-      @sms.body.should =~ /by Janetzky, Kurt/
-      @sms.body.should =~ /projectblacklight.org:3000/      
+      expect(@sms.body).to match(/The horn/)
+      expect(@sms.body).to match(/by Janetzky, Kurt/)
+      expect(@sms.body).to match(/projectblacklight.org:3000/)      
     end
     it "should use https URL when protocol is set" do
       details = {:to => '5555555555@txt.att.net'}
       @https_sms = RecordMailer.sms_record(@documents,details,{:host =>'projectblacklight.org', :protocol => 'https'})
-      @https_sms.body.should =~ %r|https://projectblacklight.org/|
+      expect(@https_sms.body).to match(%r|https://projectblacklight.org/|)
     end
   end
 

data/spec/models/search_spec.rb

@@ -14,7 +14,7 @@ describe Search do
     it "should return a Hash as the value" do
       @search.query_params = @query_params
       assert @search.save
-      Search.find(@search.id).query_params.should == @query_params
+      expect(Search.find(@search.id).query_params).to eq(@query_params)
     end
   end
   
@@ -24,23 +24,23 @@ describe Search do
       @search.user_id = 1
       @search.save
 
-      @search.saved?.should be_true
+      expect(@search.saved?).to be_truthy
     end
     it "should be false when user_id is NULL or less than 1" do
       @search = Search.create
-      @search.saved?.should_not be_true
+      expect(@search.saved?).not_to be_truthy
     end
   end
   
   describe "delete_old_searches" do
     it "should throw an ArgumentError if days_old is not a number" do
-      lambda { Search.delete_old_searches("blah") }.should raise_error(ArgumentError)
+      expect { Search.delete_old_searches("blah") }.to raise_error(ArgumentError)
     end
     it "should throw an ArgumentError if days_old is equal to 0" do
-      lambda { Search.delete_old_searches(0) }.should raise_error(ArgumentError)
+      expect { Search.delete_old_searches(0) }.to raise_error(ArgumentError)
     end
     it "should throw an ArgumentError if days_old is less than 0" do
-      lambda { Search.delete_old_searches(-1) }.should raise_error(ArgumentError)
+      expect { Search.delete_old_searches(-1) }.to raise_error(ArgumentError)
     end
     it "should destroy searches with no user_id that are older than X days" do
       Search.destroy_all
@@ -65,9 +65,9 @@ describe Search do
       saved_search_past.created_at = Date.today - (days_old + 1).days
       saved_search_past.save
 
-      lambda do
+      expect do
         Search.delete_old_searches(days_old)
-      end.should change(Search, :count).by(-1)
+      end.to change(Search, :count).by(-1)
     end
     
   end

data/spec/models/solr_document_spec.rb

@@ -52,22 +52,22 @@ end
     
     describe "new" do
       it "should take a Hash as the argument" do
-        lambda { SolrDocument.new(@hash_with_marcxml) }.should_not raise_error
+        expect { SolrDocument.new(@hash_with_marcxml) }.not_to raise_error
       end
     end
     
     describe "access methods" do
 
       it "should have the right value for title_display" do
-        @solrdoc[:title_display].should_not be_nil
+        expect(@solrdoc[:title_display]).not_to be_nil
       end
       
       it "should have the right value for format" do
-        @solrdoc[:format][0].should == 'Book'
+        expect(@solrdoc[:format][0]).to eq('Book')
       end
       
       it "should provide the item's solr id" do
-        @solrdoc.id.should == '00282214'
+        expect(@solrdoc.id).to eq('00282214')
       end
     end
     
@@ -76,8 +76,8 @@ end
       it "should have a valid to_marc" do
         @solrdoc = SolrDocument.new(@hash_with_marcxml)
 
-        @solrdoc.should respond_to(:to_marc)
-        @solrdoc.to_marc.should be_kind_of(MARC::Record)        
+        expect(@solrdoc).to respond_to(:to_marc)
+        expect(@solrdoc.to_marc).to be_kind_of(MARC::Record)        
       end
       
       it "should not try to create marc for objects w/out stored marc (marcxml test only at this time)" do
@@ -85,7 +85,7 @@ end
         # sure everything fails gracefully
         @hash_without_marcxml = get_hash_without_marcxml['response']['docs'][0]
         @solrdoc_without_marc = SolrDocument.new(@hash_without_marcxml)
-        @solrdoc_without_marc.should_not respond_to(:to_marc)
+        expect(@solrdoc_without_marc).not_to respond_to(:to_marc)
         # legacy check
       #        @solrdoc_without_marc.should respond_to(:marc)
       #        @solrdoc_without_marc.marc.should == nil

data/spec/requests/alternate_controller_spec.rb

@@ -6,11 +6,11 @@ describe "controllers that are not catalog controller" do
   it "should have the correct search form" do
   	pending
     visit alternate_index_path
-    page.should have_selector("form[action='#{alternate_index_path}']")
+    expect(page).to have_selector("form[action='#{alternate_index_path}']")
     fill_in "q", :with=>"history"
     click_button 'search'
   #  page.should have_link("startOverLink", :href=>alternate_index_path)
-    page.should have_selector("form.per_page[action='#{alternate_index_path}']")
-    page.should have_selector("form.sort[action='#{alternate_index_path}']")
+    expect(page).to have_selector("form.per_page[action='#{alternate_index_path}']")
+    expect(page).to have_selector("form.sort[action='#{alternate_index_path}']")
   end
 end

data/spec/routing/catalog_routing_spec.rb

@@ -4,50 +4,45 @@ describe "Routing" do
   describe "Paths Generated by Custom Routes:" do
     # paths generated by custom routes
     it "should have a path for showing the email form" do
-      { :get => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
+      expect({ :get => "/catalog/email" }).to route_to(:controller => 'catalog', :action => 'email')
     end
     it "should have a path for sending the email" do
-      { :post => "/catalog/email" }.should route_to(:controller => 'catalog', :action => 'email')
+      expect({ :post => "/catalog/email" }).to route_to(:controller => 'catalog', :action => 'email')
     end
     it "should map {:controller => 'catalog', :action => 'sms'} to /catalog/sms" do
-      { :get => "/catalog/sms" }.should route_to(:controller => 'catalog', :action => 'sms')
+      expect({ :get => "/catalog/sms" }).to route_to(:controller => 'catalog', :action => 'sms')
     end
     it "should map { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
-      { :get => "/catalog/666" }.should route_to(:controller => 'catalog', :action => 'show', :id => "666")
+      expect({ :get => "/catalog/666" }).to route_to(:controller => 'catalog', :action => 'show', :id => "666")
     end
     it "should map {:controller => 'catalog', :id => '111', :action => 'librarian_view'} to /catalog/111/librarian_view" do
-      { :get => "/catalog/111/librarian_view" }.should route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
+      expect({ :get => "/catalog/111/librarian_view" }).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
     end
   end
 
 
   describe "catalog_path for SolrDocument", :test => true do
     it "should route correctly" do
-      { :get => catalog_path(SolrDocument.new(:id => 'asdf')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
+      expect({ :get => catalog_path(SolrDocument.new(:id => 'asdf')) }).to route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
     end
 
     context "should escape solr document ids" do
 
       it "should pass-through url-valid ids" do
-        { :get => catalog_path(SolrDocument.new(:id => 'qwerty'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
+        expect({ :get => catalog_path(SolrDocument.new(:id => 'qwerty'))}).to route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
       end
 
       it "should route url-like ids" do
         pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        { :get => catalog_path(SolrDocument.new(:id => 'http://example.com'))}.should route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+        expect({ :get => catalog_path(SolrDocument.new(:id => 'http://example.com'))}).to route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
       end
 
       it "should route ids with whitespace" do
-        { :get => catalog_path(SolrDocument.new(:id => 'mm 123')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
+        expect({ :get => catalog_path(SolrDocument.new(:id => 'mm 123')) }).to route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
       end
 
       it "should route ids with a literal '+'" do
-        { :get => catalog_path(SolrDocument.new(:id => 'this+that')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
-      end
-
-      it "should route ids with a literal '/" do
-        pending "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        { :get => catalog_path(SolrDocument.new(:id => 'and/or')) }.should route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
+        expect({ :get => catalog_path(SolrDocument.new(:id => 'this+that')) }).to route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 # Has been customized by Blacklight to work when application is in one place,
-# and actual spec/ stuff is in another (the blacklight gem checkout).  
+# and actual spec/ stuff is in another (the blacklight gem checkout).
 
 ENV["RAILS_ENV"] ||= 'test'
 
@@ -23,7 +23,7 @@ require 'rspec/rails'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
-
+Capybara.server = :webrick
 Capybara.javascript_driver = :poltergeist
 
 Capybara.register_driver :poltergeist do |app|
@@ -36,8 +36,8 @@ end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-# Blacklight, again, make sure we're looking in the right place for em. 
-# Relative to HERE, NOT to Rails.root, which is off somewhere else. 
+# Blacklight, again, make sure we're looking in the right place for em.
+# Relative to HERE, NOT to Rails.root, which is off somewhere else.
 Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
 
 RSpec.configure do |config|
@@ -57,4 +57,6 @@ RSpec.configure do |config|
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
+
+  config.infer_spec_type_from_file_location!
 end

data/spec/support/assert_difference.rb

@@ -5,13 +5,13 @@ def assert_difference(executable, how_many = 1, &block)
   before = eval(executable)
   yield
   after = eval(executable)
-  after.should == before + how_many
+  expect(after).to eq(before + how_many)
 end
 
 def assert_no_difference(executable, &block)
   before = eval(executable)
   yield
   after = eval(executable)
-  after.should == before
+  expect(after).to eq(before)
 end
 

data/spec/support/features.rb

@@ -4,4 +4,15 @@ require File.expand_path("../features/session_helpers.rb", __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end

data/spec/support/features/session_helpers.rb

@@ -14,9 +14,9 @@ module Features
       email = "#{login}@#{login}.com"
       user = User.create(:email => email, :password => "password", :password_confirmation => "password")
       visit new_user_session_path
-      fill_in("user_email", :with => email) 
-      fill_in("user_password", :with => "password") 
-      click_button("Sign in")
+      fill_in("user_email", :with => email)
+      fill_in("user_password", :with => "password")
+      click_button("Log in")
     end
   end
 end