rspec-solr 1.0.1 → 2.0.0

data/spec/include_in_each_of_first_n_spec.rb

@@ -2,102 +2,99 @@ require 'spec_helper'
 require 'rspec-solr'
 
 describe RSpecSolr do
-  
   # fixtures below
-  
-  context "#include().in_each_of_first(n)" do
-    context "should" do
-      it "passes when all docs in range meet criteria" do
-        @solr_resp.should include("fld" => "val").in_each_of_first(2)
-        @solr_resp.should include("fld" => "val").in_each_of_first(2).documents
-        @solr_resp.should include("fld" => "val").in_each_of_first(2).results
+
+  context '#include().in_each_of_first(n)' do
+    context 'should' do
+      it 'passes when all docs in range meet criteria' do
+        expect(@solr_resp).to include('fld' => 'val').in_each_of_first(2)
+        expect(@solr_resp).to include('fld' => 'val').in_each_of_first(2).documents
+        expect(@solr_resp).to include('fld' => 'val').in_each_of_first(2).results
       end
-      it "passes when all docs in range meet regex criteria" do
-        @solr_resp.should include("fld" => /val/).in_each_of_first(2)
-        @solr_resp.should include("fld" => /al/).in_each_of_first(2)
-        @solr_resp.should include("fld" => /Val/i).in_each_of_first(2)
+      it 'passes when all docs in range meet regex criteria' do
+        expect(@solr_resp).to include('fld' => /val/).in_each_of_first(2)
+        expect(@solr_resp).to include('fld' => /al/).in_each_of_first(2)
+        expect(@solr_resp).to include('fld' => /Val/i).in_each_of_first(2)
       end
       it "fails when doc in range doesn't meet criteria" do
-        lambda {
-          @solr_resp.should include("fld2" => "val2").in_each_of_first(2)
-        }.should fail_matching('expected each of the first 2 documents to include {"fld2"=>"val2"}')
-        lambda {
-          @solr_resp.should include("fld" => "val").in_each_of_first(3)
-        }.should fail_matching('expected each of the first 3 documents to include {"fld"=>"val"}')
+        expect do
+          expect(@solr_resp).to include('fld2' => 'val2').in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected each of the first 2 documents to include {"fld2"=>"val2"}'
+        expect do
+          expect(@solr_resp).to include('fld' => 'val').in_each_of_first(3)
+        end.to raise_error.with_message a_string_including 'expected each of the first 3 documents to include {"fld"=>"val"}'
       end
       it "fails when doc in range doesn't meet regex criteria" do
-        lambda {
-          @solr_resp.should include("fld2" => /l2/).in_each_of_first(2)
-        }.should fail_matching('expected each of the first 2 documents to include {"fld2"=>/l2/}')
-        lambda {
-          @solr_resp.should include("fld" => /al/).in_each_of_first(3)
-        }.should fail_matching('expected each of the first 3 documents to include {"fld"=>/al/}')
+        expect do
+          expect(@solr_resp).to include('fld2' => /l2/).in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected each of the first 2 documents to include {"fld2"=>/l2/}'
+        expect do
+          expect(@solr_resp).to include('fld' => /al/).in_each_of_first(3)
+        end.to raise_error.with_message a_string_including 'expected each of the first 3 documents to include {"fld"=>/al/}'
       end
     end
-    context "should_NOT" do
-      it "fails when all docs in range meet criteria" do
-        lambda {
-          @solr_resp.should_not include("fld" => "val").in_each_of_first(2)
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>"val"}')
-        lambda {
-          @solr_resp.should_not include("fld" => "val").in_each_of_first(2).documents
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>"val"}')
-        lambda {
-          @solr_resp.should_not include("fld" => "val").in_each_of_first(2).results
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>"val"}')
+    context 'should_NOT' do
+      it 'fails when all docs in range meet criteria' do
+        expect do
+          expect(@solr_resp).not_to include('fld' => 'val').in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>"val"}'
+        expect do
+          expect(@solr_resp).not_to include('fld' => 'val').in_each_of_first(2).documents
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>"val"}'
+        expect do
+          expect(@solr_resp).not_to include('fld' => 'val').in_each_of_first(2).results
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>"val"}'
       end
