rspec-solr 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614534dc732f46bfc1fe137e447bec23eb04e480
-  data.tar.gz: 69fed90ebd9a576ebc14e52493a90e8d5c8ea8d2
+  metadata.gz: 159dddc6ad7d9c526ed35cd8f9dc3d866c9f31d4
+  data.tar.gz: ffe5545829ef3e64004c8508de010feaae498bdc
 SHA512:
-  metadata.gz: b75ea440dcd94fdc5ff553af14dec0e56373a141aeb806abd9dec92d76655590f67bf744577e897471d50126bcb372ba07915a8985700d60552a49d66de882a4
-  data.tar.gz: 827e79d09922c16d08518a46c50d5dcf087be3d8826379187a89c6d40190c3db202f963774b52631ded7e4b9753ff617b3817e808593c7003ae67b1e462ec12a
+  metadata.gz: 6e98609baedef42070de878eb3e3561db547b6ada91c6302be82c7702da742aeec88fe64e7fb673cb8e23785de72eb16f4410ed6a0d82fe977a9efaaad325d59
+  data.tar.gz: 7589db2b999847a7c888516b47da960e0c8433abf0ee63b8d52d4b7b2b51f7cf5344150b6a4709307bc8ec193022eef43fad575f05079563d78f5f3265bb36f1

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 1.9.3
-  - jruby-19mode
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - jruby-9.2.0.0
 notifications:
   email:
     - ndushay@stanford.edu

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # See rspec-solr.gemspec for this gem's dependencies
 gemspec
 
-gem 'rspec', '~> 3.3'
+gem 'rspec', '~> 3.5'

