blacklight 5.0.0.pre1 → 5.0.0.pre2

data/spec/lib/{blacklight_solr_response_spec.rb → blacklight/solr_response_spec.rb}

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'blacklight'
+require 'spec_helper'
 
 describe Blacklight::SolrResponse do
 
@@ -11,21 +10,21 @@ describe Blacklight::SolrResponse do
   let(:r) { create_response }
 
   it 'should create a valid response' do
-    r.should respond_to(:header)
+    expect(r).to respond_to(:header)
   end
 
   it 'should have accurate pagination numbers' do
-    r.rows.should == 11
-    r.total.should == 26
-    r.start.should == 0
+    expect(r.rows).to eq 11
+    expect(r.total).to eq 26
+    expect(r.start).to eq 0
   end
 
   it 'should create a valid response class' do
-    r.should respond_to(:response)
-    r.docs.size.should == 11
-    r.params[:echoParams].should == 'EXPLICIT'
+    expect(r).to respond_to(:response)
+    expect(r.docs).to have(11).docs
+    expect(r.params[:echoParams]).to eq 'EXPLICIT'
     
-    r.should be_a(Blacklight::SolrResponse::Facets)
+    expect(r).to be_a(Blacklight::SolrResponse::Facets)
   end
 
   it 'should provide facet helpers' do
@@ -45,13 +44,13 @@ describe Blacklight::SolrResponse do
       item.value + ' - ' + item.hits.to_s
     end.join(', ')
 
-    received.should == expected
+    expect(received).to eq expected
 
     r.facets.each do |facet|
-      facet.respond_to?(:name).should == true
+      expect(facet).to respond_to :name
       facet.items.each do |item|
-        item.respond_to?(:value).should == true
-        item.respond_to?(:hits).should == true
+        expect(item).to respond_to :value
+        expect(item).to respond_to :hits
       end
     end
 
@@ -70,12 +69,11 @@ describe Blacklight::SolrResponse do
   end
 
   it "should provide a model name helper" do
-    first_doc_model_name = 'xyz'
+    first_doc_model_name = double(:human => 'xyz')
 
     r.docs.first.stub(:model_name).and_return first_doc_model_name
 
     expect(r.model_name).to eq first_doc_model_name
-
   end
 
   describe "FacetItem" do
@@ -178,6 +176,12 @@ describe Blacklight::SolrResponse do
     r.more_like(double(:id => '79930185')).should have(2).items
   end
 
+  it "should be empty when the response has no results" do
+    r = Blacklight::SolrResponse.new({}, {})
+    r.stub(:total => 0)
+    expect(r).to be_empty
+  end
+
   def mock_query_response
     %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['cat','manu'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2009-03-20T14:42:49.795Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2],'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2]},'facet_dates'=>{}}})
   end

data/spec/lib/{blacklight_user_spec.rb → blacklight/user_spec.rb}

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe "Blacklight::User" do
 
@@ -47,12 +46,12 @@ describe "Blacklight::User" do
   end
 
   it "should know if it doesn't have a search" do
-    subject.has_searches?.should == false
+    expect(subject.has_searches?).to be_false
   end
 
   it "should know if it has a search" do
     subject.searches << Search.new
-    subject.has_searches?.should == true
+    expect(subject.has_searches?).to be_true
   end
 
 end    

data/spec/lib/blacklight_spec.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Blacklight do
   
@@ -7,12 +6,12 @@ describe Blacklight do
     
     it "should find app/controllers/application_controller.rb" do
       result = Blacklight.locate_path 'app', 'controllers', 'application_controller.rb'
-      result.should_not == nil
+      expect(result).not_to be_nil
     end
     
     it "should not find blah.rb" do
       result = Blacklight.locate_path 'blah.rb'
-      result.should == nil
+      expect(result).to be_nil
     end
     
   end
@@ -22,15 +21,15 @@ describe Blacklight do
     let(:blroot) { File.expand_path(File.join(__FILE__, '..', '..', '..' )) }
 
     it 'should return the full path to the BL plugin' do
-      Blacklight.root.should == blroot
+      expect(Blacklight.root).to eq blroot
     end
     
     it 'should return the full path to the model directory' do
-      Blacklight.models_dir.should == blroot + "/app/models"
+      expect(Blacklight.models_dir).to eq blroot + "/app/models"
     end
 
     it 'should return the full path to the controllers directory' do
-      Blacklight.controllers_dir.should == blroot + "/app/controllers"
+      expect(Blacklight.controllers_dir).to eq blroot + "/app/controllers"
     end
 
   end

data/spec/lib/tasks/blacklight_task_spec.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-require "rake"
+require 'spec_helper'
+require 'rake'
 
 describe "blacklight:delete_old_searches" do
 

data/spec/lib/utils_spec.rb

@@ -1,21 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 
 describe 'Blacklight::Utils' do
   describe Blacklight::OpenStructWithHashAccess 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 +22,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
@@ -41,16 +40,16 @@ 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
 
       it "should expose merge" do
-        @h.merge(:a => 'a')[:a].should == 'a'
+        expect(@h.merge(:a => 'a')[:a]).to eq 'a'
       end
 
     end

data/spec/models/bookmark_spec.rb

@@ -10,15 +10,15 @@ describe Bookmark 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).to have(1).error_on(:user_id)
   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 +26,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

@@ -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 include '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 include "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 include '5555555555@txt.att.net'
     end
     it "should not have a subject" do
-      @sms.subject.should == "" unless @sms.subject.nil?
+      expect(@sms.subject).to be_blank
     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 include "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

@@ -24,23 +24,23 @@ describe Search do
       @search.user_id = 1
       @search.save
 
-      @search.saved?.should be_true
+      expect(@search).to be_saved
     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).not_to be_saved
     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

@@ -12,22 +12,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
     
     describe "new" do
       it "should take a Hash as the argument" do
-        lambda { SolrDocument.new(:id => 1) }.should_not raise_error
+        expect { SolrDocument.new(:id => 1) }.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
 end

data/spec/routing/catalog_routing_spec.rb

@@ -4,51 +4,51 @@ 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")
-      { :get => librarian_view_catalog_path('111') }.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")
+      expect(:get => librarian_view_catalog_path('111')).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')
+        expect(:get => catalog_path(SolrDocument.new(:id => 'this+that'))).to 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 => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
       end
     end
   end

data/spec/spec_helper.rb

@@ -6,11 +6,9 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/ and ruby_engine != "jruby"
+if ENV['COVERAGE'] and ruby_engine != "jruby"
   require 'simplecov'
-  require 'simplecov-rcov'
 
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
   SimpleCov.start do
     root File.expand_path(File.dirname(__FILE__) + "../../..")
   end