-      it "fails when all docs in range meet regex criteria" do
-        lambda {
-          @solr_resp.should_not include("fld" => /val/).in_each_of_first(2)
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/val/}')
-        lambda {
-          @solr_resp.should_not include("fld" => /al/).in_each_of_first(2)
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/al/}')
-        lambda {
-          @solr_resp.should_not include("fld" => /Val/i).in_each_of_first(2)
-        }.should fail_matching('expected some of the first 2 documents not to include {"fld"=>/Val/i}')
+      it 'fails when all docs in range meet regex criteria' do
+        expect do
+          expect(@solr_resp).not_to include('fld' => /val/).in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>/val/}'
+        expect do
+          expect(@solr_resp).not_to include('fld' => /al/).in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>/al/}'
+        expect do
+          expect(@solr_resp).not_to include('fld' => /Val/i).in_each_of_first(2)
+        end.to raise_error.with_message a_string_including 'expected some of the first 2 documents not to include {"fld"=>/Val/i}'
       end
       it "passes when doc in range doesn't meet criteria" do
-        @solr_resp.should_not include("fld" => "val").in_each_of_first(3)
-        @solr_resp.should_not include("fld2" => "val2").in_each_of_first(2)
+        expect(@solr_resp).not_to include('fld' => 'val').in_each_of_first(3)
+        expect(@solr_resp).not_to include('fld2' => 'val2').in_each_of_first(2)
       end
       it "passes when doc in range doesn't meet regex criteria" do
-        @solr_resp.should_not include("fld2" => /l2/).in_each_of_first(2)
-        @solr_resp.should_not include("fld" => /al/).in_each_of_first(3)
+        expect(@solr_resp).not_to include('fld2' => /l2/).in_each_of_first(2)
+        expect(@solr_resp).not_to include('fld' => /al/).in_each_of_first(3)
       end
     end
-    it "should expect a Hash for the include" do
-      expect {
-        @solr_resp.should include("111").in_each_of_first(1)
-      }.to raise_error(ArgumentError, "in_each_of_first(n) requires a Hash argument to include() method")
-      expect {
-        @solr_resp.should include(["111", "222"]).in_each_of_first(1)
-      }.to raise_error(ArgumentError, "in_each_of_first(n) requires a Hash argument to include() method")
-      expect {
-        @solr_resp.should_not include("111").in_each_of_first(1)
-      }.to raise_error(ArgumentError, "in_each_of_first(n) requires a Hash argument to include() method")
-      expect {
-        @solr_resp.should include("fld" => "val").in_each_of_first(1)
-      }.to_not raise_error(ArgumentError)
-      expect {
-        @solr_resp.should include({"fld" => "val", "fld2" => "val2"}).in_each_of_first(1)
-      }.to_not raise_error(ArgumentError)
+    it 'should expect a Hash for the include' do
+      expect do
+        expect(@solr_resp).to include('111').in_each_of_first(1)
+      end.to raise_error(ArgumentError, 'in_each_of_first(n) requires a Hash argument to include() method')
+      expect do
+        expect(@solr_resp).to include(%w(111 222)).in_each_of_first(1)
+      end.to raise_error(ArgumentError, 'in_each_of_first(n) requires a Hash argument to include() method')
+      expect do
+        expect(@solr_resp).not_to include('111').in_each_of_first(1)
+      end.to raise_error(ArgumentError, 'in_each_of_first(n) requires a Hash argument to include() method')
+      expect do
+        expect(@solr_resp).to include('fld' => 'val').in_each_of_first(1)
+      end.to_not raise_error
+      expect do
+        expect(@solr_resp).to include('fld' => 'val', 'fld2' => 'val2').in_each_of_first(1)
+      end.to_not raise_error
     end
   end
-    
+
   before(:all) do