data/README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://travis-ci.org/sul-dlss/rspec-solr.svg?branch=master)](https://travis-ci.org/sul-dlss/rspec-solr)
 [![Coverage Status](https://coveralls.io/repos/sul-dlss/rspec-solr/badge.svg)](https://coveralls.io/r/sul-dlss/rspec-solr)
-[![Dependency Status](https://gemnasium.com/sul-dlss/rspec-solr.svg)](https://gemnasium.com/sul-dlss/rspec-solr)
 
 # RSpec Solr
 
@@ -154,6 +153,8 @@ Please share yours!
 5. Create new Pull Request
 
 ## Releases
+- <b>3.0.0</b> Add compatibility with rspec ~> 3.5
+- <b>2.0.0</b> No release notes
 - <b>1.0.1</b> fix spec failing in travis due to diff error message in later rspec version
 - <b>1.0.0</b> declare victory and make 0.2.0 into 1.0.0
 - <b>0.2.0</b> add facet support  have_facet_field(fld_name).with_value(fld_value)

data/lib/rspec-solr/include_documents_matcher.rb

@@ -33,15 +33,15 @@ module RSpec
 
         # override failure message for improved readability
         def failure_message
-          assert_ivars :@actual, :@expected
+          assert_ivars :@actual, :@expecteds
           name_to_sentence = 'include'
           # FIXME: DRY up these messages across cases and across should and should_not
           if @before_expected
-            "expected response to #{name_to_sentence} #{doc_label_str(@expected)}#{to_sentence(@expected)} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}: #{@actual.inspect} "
+            "expected response to #{name_to_sentence} #{doc_label_str(@expecteds)}#{to_sentence(@expecteds)} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}: #{@actual.inspect} "
           elsif @min_for_last_matching_doc_pos
-            "expected each of the first #{@min_for_last_matching_doc_pos} documents to #{name_to_sentence}#{to_sentence(@expected)} in response: #{@actual.inspect}"
+            "expected each of the first #{@min_for_last_matching_doc_pos} documents to #{name_to_sentence}#{to_sentence(@expecteds)} in response: #{@actual.inspect}"
           elsif @max_doc_position
-            "expected response to #{name_to_sentence} #{doc_label_str(@expected)}#{to_sentence(@expected)} in first #{@max_doc_position} results: #{@actual.inspect}"
+            "expected response to #{name_to_sentence} #{doc_label_str(@expecteds)}#{to_sentence(@expecteds)} in first #{@max_doc_position} results: #{@actual.inspect}"
           else
             super
           end
@@ -49,14 +49,14 @@ module RSpec
 
         # override failure message for improved readability
         def failure_message_when_negated
-          assert_ivars :@actual, :@expected
+          assert_ivars :@actual, :@expecteds
           name_to_sentence = 'include'
           if @before_expected
-            "expected response not to #{name_to_sentence} #{doc_label_str(@expected)}#{to_sentence(@expected)} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}: #{@actual.inspect} "
+            "expected response not to #{name_to_sentence} #{doc_label_str(@expecteds)}#{to_sentence(@expecteds)} before #{doc_label_str(@before_expected)} matching #{@before_expected.inspect}: #{@actual.inspect} "
           elsif @min_for_last_matching_doc_pos
-            "expected some of the first #{@min_for_last_matching_doc_pos} documents not to #{name_to_sentence}#{to_sentence(@expected)} in response: #{@actual.inspect}"
+            "expected some of the first #{@min_for_last_matching_doc_pos} documents not to #{name_to_sentence}#{to_sentence(@expecteds)} in response: #{@actual.inspect}"
           elsif @max_doc_position
-            "expected response not to #{name_to_sentence} #{doc_label_str(@expected)}#{to_sentence(@expected)} in first #{@max_doc_position} results: #{@actual.inspect}"
+            "expected response not to #{name_to_sentence} #{doc_label_str(@expecteds)}#{to_sentence(@expecteds)} in first #{@max_doc_position} results: #{@actual.inspect}"
           else
             super
           end
@@ -70,7 +70,7 @@ module RSpec
         def excluded_from_actual
           return [] unless @actual.respond_to?(:include?)
 
-          expected.each_with_object([]) do |expected_item, memo|
+          expecteds.each_with_object([]) do |expected_item, memo|
             if comparing_doc_to_solr_resp_hash?(expected_item)
               if @before_expected
                 before_ix = actual.get_first_doc_index(@before_expected)

data/lib/rspec-solr/version.rb

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

data/rspec-solr.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   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', '~> 3.5'
   gem.add_runtime_dependency 'rspec-collection_matchers'
 
   # Development dependencies

data/spec/include_document_spec.rb

@@ -16,12 +16,12 @@ describe RSpecSolr do
       it "fails if no Solr document in response has 'fldval' for the named field" do
         expect do
           expect(@solr_resp_5_docs).to include('id' => 'not_there')
-        end.to raise_error.with_message a_string_including '} to include {"id" => "not_there"}'
+        end.to raise_error.with_message a_string_including '> to include {"id" => "not_there"}'
       end
       it 'fails if no Solr document in response has the named field' do
         expect do
           expect(@solr_resp_5_docs).to include('not_there' => 'anything')
-        end.to raise_error.with_message a_string_including '} to include {"not_there" => "anything"}'
+        end.to raise_error.with_message a_string_including '> to include {"not_there" => "anything"}'
       end
     end # "should include('fldname'=>'fldval')"
 
@@ -53,18 +53,18 @@ describe RSpecSolr do
       it 'fails if only part of expectation is met' do
         expect do
           expect(@solr_resp_5_docs).to include('id' => '111', 'fld' => 'not_there')
-        end.to raise_error.with_message a_string_including '} to include {"id" => "111", "fld" => "not_there"}'
+        end.to raise_error.with_message a_string_including '> to include {"id" => "111", "fld" => "not_there"}'
         expect do
           expect(@solr_resp_5_docs).to include('id' => '111', 'not_there' => 'whatever')
-        end.to raise_error.with_message a_string_including '} to include {"id" => "111", "not_there" => "whatever"}'
+        end.to raise_error.with_message a_string_including '> to include {"id" => "111", "not_there" => "whatever"}'
         expect do
           expect(@solr_resp_5_docs).to include('id' => '222', 'fld' => 'val')
-        end.to raise_error.with_message a_string_including '} to include {"id" => "222", "fld" => "val"}'
+        end.to raise_error.with_message a_string_including '> to include {"id" => "222", "fld" => "val"}'
       end
       it 'fails if no part of expectation is met' do
         expect do
           expect(@solr_resp_5_docs).to include('id' => 'not_there', 'not_there' => 'anything')
-        end.to raise_error.with_message a_string_including '} to include {"id" => "not_there", "not_there" => "anything"}'
+        end.to raise_error.with_message a_string_including '> to include {"id" => "not_there", "not_there" => "anything"}'
       end
     end # should include('fld1'=>'val1', 'fld2'=>'val2')
 
@@ -103,12 +103,12 @@ describe RSpecSolr do
         it 'fails if none of the expected values match the values in a Solr document in the response' do
           expect do
             expect(@solr_resp_5_docs).to include('fld' => %w(not_there also_not_there))
-          end.to raise_error.with_message a_string_including '} to include {"fld" => ["not_there", "also_not_there"]}'
+          end.to raise_error.with_message a_string_including '> to include {"fld" => ["not_there", "also_not_there"]}'
         end
         it 'fails if only some of the expected values match the values in a Solr document in the response' do
           expect do
             expect(@solr_resp_5_docs).to include('fld' => %w(val1 val2 not_there))
-          end.to raise_error.with_message a_string_including '} to include {"fld" => ["val1", "val2", "not_there"]}'
+          end.to raise_error.with_message a_string_including '> to include {"fld" => ["val1", "val2", "not_there"]}'
         end
       end # should
 
@@ -156,14 +156,14 @@ describe RSpecSolr do
         it 'fails if string does not match default id_field of Solr document in the response' do
           expect do
             expect(@solr_resp_5_docs).to include('666')
-          end.to raise_error.with_message a_string_including '} to include "666"'
+          end.to raise_error.with_message a_string_including '> to include "666"'
         end
         it "fails if string doesn't match non-default id_field in the SolrResponseHash object" do
           my_srh = @solr_resp_5_docs.clone
           my_srh.id_field = 'fld2'
           expect do
             expect(my_srh).to include('val')
-          end.to raise_error.with_message a_string_including '} to include "val"'
+          end.to raise_error.with_message a_string_including '> to include "val"'
         end
       end # should
 
@@ -209,25 +209,25 @@ describe RSpecSolr do
         it "fails if no Strings in Array match Solr documents' id_field in the response" do
           expect do
             expect(@solr_resp_5_docs).to include(%w(888 899))
-          end.to raise_error.with_message a_string_including '} to include ["888", "899"]'
+          end.to raise_error.with_message a_string_including '> to include ["888", "899"]'
           my_srh = @solr_resp_5_docs.clone
           my_srh.id_field = 'fld2'
           expect do
             expect(my_srh).to include(%w(val8 val9))
-          end.to raise_error.with_message a_string_including '} to include ["val8", "val9"]'
+          end.to raise_error.with_message a_string_including '> to include ["val8", "val9"]'
         end
         it "fails if only some Strings in Array match Solr documents' id_field in the response" do
           expect do
             expect(@solr_resp_5_docs).to include(%w(111 222 999))
-          end.to raise_error.with_message a_string_including '} to include ["111", "222", "999"]'
+          end.to raise_error.with_message a_string_including '> to include ["111", "222", "999"]'
           expect do
             expect(@solr_resp_5_docs).to include(%w(666 555))
-          end.to raise_error.with_message a_string_including '} to include ["666", "555"]'
+          end.to raise_error.with_message a_string_including '> to include ["666", "555"]'
           my_srh = @solr_resp_5_docs.clone
           my_srh.id_field = 'fld2'
           expect do
             expect(my_srh).to include(%w(val2 val9))
-          end.to raise_error.with_message a_string_including '} to include ["val2", "val9"]'
+          end.to raise_error.with_message a_string_including '> to include ["val2", "val9"]'
         end
       end # should include(Array_of_Strings)
 
@@ -286,12 +286,12 @@ describe RSpecSolr do
         it 'fails if no Hashes in Array match Solr documents in the response' do
           expect do
             expect(@solr_resp_5_docs).to include([{ 'foo' => 'bar' }, { 'bar' => 'food', 'mmm' => 'food' }])
-          end.to raise_error.with_message a_string_including '} to include [{"foo" => "bar"}, {"bar" => "food", "mmm" => "food"}]'
+          end.to raise_error.with_message a_string_including '> to include [{"foo" => "bar"}, {"bar" => "food", "mmm" => "food"}]'
         end
         it 'fails if only some Hashes in Array match Solr documents in the response' do
           expect do
             expect(@solr_resp_5_docs).to include([{ 'id' => '222' }, { 'id' => '333', 'fld' => 'val' }, { 'foo' => 'bar' }, { 'bar' => 'food', 'mmm' => 'food' }])
-          end.to raise_error.with_message a_string_including '} to include [{"id" => "222"},'
+          end.to raise_error.with_message a_string_including '> to include [{"id" => "222"},'
         end
       end # should include(Array_of_Hashes)
 
@@ -331,10 +331,10 @@ describe RSpecSolr do
         it 'fails if any element of Array fails' do
           expect do
             expect(@solr_resp_5_docs).to include(['not_there', { 'id' => '111', 'fld' => 'val' }, '555'])
-          end.to raise_error.with_message a_string_including '} to include ['
+          end.to raise_error.with_message a_string_including '> to include ['
           expect do
             expect(@solr_resp_5_docs).to include(['222', { 'id' => '111', 'not' => 'there' }, '555'])
-          end.to raise_error.with_message a_string_including '} to include ['
+          end.to raise_error.with_message a_string_including '> to include ['
         end
       end
 
@@ -356,12 +356,12 @@ describe RSpecSolr do
         it "fails if no Solr document in response has 'fldval' for the named field" do
           expect do
             expect(@solr_resp_5_docs).to include('id' => /not there/)
-          end.to raise_error.with_message a_string_including '} to include {"id" => /not there/}'
+          end.to raise_error.with_message a_string_including '> to include {"id" => /not there/}'
         end
         it 'fails if no Solr document in response has the named field' do
           expect do
             expect(@solr_resp_5_docs).to include('not_there' => /anything/)
-          end.to raise_error.with_message a_string_including '} to include {"not_there" => /anything/}'
+          end.to raise_error.with_message a_string_including '> to include {"not_there" => /anything/}'
         end
       end # should include('fld' => /regex/)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-solr
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: RSpec custom matchers for Solr response objects
@@ -198,4 +198,3 @@ test_files:
 - spec/number_of_documents_spec.rb
 - spec/solr_response_hash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: