From f35f4e853e0db5f44888fef86437d1cf60a5d6fe Mon Sep 17 00:00:00 2001
From: Patric Mueller <bhaak@gmx.net>
Date: Fri, 30 Oct 2015 23:37:50 +0100
Subject: [PATCH] Fix tests for >= rspec 2.99.0

---
 .rspec                                          | 3 +--
 spec/xapian_db/adapters/base_adapter_spec.rb    | 4 ++--
 spec/xapian_db/adapters/generic_adapter_spec.rb | 2 +-
 spec/xapian_db/config_spec.rb                   | 4 ++--
 spec/xapian_db/database_spec.rb                 | 2 +-
 spec/xapian_db/resultset_spec.rb                | 4 ++--
 xapian_db.gemspec                               | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.rspec b/.rspec
index fe63683..984a396 100644
--- a/.rspec
+++ b/.rspec
@@ -1,2 +1 @@
---color
---format n
+--order defined
diff --git a/spec/xapian_db/adapters/base_adapter_spec.rb b/spec/xapian_db/adapters/base_adapter_spec.rb
index 81ef8ae..c95c693 100644
--- a/spec/xapian_db/adapters/base_adapter_spec.rb
+++ b/spec/xapian_db/adapters/base_adapter_spec.rb
@@ -145,7 +145,7 @@ class ClassB < ClassA
 
       let (:db) { XapianDb.database }
 
-      before :all do
+      before :each do
 
         XapianDb.setup do |config|
           config.adapter  :generic
@@ -192,4 +192,4 @@ class ClassB < ClassA
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/spec/xapian_db/adapters/generic_adapter_spec.rb b/spec/xapian_db/adapters/generic_adapter_spec.rb
index 147e9c5..0ca9034 100644
--- a/spec/xapian_db/adapters/generic_adapter_spec.rb
+++ b/spec/xapian_db/adapters/generic_adapter_spec.rb
@@ -31,7 +31,7 @@ def initialize(key)
 
     it "should raise an exception if the unique key is not configured" do
       XapianDb::Adapters::GenericAdapter.unique_key # undef the unique key
-      expect{XapianDb::Adapters::GenericAdapter.add_class_helper_methods_to(MyClass)}.to raise_error
+      expect{XapianDb::Adapters::GenericAdapter.add_class_helper_methods_to(MyClass)}.to raise_error "Unique key is not configured for generic adapter!"
     end
 
     it "should add the method 'xapian_id' to the configured class" do
diff --git a/spec/xapian_db/config_spec.rb b/spec/xapian_db/config_spec.rb
index a550d71..f0bb28d 100644
--- a/spec/xapian_db/config_spec.rb
+++ b/spec/xapian_db/config_spec.rb
@@ -76,7 +76,7 @@
       it "raises an error if the configured adapter is unknown" do
         expect{XapianDb::Config.setup do |config|
           config.adapter :unknown
-        end}.to raise_error
+        end}.to raise_error LoadError
       end
     end
 
@@ -124,7 +124,7 @@
       it "raises an error if the configured writer is unknown" do
         expect{XapianDb::Config.setup do |config|
           config.writer :unknown
-        end}.to raise_error
+        end}.to raise_error LoadError
       end
 
     end
diff --git a/spec/xapian_db/database_spec.rb b/spec/xapian_db/database_spec.rb
index c0a1682..4d8e4d3 100644
--- a/spec/xapian_db/database_spec.rb
+++ b/spec/xapian_db/database_spec.rb
@@ -403,7 +403,7 @@ def initialize(id, text)
 
     let (:db) { XapianDb.database }
 
-    before :all do
+    before :each do
       XapianDb.setup do |config|
         config.adapter  :generic
         config.database :memory
diff --git a/spec/xapian_db/resultset_spec.rb b/spec/xapian_db/resultset_spec.rb
index 9c5a337..cf3e5ec 100644
--- a/spec/xapian_db/resultset_spec.rb
+++ b/spec/xapian_db/resultset_spec.rb
@@ -65,7 +65,7 @@
     end
 
     it "raises an exception if an unsupported option is passed" do
-      expect{XapianDb::Resultset.new(@enquiry, :unsupported => "?")}.to raise_error
+      expect{XapianDb::Resultset.new(@enquiry, :unsupported => "?")}.to raise_error 'unsupported options for resultset: {:unsupported=>"?"}'
     end
 
     it "accepts a limit option (as a string or an integer)" do
@@ -110,7 +110,7 @@
     end
 
     it "raises an exception if page is requested that does not exist" do
-      expect{XapianDb::Resultset.new(@enquiry, :db_size => @matches.size, :per_page => 2, :page => 3)}.to raise_error
+      expect{XapianDb::Resultset.new(@enquiry, :db_size => @matches.size, :per_page => 2, :page => 3)}.to raise_error "page  does not exist"
     end
 
     it "should populate itself with found xapian documents" do
diff --git a/xapian_db.gemspec b/xapian_db.gemspec
index e3b69b2..37a187f 100644
--- a/xapian_db.gemspec
+++ b/xapian_db.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "daemons", ">= 1.0.10"
 
   s.add_development_dependency "guard"
-  s.add_development_dependency "rspec",            ">= 2.3.1"
+  s.add_development_dependency "rspec",            ">= 2.99.0"
   s.add_development_dependency "simplecov",        ">= 0.3.7"
   s.add_development_dependency "beanstalk-client", ">= 1.1.0"
   s.add_development_dependency "rake"