-    @solr_resp = RSpecSolr::SolrResponseHash.new({ "response" =>
-                    { "numFound" => 5, 
-                      "start" => 0, 
-                      "docs" => 
-                        [ {"id"=>"111", "fld"=>"val", "fld2"=>"val2"}, 
-                          {"id"=>"222", "fld"=>"val"}, 
-                          {"id"=>"333"}, 
-                          {"id"=>"444", "fld"=>["val1", "val2", "val3"]}, 
-                          {"id"=>"555"}
+    @solr_resp = RSpecSolr::SolrResponseHash.new('response' =>
+                    { 'numFound' => 5,
+                      'start' => 0,
+                      'docs' =>
+                        [{ 'id' => '111', 'fld' => 'val', 'fld2' => 'val2' },
+                         { 'id' => '222', 'fld' => 'val' },
+                         { 'id' => '333' },
+                         { 'id' => '444', 'fld' => %w(val1 val2 val3) },
+                         { 'id' => '555' }
                         ]
-                    }
-                  })
+                    })
   end
-  
-end
+end

data/spec/include_in_first_n_spec.rb

@@ -2,232 +2,228 @@ require 'spec_helper'
 require 'rspec-solr'
 
 describe RSpecSolr do
-  
   # fixtures below
-  
-  context "#include().in_first(n)" do
-    context "should include().in_first(n)" do
-      it "passes when include arg is String and doc meets criteria" do
-        @solr_resp_5_docs.should include("222").in_first(3)
-        @solr_resp_5_docs.should include("111").in_first(1)
-        @solr_resp_5_docs.should include("222").in_first(2)
-      end
-      it "fails when include arg is String but doc comes too late" do
-        lambda {
-          @solr_resp_5_docs.should include("222").in_first(1)
-        }.should fail_matching('expected response to include document "222" in first 1')
-      end
-      it "passes when include arg is Hash and doc meets criteria" do
-        @solr_resp_5_docs.should include("fld" => ["val1", "val2", "val3"]).in_first(4)
-      end
-      it "fails when include arg is Hash but doc comes too late" do
-        lambda {
-          @solr_resp_5_docs.should include("fld" => ["val1", "val2", "val3"]).in_first(2)
-        }.should fail_matching('expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 2')
-      end
-      it "passes when include arg is Array and all docs meet criteria" do
-        @solr_resp_5_docs.should include(["111", "222"]).in_first(2)
-        @solr_resp_5_docs.should include(["333", {"fld2"=>"val2"}]).in_first(4)
-      end
-      it "fails when include arg is Array but at least one doc comes too late" do
-        lambda {
-          @solr_resp_5_docs.should include(["111", "444"]).in_first(2)
-        }.should fail_matching('expected response to include documents ["111", "444"] in first 2')
-        lambda {
-          @solr_resp_5_docs.should include(["333", {"fld2"=>"val2"}]).in_first(2)
-        }.should fail_matching('expected response to include documents ["333", {"fld2"=>"val2"}] in first 2')
-      end
-      it "fails when there is no matching result" do
-        lambda {        
-          @solr_resp_5_docs.should include("666").in_first(6)
-        }.should fail_matching('expected response to include document "666" in first 6')
-        lambda {
-          @solr_resp_5_docs.should include("fld"=>"not there").in_first(3)
-        }.should fail_matching('expected response to include document {"fld"=>"not there"} in first 3')
-        lambda {
-          @solr_resp_5_docs.should include("666", "777").in_first(6)
-        }.should fail_matching('expected response to include documents "666" and "777" in first 6')
+
+  context '#include().in_first(n)' do
+    context 'should include().in_first(n)' do
+      it 'passes when include arg is String and doc meets criteria' do
+        expect(@solr_resp_5_docs).to include('222').in_first(3)
+        expect(@solr_resp_5_docs).to include('111').in_first(1)
+        expect(@solr_resp_5_docs).to include('222').in_first(2)
+      end
+      it 'fails when include arg is String but doc comes too late' do
+        expect do
+          expect(@solr_resp_5_docs).to include('222').in_first(1)
+        end.to raise_error.with_message a_string_including 'expected response to include document "222" in first 1'
+      end
+      it 'passes when include arg is Hash and doc meets criteria' do
+        expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).in_first(4)
+      end
+      it 'fails when include arg is Hash but doc comes too late' do
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).in_first(2)
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 2'
+      end
+      it 'passes when include arg is Array and all docs meet criteria' do
+        expect(@solr_resp_5_docs).to include(%w(111 222)).in_first(2)
+        expect(@solr_resp_5_docs).to include(['333', { 'fld2' => 'val2' }]).in_first(4)
+      end
+      it 'fails when include arg is Array but at least one doc comes too late' do
+        expect do
+          expect(@solr_resp_5_docs).to include(%w(111 444)).in_first(2)
+        end.to raise_error.with_message a_string_including 'expected response to include documents ["111", "444"] in first 2'
+        expect do
+          expect(@solr_resp_5_docs).to include(['333', { 'fld2' => 'val2' }]).in_first(2)
+        end.to raise_error.with_message a_string_including 'expected response to include documents ["333", {"fld2"=>"val2"}] in first 2'
+      end
+      it 'fails when there is no matching result' do
+        expect do
+          expect(@solr_resp_5_docs).to include('666').in_first(6)
+        end.to raise_error.with_message a_string_including 'expected response to include document "666" in first 6'
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => 'not there').in_first(3)
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>"not there"} in first 3'
+        expect do
+          expect(@solr_resp_5_docs).to include('666', '777').in_first(6)
+        end.to raise_error.with_message a_string_including 'expected response to include documents "666" and "777" in first 6'
       end
     end # should include().in_first(n)
 
