rspec-solr 1.0.1 → 2.0.0

data/lib/rspec-solr/version.rb

@@ -1,3 +1,3 @@
 class RSpecSolr
-  VERSION = "1.0.1"
+  VERSION = '2.0.0'
 end

data/lib/tasks/ci.rake

@@ -1,5 +1,5 @@
-desc "run continuous integration suite (tests, coverage, docs)" 
-task :ci do 
-  Rake::Task["rspec"].invoke
-  Rake::Task["doc"].invoke
+desc 'run continuous integration suite (tests, coverage, docs)'
+task :ci do
+  Rake::Task['rspec'].invoke
+  Rake::Task['doc'].invoke
 end

data/lib/tasks/doc.rake

@@ -3,19 +3,19 @@ require 'yard/rake/yardoc_task'
 
 # Use yard to build docs
 begin
-  project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
+  project_root = File.expand_path(File.dirname(__FILE__) + '/../..')
   doc_dest_dir = File.join(project_root, 'doc')
 
   YARD::Rake::YardocTask.new(:doc) do |yt|
     yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb'))
-    yt.options = ['--output-dir', doc_dest_dir, 
-                  '--readme', 'README.rdoc', 
-                  '--title', 'RSpec-Solr Documentation', 
-                  '--files', 'MATCHERS.rdoc']
+    yt.options = ['--output-dir', doc_dest_dir,
+                  '--readme', 'README.md',
+                  '--title', 'RSpec-Solr Documentation',
+                  '--files', 'MATCHERS.md']
   end
 rescue LoadError
-  desc "Generate YARD Documentation"
+  desc 'Generate YARD Documentation'
   task :doc do
-    abort "Please install the YARD gem to generate rdoc."
+    abort 'Please install the YARD gem to generate rdoc.'
   end
-end  
+end

data/lib/tasks/spec.rake

@@ -1,5 +1,5 @@
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:rspec) do |spec|
-  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  spec.rspec_opts = ['-c', '-f progress', '-r ./spec/spec_helper.rb']
 end

data/rspec-solr.gemspec

@@ -3,33 +3,33 @@
 require File.expand_path('../lib/rspec-solr/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.name          = "rspec-solr"
+  gem.name          = 'rspec-solr'
   gem.version       = RSpecSolr::VERSION
-  gem.authors       = ["Naomi Dushay", "Chris Beer"]
-  gem.email         = ["ndushay@stanford.edu", "cabeer@stanford.edu"]
-  gem.description   = "Provides RSpec custom matchers to be used with Solr response objects."
-  gem.summary       = "RSpec custom matchers for Solr response objects"
-  gem.homepage      = "http://github.com/sul-dlss/rspec-solr"
+  gem.authors       = ['Naomi Dushay', 'Chris Beer']
+  gem.email         = ['ndushay@stanford.edu', 'cabeer@stanford.edu']
+  gem.description   = 'Provides RSpec custom matchers to be used with Solr response objects.'
+  gem.summary       = 'RSpec custom matchers for Solr response objects'
+  gem.homepage      = 'http://github.com/sul-dlss/rspec-solr'
 
-  gem.extra_rdoc_files = ["LICENSE.txt", "README.rdoc", "MATCHERS.rdoc"]
-  gem.files         = `git ls-files`.split($\)
+  gem.extra_rdoc_files = ['LICENSE.txt', 'README.md', 'MATCHERS.md']
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.require_path = ["lib"]
-  
-  gem.add_runtime_dependency "rspec"
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.require_path = ['lib']
+
+  gem.add_runtime_dependency 'rspec', '~> 3.0'
+  gem.add_runtime_dependency 'rspec-collection_matchers'
 
   # Development dependencies
   # Bundler will install these gems too if you've checked out rspec-solr source from git and run 'bundle install'
   # It will not add these as dependencies if you require rspec-solr for other projects
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'rake'
   # docs
-  gem.add_development_dependency "rdoc"
-  gem.add_development_dependency "yard"
+  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'yard'
   # test coverage for this gem
-	gem.add_development_dependency 'simplecov'
-	gem.add_development_dependency 'simplecov-rcov'
-	# continuous integration 
-	gem.add_development_dependency 'travis-lint'
-  
+  gem.add_development_dependency 'simplecov'
+  # continuous integration
+  gem.add_development_dependency 'travis-lint'
+  gem.add_development_dependency 'rubocop'
 end

data/spec/comparing_num_docs_in_2_resp_spec.rb

@@ -2,276 +2,264 @@ require 'spec_helper'
 require 'rspec-solr'
 
 describe RSpecSolr do
-
   # fixtures below
 
-  context "should have_the_same_number_of_results_as()" do
-    it "passes if both results have same total number of documents" do
-      @solr_resp_1_doc.should have_the_same_number_of_results_as(@solr_resp_1_doc)
-      @solr_resp_3_docs.should have_the_same_number_of_results_as(@solr_resp_3_docs)
-      @solr_resp_many_docs.should have_the_same_number_of_results_as(@solr_resp_many_docs2)
+  context 'should have_the_same_number_of_results_as()' do
+    it 'passes if both results have same total number of documents' do
+      expect(@solr_resp_1_doc).to have_the_same_number_of_results_as(@solr_resp_1_doc)
+      expect(@solr_resp_3_docs).to have_the_same_number_of_results_as(@solr_resp_3_docs)
+      expect(@solr_resp_many_docs).to have_the_same_number_of_results_as(@solr_resp_many_docs2)
     end
-    it "passes if neither search matches any documents" do
-      @solr_resp_no_docs.should have_the_same_number_of_results_as(@solr_resp_no_docs)
+    it 'passes if neither search matches any documents' do
+      expect(@solr_resp_no_docs).to have_the_same_number_of_results_as(@solr_resp_no_docs)
     end
-    it "fails if the first response has more total results" do
-      lambda {
-        @solr_resp_not3_docs.should have_the_same_number_of_results_as(@solr_resp_3_docs)
-      }.should fail_matching('expected 8 documents in Solr response {')
+    it 'fails if the first response has more total results' do
+      expect do
+        expect(@solr_resp_not3_docs).to have_the_same_number_of_results_as(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected 8 documents in Solr response {'
     end
-    it "fails if the first response has fewer total results" do
-      lambda {
-        @solr_resp_3_docs.should have_the_same_number_of_results_as(@solr_resp_not3_docs)
-      }.should fail_matching('expected 3 documents in Solr response {')
+    it 'fails if the first response has fewer total results' do
+      expect do
+        expect(@solr_resp_3_docs).to have_the_same_number_of_results_as(@solr_resp_not3_docs)
+      end.to raise_error.with_message a_string_including 'expected 3 documents in Solr response {'
     end
-    it "fails if only one response has results" do
-      lambda {
-        @solr_resp_no_docs.should have_the_same_number_of_results_as(@solr_resp_not3_docs)
-      }.should fail_matching('expected 0 documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should have_the_same_number_of_results_as(@solr_resp_no_docs)
-      }.should fail_matching('expected 3 documents in Solr response {')
+    it 'fails if only one response has results' do
+      expect do
+        expect(@solr_resp_no_docs).to have_the_same_number_of_results_as(@solr_resp_not3_docs)
+      end.to raise_error.with_message a_string_including 'expected 0 documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).to have_the_same_number_of_results_as(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected 3 documents in Solr response {'
     end
   end # should have_the_same_number_of_results_as()
 
-  context "should_NOT have_the_same_number_of_results_as()" do
-    it "fails if both results have same total number of documents" do
-      lambda {
-        @solr_resp_1_doc.should_not have_the_same_number_of_results_as(@solr_resp_1_doc)
-      }.should fail_matching('expected (not 1) documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should_not have_the_same_number_of_results_as(@solr_resp_3_docs)
-      }.should fail_matching('expected (not 3) documents in Solr response {')
-      lambda {
-        @solr_resp_many_docs.should_not have_the_same_number_of_results_as(@solr_resp_many_docs2)
-      }.should fail_matching('expected (not 1019) documents in Solr response {')
+  context 'should_NOT have_the_same_number_of_results_as()' do
+    it 'fails if both results have same total number of documents' do
+      expect do
+        expect(@solr_resp_1_doc).not_to have_the_same_number_of_results_as(@solr_resp_1_doc)
+      end.to raise_error.with_message a_string_including 'expected (not 1) documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).not_to have_the_same_number_of_results_as(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected (not 3) documents in Solr response {'
+      expect do
+        expect(@solr_resp_many_docs).not_to have_the_same_number_of_results_as(@solr_resp_many_docs2)
+      end.to raise_error.with_message a_string_including 'expected (not 1019) documents in Solr response {'
     end
-    it "fails if neither search matches any documents" do
-      lambda {
-        @solr_resp_no_docs.should_not have_the_same_number_of_results_as(@solr_resp_no_docs)
-      }.should fail_matching('expected (not 0) documents in Solr response {')
+    it 'fails if neither search matches any documents' do
+      expect do
+        expect(@solr_resp_no_docs).not_to have_the_same_number_of_results_as(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected (not 0) documents in Solr response {'
     end
-    it "passes if the first response has more total results" do
-      @solr_resp_not3_docs.should_not have_the_same_number_of_results_as(@solr_resp_3_docs)
+    it 'passes if the first response has more total results' do
+      expect(@solr_resp_not3_docs).not_to have_the_same_number_of_results_as(@solr_resp_3_docs)
     end
-    it "passes if the first response has fewer total results" do
-      @solr_resp_3_docs.should_not have_the_same_number_of_results_as(@solr_resp_not3_docs)
+    it 'passes if the first response has fewer total results' do
+      expect(@solr_resp_3_docs).not_to have_the_same_number_of_results_as(@solr_resp_not3_docs)
     end
-    it "passes if only one response has results" do
-      @solr_resp_no_docs.should_not have_the_same_number_of_results_as(@solr_resp_not3_docs)
-      @solr_resp_3_docs.should_not have_the_same_number_of_results_as(@solr_resp_no_docs)
+    it 'passes if only one response has results' do
+      expect(@solr_resp_no_docs).not_to have_the_same_number_of_results_as(@solr_resp_not3_docs)
+      expect(@solr_resp_3_docs).not_to have_the_same_number_of_results_as(@solr_resp_no_docs)
     end
   end # should_NOT have_the_same_number_of_results_as()
 
-
-  context "should have_fewer_results_than()" do
-    it "passes if first response has no results and second doc has results" do
-      @solr_resp_no_docs.should have_fewer_results_than(@solr_resp_1_doc)
-      @solr_resp_no_docs.should have_fewer_results_than(@solr_resp_many_docs)
+  context 'should have_fewer_results_than()' do
+    it 'passes if first response has no results and second doc has results' do
+      expect(@solr_resp_no_docs).to have_fewer_results_than(@solr_resp_1_doc)
+      expect(@solr_resp_no_docs).to have_fewer_results_than(@solr_resp_many_docs)
     end
-    it "passes if first response has a smaller number of total results" do
-      @solr_resp_1_doc.should have_fewer_results_than(@solr_resp_3_docs)
-      @solr_resp_3_docs.should have_fewer_results_than(@solr_resp_not3_docs)
-      @solr_resp_3_docs.should have_fewer_results_than(@solr_resp_many_docs)
+    it 'passes if first response has a smaller number of total results' do
+      expect(@solr_resp_1_doc).to have_fewer_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_3_docs).to have_fewer_results_than(@solr_resp_not3_docs)
+      expect(@solr_resp_3_docs).to have_fewer_results_than(@solr_resp_many_docs)
     end
-    it "fails if responses have same number of total results" do
-      lambda {
-        @solr_resp_3_docs.should have_fewer_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected more than 3 documents in Solr response {')
-      lambda {
-        @solr_resp_many_docs.should have_fewer_results_than(@solr_resp_many_docs2)
-      }.should fail_matching('expected more than 1019 documents in Solr response {')
-      lambda {
-        @solr_resp_no_docs.should have_fewer_results_than(@solr_resp_no_docs)
-      }.should fail_matching('expected more than 0 documents in Solr response {')
+    it 'fails if responses have same number of total results' do
+      expect do
+        expect(@solr_resp_3_docs).to have_fewer_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected more than 3 documents in Solr response {'
+      expect do
+        expect(@solr_resp_many_docs).to have_fewer_results_than(@solr_resp_many_docs2)
+      end.to raise_error.with_message a_string_including 'expected more than 1019 documents in Solr response {'
+      expect do
+        expect(@solr_resp_no_docs).to have_fewer_results_than(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected more than 0 documents in Solr response {'
     end
-    it "fails if first response has more total results" do
-      lambda {
-        @solr_resp_3_docs.should have_fewer_results_than(@solr_resp_1_doc)
-      }.should fail_matching('expected more than 3 documents in Solr response {')
-      lambda {
-        @solr_resp_not3_docs.should have_fewer_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected more than 8 documents in Solr response {')
-      lambda {
-        @solr_resp_not3_docs.should have_fewer_results_than(@solr_resp_no_docs)
-      }.should fail_matching('expected more than 8 documents in Solr response {')
+    it 'fails if first response has more total results' do
+      expect do
+        expect(@solr_resp_3_docs).to have_fewer_results_than(@solr_resp_1_doc)
+      end.to raise_error.with_message a_string_including 'expected more than 3 documents in Solr response {'
+      expect do
+        expect(@solr_resp_not3_docs).to have_fewer_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected more than 8 documents in Solr response {'
+      expect do
+        expect(@solr_resp_not3_docs).to have_fewer_results_than(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected more than 8 documents in Solr response {'
     end
   end # should have_fewer_results_than()
 
-  context "should_NOT have_fewer_results_than()" do
-    it "fails if first response has no results and second doc has results" do
-      lambda {
-        @solr_resp_no_docs.should_not have_fewer_results_than(@solr_resp_1_doc)
-      }.should fail_matching('expected 0 or fewer documents in Solr response {')
-      lambda {
-        @solr_resp_no_docs.should_not have_fewer_results_than(@solr_resp_many_docs)
-      }.should fail_matching('expected 0 or fewer documents in Solr response {')
+  context 'should_NOT have_fewer_results_than()' do
+    it 'fails if first response has no results and second doc has results' do
+      expect do
+        expect(@solr_resp_no_docs).not_to have_fewer_results_than(@solr_resp_1_doc)
+      end.to raise_error.with_message a_string_including 'expected 0 or fewer documents in Solr response {'
+      expect do
+        expect(@solr_resp_no_docs).not_to have_fewer_results_than(@solr_resp_many_docs)
+      end.to raise_error.with_message a_string_including 'expected 0 or fewer documents in Solr response {'
     end
-    it "fails if first response has a smaller number of total results" do
-      lambda {
-        @solr_resp_1_doc.should_not have_fewer_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected 1 or fewer documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should_not have_fewer_results_than(@solr_resp_not3_docs)
-      }.should fail_matching('expected 3 or fewer documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should_not have_fewer_results_than(@solr_resp_many_docs)
-      }.should fail_matching('expected 3 or fewer documents in Solr response {')
+    it 'fails if first response has a smaller number of total results' do
+      expect do
+        expect(@solr_resp_1_doc).not_to have_fewer_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected 1 or fewer documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).not_to have_fewer_results_than(@solr_resp_not3_docs)
+      end.to raise_error.with_message a_string_including 'expected 3 or fewer documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).not_to have_fewer_results_than(@solr_resp_many_docs)
+      end.to raise_error.with_message a_string_including 'expected 3 or fewer documents in Solr response {'
     end
-    it "passes if responses have same number of total results" do
-      @solr_resp_3_docs.should_not have_fewer_results_than(@solr_resp_3_docs)
-      @solr_resp_many_docs.should_not have_fewer_results_than(@solr_resp_many_docs2)
-      @solr_resp_no_docs.should_not have_fewer_results_than(@solr_resp_no_docs)
+    it 'passes if responses have same number of total results' do
+      expect(@solr_resp_3_docs).not_to have_fewer_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_many_docs).not_to have_fewer_results_than(@solr_resp_many_docs2)
+      expect(@solr_resp_no_docs).not_to have_fewer_results_than(@solr_resp_no_docs)
     end
-    it "passes if first response has more total results" do
-      @solr_resp_3_docs.should_not have_fewer_results_than(@solr_resp_1_doc)
-      @solr_resp_not3_docs.should_not have_fewer_results_than(@solr_resp_3_docs)
-      @solr_resp_not3_docs.should_not have_fewer_results_than(@solr_resp_no_docs)
+    it 'passes if first response has more total results' do
+      expect(@solr_resp_3_docs).not_to have_fewer_results_than(@solr_resp_1_doc)
+      expect(@solr_resp_not3_docs).not_to have_fewer_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_not3_docs).not_to have_fewer_results_than(@solr_resp_no_docs)
     end
   end # should_NOT have_fewer_results_than()
 
-  
-  context "should have_more_results_than()" do
-    it "passes if first response has results and second response does not" do
-      @solr_resp_1_doc.should have_more_results_than(@solr_resp_no_docs)
-      @solr_resp_many_docs.should have_more_results_than(@solr_resp_no_docs)
+  context 'should have_more_results_than()' do
+    it 'passes if first response has results and second response does not' do
+      expect(@solr_resp_1_doc).to have_more_results_than(@solr_resp_no_docs)
+      expect(@solr_resp_many_docs).to have_more_results_than(@solr_resp_no_docs)
     end
-    it "passes if first response has a larger number of total results" do
-      @solr_resp_3_docs.should have_more_results_than(@solr_resp_1_doc)
-      @solr_resp_not3_docs.should have_more_results_than(@solr_resp_3_docs)
-      @solr_resp_many_docs.should have_more_results_than(@solr_resp_not3_docs)
+    it 'passes if first response has a larger number of total results' do
+      expect(@solr_resp_3_docs).to have_more_results_than(@solr_resp_1_doc)
+      expect(@solr_resp_not3_docs).to have_more_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_many_docs).to have_more_results_than(@solr_resp_not3_docs)
     end
-    it "fails if responses have same number of total results" do
-      lambda {
-        @solr_resp_3_docs.should have_more_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected fewer than 3 documents in Solr response {')
-      lambda {
-        @solr_resp_many_docs.should have_more_results_than(@solr_resp_many_docs2)
-      }.should fail_matching('expected fewer than 1019 documents in Solr response {')
-      lambda {
-        @solr_resp_no_docs.should have_more_results_than(@solr_resp_no_docs)
-      }.should fail_matching('expected fewer than 0 documents in Solr response {')
+    it 'fails if responses have same number of total results' do
+      expect do
+        expect(@solr_resp_3_docs).to have_more_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected fewer than 3 documents in Solr response {'
+      expect do
+        expect(@solr_resp_many_docs).to have_more_results_than(@solr_resp_many_docs2)
+      end.to raise_error.with_message a_string_including 'expected fewer than 1019 documents in Solr response {'
+      expect do
+        expect(@solr_resp_no_docs).to have_more_results_than(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected fewer than 0 documents in Solr response {'
     end
-    it "fails if first response has fewer total results" do
-      lambda {
-        @solr_resp_1_doc.should have_more_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected fewer than 1 documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should have_more_results_than(@solr_resp_not3_docs)
-      }.should fail_matching('expected fewer than 3 documents in Solr response {')
-      lambda {
-        @solr_resp_3_docs.should have_more_results_than(@solr_resp_many_docs)
-      }.should fail_matching('expected fewer than 3 documents in Solr response {')
+    it 'fails if first response has fewer total results' do
+      expect do
+        expect(@solr_resp_1_doc).to have_more_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected fewer than 1 documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).to have_more_results_than(@solr_resp_not3_docs)
+      end.to raise_error.with_message a_string_including 'expected fewer than 3 documents in Solr response {'
+      expect do
+        expect(@solr_resp_3_docs).to have_more_results_than(@solr_resp_many_docs)
+      end.to raise_error.with_message a_string_including 'expected fewer than 3 documents in Solr response {'
     end
   end # should have_more_results_than()
 
-  context "should_NOT have_more_results_than()" do
-    it "fails if first response has results and second response does not" do
-      lambda {
-        @solr_resp_1_doc.should_not have_more_results_than(@solr_resp_no_docs)
-      }.should fail_matching('expected 1 or more documents in Solr response {')
-      lambda {
-        @solr_resp_many_docs.should_not have_more_results_than(@solr_resp_no_docs)
-      }.should fail_matching('expected 1019 or more documents in Solr response {')
+  context 'should_NOT have_more_results_than()' do
+    it 'fails if first response has results and second response does not' do
+      expect do
+        expect(@solr_resp_1_doc).not_to have_more_results_than(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected 1 or more documents in Solr response {'
+      expect do
+        expect(@solr_resp_many_docs).not_to have_more_results_than(@solr_resp_no_docs)
+      end.to raise_error.with_message a_string_including 'expected 1019 or more documents in Solr response {'
     end
-    it "fails if first response has a larger number of total results" do
-      lambda {
-        @solr_resp_3_docs.should_not have_more_results_than(@solr_resp_1_doc)
-      }.should fail_matching('expected 3 or more documents in Solr response {')
-      lambda {
-        @solr_resp_not3_docs.should_not have_more_results_than(@solr_resp_3_docs)
-      }.should fail_matching('expected 8 or more documents in Solr response {')
-      lambda {
-        @solr_resp_many_docs.should_not have_more_results_than(@solr_resp_not3_docs)
-      }.should fail_matching('expected 1019 or more documents in Solr response {')
+    it 'fails if first response has a larger number of total results' do
+      expect do
+        expect(@solr_resp_3_docs).not_to have_more_results_than(@solr_resp_1_doc)
+      end.to raise_error.with_message a_string_including 'expected 3 or more documents in Solr response {'
+      expect do
+        expect(@solr_resp_not3_docs).not_to have_more_results_than(@solr_resp_3_docs)
+      end.to raise_error.with_message a_string_including 'expected 8 or more documents in Solr response {'
+      expect do
+        expect(@solr_resp_many_docs).not_to have_more_results_than(@solr_resp_not3_docs)
+      end.to raise_error.with_message a_string_including 'expected 1019 or more documents in Solr response {'
     end
-    it "passes if responses have same number of total results" do
-      @solr_resp_3_docs.should_not have_more_results_than(@solr_resp_3_docs)
-      @solr_resp_many_docs.should_not have_more_results_than(@solr_resp_many_docs2)
-      @solr_resp_no_docs.should_not have_more_results_than(@solr_resp_no_docs)
+    it 'passes if responses have same number of total results' do
+      expect(@solr_resp_3_docs).not_to have_more_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_many_docs).not_to have_more_results_than(@solr_resp_many_docs2)
+      expect(@solr_resp_no_docs).not_to have_more_results_than(@solr_resp_no_docs)
     end
-    it "passes if first response has fewer total results" do
-      @solr_resp_1_doc.should_not have_more_results_than(@solr_resp_3_docs)
-      @solr_resp_3_docs.should_not have_more_results_than(@solr_resp_not3_docs)
-      @solr_resp_3_docs.should_not have_more_results_than(@solr_resp_many_docs)
+    it 'passes if first response has fewer total results' do
+      expect(@solr_resp_1_doc).not_to have_more_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_3_docs).not_to have_more_results_than(@solr_resp_not3_docs)
+      expect(@solr_resp_3_docs).not_to have_more_results_than(@solr_resp_many_docs)
     end
   end # should_NOT have_more_results_than()
 
-
-  context "the word documents should be interchangeable with results" do
-    it "have_the_same_number_of_documents_as" do
-      @solr_resp_1_doc.should have_the_same_number_of_documents_as(@solr_resp_1_doc)
-      @solr_resp_not3_docs.should_not have_the_same_number_of_documents_as(@solr_resp_3_docs)
+  context 'the word documents should be interchangeable with results' do
+    it 'have_the_same_number_of_documents_as' do
+      expect(@solr_resp_1_doc).to have_the_same_number_of_documents_as(@solr_resp_1_doc)
+      expect(@solr_resp_not3_docs).not_to have_the_same_number_of_documents_as(@solr_resp_3_docs)
     end
-    it "have_fewer_results_than" do
-      @solr_resp_3_docs.should have_fewer_results_than(@solr_resp_not3_docs)
-      @solr_resp_many_docs.should_not have_fewer_results_than(@solr_resp_many_docs2)
+    it 'have_fewer_results_than' do
+      expect(@solr_resp_3_docs).to have_fewer_results_than(@solr_resp_not3_docs)
+      expect(@solr_resp_many_docs).not_to have_fewer_results_than(@solr_resp_many_docs2)
     end
-    it "have_more_results_than" do
-      @solr_resp_not3_docs.should have_more_results_than(@solr_resp_3_docs)
-      @solr_resp_1_doc.should_not have_more_documents_than(@solr_resp_3_docs)
+    it 'have_more_results_than' do
+      expect(@solr_resp_not3_docs).to have_more_results_than(@solr_resp_3_docs)
+      expect(@solr_resp_1_doc).not_to have_more_documents_than(@solr_resp_3_docs)
     end
   end
 
-
   before(:all) do
-    @solr_resp_1_doc = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 1, 
-                            "start" => 0, 
-                            "docs" => [ {"id"=>"111"} ]
-                          }
-                        })
+    @solr_resp_1_doc = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 1,
+                            'start' => 0,
+                            'docs' => [{ 'id' => '111' }]
+                          })
 
-    @solr_resp_3_docs = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 3, 
-                            "start" => 0, 
-                            "docs" => 
-                              [ {"id"=>"111"}, 
-                                {"id"=>"222"}, 
-                                {"id"=>"333"}, 
+    @solr_resp_3_docs = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 3,
+                            'start' => 0,
+                            'docs' =>
+                              [{ 'id' => '111' },
+                               { 'id' => '222' },
+                               { 'id' => '333' }
                               ]
-                          }
-                        })
+                          })
 
-    @solr_resp_not3_docs = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 8, 
-                            "start" => 0, 
-                            "docs" => 
-                              [ {"id"=>"111"}, 
-                                {"id"=>"222"}, 
-                                {"id"=>"333"}, 
+    @solr_resp_not3_docs = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 8,
+                            'start' => 0,
+                            'docs' =>
+                              [{ 'id' => '111' },
+                               { 'id' => '222' },
+                               { 'id' => '333' }
                               ]
-                          }
-                        })
+                          })
 
-    @solr_resp_many_docs = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 1019, 
-                            "start" => 0, 
-                            "docs" => 
-                              [ {"id"=>"111"}, 
-                                {"id"=>"222"}, 
-                                {"id"=>"333"}, 
+    @solr_resp_many_docs = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 1019,
+                            'start' => 0,
+                            'docs' =>
+                              [{ 'id' => '111' },
+                               { 'id' => '222' },
+                               { 'id' => '333' }
                               ]
-                          }
-                        })
+                          })
 
-    @solr_resp_many_docs2 = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 1019, 
-                            "start" => 10, 
-                            "docs" => 
-                              [ {"id"=>"777"}, 
-                                {"id"=>"888"}, 
-                                {"id"=>"999"}, 
+    @solr_resp_many_docs2 = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 1019,
+                            'start' => 10,
+                            'docs' =>
+                              [{ 'id' => '777' },
+                               { 'id' => '888' },
+                               { 'id' => '999' }
                               ]
-                          }
-                        })
+                          })
 
-    @solr_resp_no_docs = RSpecSolr::SolrResponseHash.new({ "response" =>
-                          { "numFound" => 0, 
-                            "start" => 0, 
-                            "docs" => [] 
-                          }
-                        }) 
+    @solr_resp_no_docs = RSpecSolr::SolrResponseHash.new('response' =>
+                          { 'numFound' => 0,
+                            'start' => 0,
+                            'docs' => []
+                          })
   end
-
-end
+end