-    context "should_NOT include().in_first(n)" do
-      it "fails when include arg is String and doc meets criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include("222").in_first(2)
-        }.should fail_matching('not to include document "222" in first 2')
-      end
-      it "passes when include arg is String but doc comes too late" do
-        @solr_resp_5_docs.should_not include("222").in_first(1)
-      end
-      it "fails when include arg is Hash and doc meets criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include("fld" => ["val1", "val2", "val3"]).in_first(4)
-        }.should fail_matching('not to include document {"fld"=>["val1", "val2", "val3"]} in first 4')
-      end
-      it "passes when include arg is Hash but doc comes too late" do
-        @solr_resp_5_docs.should_not include("fld" => ["val1", "val2", "val3"]).in_first(2)
-      end
-      it "fails when include arg is Array and all docs meet criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include("111", "222").in_first(2)
-        }.should fail_matching('not to include documents "111" and "222" in first 2')
-        lambda {
-          @solr_resp_5_docs.should_not include(["333", {"fld2"=>"val2"}]).in_first(4)
-        }.should fail_matching('not to include documents ["333", {"fld2"=>"val2"}] in first 4')
-      end
-      it "passes when include arg is Array but at least one doc comes too late" do
-        @solr_resp_5_docs.should_not include(["111", "444"]).in_first(2)
-        @solr_resp_5_docs.should_not include(["333", {"fld2"=>"val2"}]).in_first(2)
-      end
-      it "passes when there is no matching result" do
-        @solr_resp_5_docs.should_not include("666").in_first(6)
-        @solr_resp_5_docs.should_not include("fld"=>"not there").in_first(3)
-        @solr_resp_5_docs.should_not include("666", "777").in_first(6)
-      end      
-    end # should_NOT include().in_first(n)    
+    context 'should_NOT include().in_first(n)' do
+      it 'fails when include arg is String and doc meets criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('222').in_first(2)
+        end.to raise_error.with_message a_string_including 'not to include document "222" in first 2'
+      end
+      it 'passes when include arg is String but doc comes too late' do
+        expect(@solr_resp_5_docs).not_to include('222').in_first(1)
+      end
+      it 'fails when include arg is Hash and doc meets criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).in_first(4)
+        end.to raise_error.with_message a_string_including 'not to include document {"fld"=>["val1", "val2", "val3"]} in first 4'
+      end
+      it 'passes when include arg is Hash but doc comes too late' do
+        expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).in_first(2)
+      end
+      it 'fails when include arg is Array and all docs meet criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('111', '222').in_first(2)
+        end.to raise_error.with_message a_string_including 'not to include documents "111" and "222" in first 2'
+        expect do
+          expect(@solr_resp_5_docs).not_to include(['333', { 'fld2' => 'val2' }]).in_first(4)
+        end.to raise_error.with_message a_string_including 'not to include documents ["333", {"fld2"=>"val2"}] in first 4'
+      end
+      it 'passes when include arg is Array but at least one doc comes too late' do
+        expect(@solr_resp_5_docs).not_to include(%w(111 444)).in_first(2)
+        expect(@solr_resp_5_docs).not_to include(['333', { 'fld2' => 'val2' }]).in_first(2)
+      end
+      it 'passes when there is no matching result' do
+        expect(@solr_resp_5_docs).not_to include('666').in_first(6)
+        expect(@solr_resp_5_docs).not_to include('fld' => 'not there').in_first(3)
+        expect(@solr_resp_5_docs).not_to include('666', '777').in_first(6)
+      end
+    end # should_NOT include().in_first(n)
   end # include().in_first(n)
-  
-  context "#include().in_first (no n set) implies n=1" do
-    context "should #include().in_first" do
-      it "passes when matching document is first" do
-        @solr_resp_5_docs.should include("111").in_first
+
+  context '#include().in_first (no n set) implies n=1' do
+    context 'should #include().in_first' do
+      it 'passes when matching document is first' do
+        expect(@solr_resp_5_docs).to include('111').in_first
       end
-      it "fails when matching document is not first" do
-        lambda {
-          @solr_resp_5_docs.should include("fld"=>["val1", "val2", "val3"]).in_first
-        }.should fail_matching('expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1')
+      it 'fails when matching document is not first' do
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).in_first
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1'
       end
     end
-    context "should_NOT include().in_first" do
-      it "fails when matching document is first" do
-        lambda {
-          @solr_resp_5_docs.should_not include("111").in_first
-        }.should fail_matching('not to include document "111" in first 1')
+    context 'should_NOT include().in_first' do
+      it 'fails when matching document is first' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('111').in_first
+        end.to raise_error.with_message a_string_including 'not to include document "111" in first 1'
       end
-      it "passes when matching document is not first" do
-        @solr_resp_5_docs.should_not include("fld"=>["val1", "val2", "val3"]).in_first
+      it 'passes when matching document is not first' do
+        expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).in_first
       end
     end
   end # include().in_first (no n set)
-  
-  context "#include().in_first(n).allowed_chained.names" do
-    context "should #include().in_first(n).allowed_chained.names" do
-      it "passes when document(s) meet criteria" do
-        @solr_resp_5_docs.should include("222").in_first(2).results
-        @solr_resp_5_docs.should include("222").in_first(2).documents
-        @solr_resp_5_docs.should include("fld2"=>"val2").in_first.document
+
+  context '#include().in_first(n).allowed_chained.names' do
+    context 'should #include().in_first(n).allowed_chained.names' do
+      it 'passes when document(s) meet criteria' do
+        expect(@solr_resp_5_docs).to include('222').in_first(2).results
+        expect(@solr_resp_5_docs).to include('222').in_first(2).documents
+        expect(@solr_resp_5_docs).to include('fld2' => 'val2').in_first.document
       end
       it "fails when document(s) don't meet criteria" do
-        lambda {
-          @solr_resp_5_docs.should include("fld"=>["val1", "val2", "val3"]).in_first.result
-        }.should fail_matching('expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1')
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).in_first.result
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1'
       end
     end
-    context "should_NOT #include().in_first(n).allowed_chained.names" do
-      it "fails when document(s) meet criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include("222").in_first(2).documents
-        }.should fail_matching('not to include document "222" in first 2 ')
-        lambda {
-          @solr_resp_5_docs.should_not include("fld2"=>"val2").in_first.document
-        }.should fail_matching('not to include document {"fld2"=>"val2"} in first 1')
+    context 'should_NOT #include().in_first(n).allowed_chained.names' do
+      it 'fails when document(s) meet criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('222').in_first(2).documents
+        end.to raise_error.with_message a_string_including 'not to include document "222" in first 2 '
+        expect do
+          expect(@solr_resp_5_docs).not_to include('fld2' => 'val2').in_first.document
+        end.to raise_error.with_message a_string_including 'not to include document {"fld2"=>"val2"} in first 1'
       end
       it "passes when document(s) don't meet criteria" do
-        @solr_resp_5_docs.should_not include("fld"=>["val1", "val2", "val3"]).in_first.result
+        expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).in_first.result
       end
     end
-    it "should raise a NoMethodError exception when it gets nonsense after include" do
-      expect {
-        @solr_resp.should include("111").bad_method(2)
-      }.to raise_error(NoMethodError, /bad_method/)
-    end    
+    it 'should raise a NoMethodError exception when it gets nonsense after include' do
+      expect do
+        expect(@solr_resp).to include('111').bad_method(2)
+      end.to raise_error(NoMethodError, /bad_method/)
+    end
   end # include().in_first().allowed_chained.names
-  
-  context "#include().as_first" do
-    context "should include().as_first" do
-      it "passes when the first document meets the criteria" do
-        @solr_resp_5_docs.should include("111").as_first
-        @solr_resp_5_docs.should include("fld"=>"val").as_first
-        @solr_resp_5_docs.should include("fld"=>"val", "fld2"=>"val2").as_first
-      end
-      it "fails when a document meets the criteria but is not the first" do
-        lambda {
-          @solr_resp_5_docs.should include("222").as_first
-        }.should fail_matching('expected response to include document "222" in first 1')
-        lambda {
-          @solr_resp_5_docs.should include("fld" => ["val1", "val2", "val3"]).as_first
-          }.should fail_matching('expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1')
-      end
-      it "fails when there is no matching result" do
-        lambda {
-          @solr_resp_5_docs.should include("96").as_first
-          }.should fail_matching('expected response to include document "96" in first 1')
-      end    
+
+  context '#include().as_first' do
+    context 'should include().as_first' do
+      it 'passes when the first document meets the criteria' do
+        expect(@solr_resp_5_docs).to include('111').as_first
+        expect(@solr_resp_5_docs).to include('fld' => 'val').as_first
+        expect(@solr_resp_5_docs).to include('fld' => 'val', 'fld2' => 'val2').as_first
+      end
+      it 'fails when a document meets the criteria but is not the first' do
+        expect do
+          expect(@solr_resp_5_docs).to include('222').as_first
+        end.to raise_error.with_message a_string_including 'expected response to include document "222" in first 1'
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).as_first
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1'
+      end
+      it 'fails when there is no matching result' do
+        expect do
+          expect(@solr_resp_5_docs).to include('96').as_first
+        end.to raise_error.with_message a_string_including 'expected response to include document "96" in first 1'
+      end
     end
-    context "should_NOT include().as_first" do
-      it "fails when the first document meets the criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include("111").as_first
-        }.should fail_matching('not to include document "111" in first 1')
-        lambda {
-          @solr_resp_5_docs.should_not include("fld"=>"val").as_first
-        }.should fail_matching('not to include document {"fld"=>"val"} in first 1')
-        lambda {
-          @solr_resp_5_docs.should_not include("fld"=>"val", "fld2"=>"val2").as_first
-        }.should fail_matching('not to include document {"fld"=>"val", "fld2"=>"val2"} in first 1')
-      end
-      it "passes when a document meets the criteria but is not the first" do
-        @solr_resp_5_docs.should_not include("222").as_first.document
-        @solr_resp_5_docs.should_not include("fld" => ["val1", "val2", "val3"]).as_first
-      end
-      it "passes when there is no matching result" do
-        @solr_resp_5_docs.should_not include("96").as_first
-      end    
+    context 'should_NOT include().as_first' do
+      it 'fails when the first document meets the criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include('111').as_first
+        end.to raise_error.with_message a_string_including 'not to include document "111" in first 1'
+        expect do
+          expect(@solr_resp_5_docs).not_to include('fld' => 'val').as_first
+        end.to raise_error.with_message a_string_including 'not to include document {"fld"=>"val"} in first 1'
+        expect do
+          expect(@solr_resp_5_docs).not_to include('fld' => 'val', 'fld2' => 'val2').as_first
+        end.to raise_error.with_message a_string_including 'not to include document {"fld"=>"val", "fld2"=>"val2"} in first 1'
+      end
+      it 'passes when a document meets the criteria but is not the first' do
+        expect(@solr_resp_5_docs).not_to include('222').as_first.document
+        expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).as_first
+      end
+      it 'passes when there is no matching result' do
+        expect(@solr_resp_5_docs).not_to include('96').as_first
+      end
     end
   end
-  
-  
-  context "#include().as_first().allowed_chained.names" do
-    context "should #include().as_first(n).allowed_chained.names" do
-      it "passes when document(s) meet criteria" do
-        @solr_resp_5_docs.should include(["111", "222"]).as_first(2).results
-        @solr_resp_5_docs.should include(["111", "222"]).as_first(2).documents
-        @solr_resp_5_docs.should include("fld2"=>"val2").as_first.document
+
+  context '#include().as_first().allowed_chained.names' do
+    context 'should #include().as_first(n).allowed_chained.names' do
+      it 'passes when document(s) meet criteria' do
+        expect(@solr_resp_5_docs).to include(%w(111 222)).as_first(2).results
+        expect(@solr_resp_5_docs).to include(%w(111 222)).as_first(2).documents
+        expect(@solr_resp_5_docs).to include('fld2' => 'val2').as_first.document
       end
       it "fails when document(s) don't meet criteria" do
-        lambda {
-          @solr_resp_5_docs.should include("fld"=>["val1", "val2", "val3"]).as_first.result
-        }.should fail_matching ('expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1')
+        expect do
+          expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 val3)).as_first.result
+        end.to raise_error.with_message a_string_including 'expected response to include document {"fld"=>["val1", "val2", "val3"]} in first 1'
       end
     end
-    context "should_NOT #include().as_first(n).any_chained.names" do
-      it "fails when document(s) meet criteria" do
-        lambda {
-          @solr_resp_5_docs.should_not include(["111", "222"]).as_first(2).documents
-        }.should fail_matching('not to include documents ["111", "222"] in first 2')
-        lambda {
-          @solr_resp_5_docs.should_not include("fld2"=>"val2").as_first.document
-        }.should fail_matching('not to include document {"fld2"=>"val2"} in first 1')
+    context 'should_NOT #include().as_first(n).any_chained.names' do
+      it 'fails when document(s) meet criteria' do
+        expect do
+          expect(@solr_resp_5_docs).not_to include(%w(111 222)).as_first(2).documents
+        end.to raise_error.with_message a_string_including 'not to include documents ["111", "222"] in first 2'
+        expect do
+          expect(@solr_resp_5_docs).not_to include('fld2' => 'val2').as_first.document
+        end.to raise_error.with_message a_string_including 'not to include document {"fld2"=>"val2"} in first 1'
       end
       it "passes when document(s) don't meet criteria" do
-        @solr_resp_5_docs.should_not include("fld"=>["val1", "val2", "val3"]).as_first.result
+        expect(@solr_resp_5_docs).not_to include('fld' => %w(val1 val2 val3)).as_first.result
       end
     end
   end # include().as_first().allowed_chained.names
 
   before(:all) do
-    @solr_resp_5_docs = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 5, 
-                            "start" => 0, 
-                            "docs" => 
-                              [ {"id"=>"111", "fld"=>"val", "fld2"=>"val2"}, 
-                                {"id"=>"222"}, 
-                                {"id"=>"333", "fld"=>"val"}, 
-                                {"id"=>"444", "fld"=>["val1", "val2", "val3"]}, 
-                                {"id"=>"555"}
+    @solr_resp_5_docs = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 5,
+                            'start' => 0,
+                            'docs' =>
+                              [{ 'id' => '111', 'fld' => 'val', 'fld2' => 'val2' },
+                               { 'id' => '222' },
+                               { 'id' => '333', 'fld' => 'val' },
+                               { 'id' => '444', 'fld' => %w(val1 val2 val3) },
+                               { 'id' => '555' }
                               ]
-                          }
-                        })
+                          })
   end
-  
-end
+end