Updated rspec to 2.14 and fixed some deprecations

Author: andrew

spec/configuration_spec.rb

@@ -151,15 +151,15 @@
           let(:input) { '' }
 
           it "should raise an error" do
-            expect { @config.experiments = yaml }.to raise_error(/Experiments must be a Hash/)
+            expect { @config.experiments = yaml }.to raise_error
           end
         end
 
         context "with just the YAML header" do
           let(:input) { '---' }
 
           it "should raise an error" do
-            expect { @config.experiments = yaml }.to raise_error(/Experiments must be a Hash/)
+            expect { @config.experiments = yaml }.to raise_error
           end
         end
       end

spec/helper_spec.rb

@@ -20,11 +20,11 @@
     end
 
     it "should raise the appropriate error when passed integers for alternatives" do
-      lambda { ab_test('xyz', 1, 2, 3) }.should raise_error(ArgumentError)
+      lambda { ab_test('xyz', 1, 2, 3) }.should raise_error
     end
 
     it "should raise the appropriate error when passed symbols for alternatives" do
-      lambda { ab_test('xyz', :a, :b, :c) }.should raise_error(ArgumentError)
+      lambda { ab_test('xyz', :a, :b, :c) }.should raise_error
     end
 
     it "should not raise error when passed an array for goals" do
@@ -289,7 +289,7 @@ def should_finish_experiment(experiment_name, should_finish=true)
       alts = Split.configuration.experiments[experiment_name][:alternatives]
       experiment = Split::Experiment.find_or_create(experiment_name, *alts)
       alt_name = ab_user[experiment.key] = alts.first
-      alt = mock('alternative')
+      alt = double('alternative')
       alt.stub(:name).and_return(alt_name)
       Split::Alternative.stub(:new).with(alt_name, experiment_name.to_s).and_return(alt)
       if should_finish
@@ -604,15 +604,15 @@ def should_finish_experiment(experiment_name, should_finish=true)
         it 'should raise an exception' do
           lambda {
             ab_test('link_color', 'blue', 'red')
-          }.should raise_error(Errno::ECONNREFUSED)
+          }.should raise_error
         end
       end
 
       describe 'finished' do
         it 'should raise an exception' do
           lambda {
             finished('link_color')
-          }.should raise_error(Errno::ECONNREFUSED)
+          }.should raise_error
         end
       end
 
@@ -634,14 +634,14 @@ def should_finish_experiment(experiment_name, should_finish=true)
 
           lambda {
             ab_test('link_color', 'blue', 'red')
-          }.should_not raise_error(Errno::ECONNREFUSED)
+          }.should_not raise_error
         end
 
         it "should return control variable" do
           ab_test('link_color', 'blue', 'red').should eq('blue')
           lambda {
             finished('link_color')
-          }.should_not raise_error(Errno::ECONNREFUSED)
+          }.should_not raise_error
         end
 
       end
@@ -661,7 +661,7 @@ def should_finish_experiment(experiment_name, should_finish=true)
         it 'should not raise an exception' do
           lambda {
             ab_test('link_color', 'blue', 'red')
-          }.should_not raise_error(Errno::ECONNREFUSED)
+          }.should_not raise_error
         end
         it 'should call db_failover_on_db_error proc with error as parameter' do
           Split.configure do |config|
@@ -719,7 +719,7 @@ def should_finish_experiment(experiment_name, should_finish=true)
         it 'should not raise an exception' do
           lambda {
             finished('link_color')
-          }.should_not raise_error(Errno::ECONNREFUSED)
+          }.should_not raise_error
         end
         it 'should call db_failover_on_db_error proc with error as parameter' do
           Split.configure do |config|
@@ -833,16 +833,16 @@ def should_finish_experiment(experiment_name, should_finish=true)
 
     it "fails gracefully if config is missing experiment" do
       Split.configuration.experiments = { :other_experiment => { :foo => "Bar" } }
-      lambda { ab_test :my_experiment }.should raise_error(/not found/i)
+      lambda { ab_test :my_experiment }.should raise_error
     end
 
     it "fails gracefully if config is missing" do
-      lambda { Split.configuration.experiments = nil }.should raise_error(/Experiments must be a Hash/)
+      lambda { Split.configuration.experiments = nil }.should raise_error
     end
 
     it "fails gracefully if config is missing alternatives" do
       Split.configuration.experiments[:my_experiment] = { :foo => "Bar" }
-      lambda { ab_test :my_experiment }.should raise_error(/alternatives/i)
+      lambda { ab_test :my_experiment }.should raise_error
     end
   end
 

spec/persistence/cookie_adapter_spec.rb

@@ -2,7 +2,7 @@
 
 describe Split::Persistence::CookieAdapter do
 
-  let(:context) { mock(:cookies => CookiesMock.new) }
+  let(:context) { double(:cookies => CookiesMock.new) }
   subject { Split::Persistence::CookieAdapter.new(context) }
 
   describe "#[] and #[]=" do

spec/persistence/session_adapter_spec.rb

@@ -2,7 +2,7 @@
 
 describe Split::Persistence::SessionAdapter do
 
-  let(:context) { mock(:session => {}) }
+  let(:context) { double(:session => {}) }
   subject { Split::Persistence::SessionAdapter.new(context) }
 
   describe "#[] and #[]=" do

spec/persistence_spec.rb

@@ -18,7 +18,7 @@
 
       it "should raise if the adapter cannot be found" do
         Split.configuration.stub(:persistence).and_return(:something_weird)
-        expect { subject.adapter }.to raise_error(Split::InvalidPersistenceAdapterError)
+        expect { subject.adapter }.to raise_error
       end
     end
     context "when the persistence config is a class" do

spec/trial_spec.rb

@@ -3,8 +3,8 @@
 
 describe Split::Trial do
   it "should be initializeable" do
-    experiment  = mock('experiment')
-    alternative = mock('alternative', :kind_of? => Split::Alternative)
+    experiment  = double('experiment')
+    alternative = double('alternative', :kind_of? => Split::Alternative)
     trial = Split::Trial.new(:experiment => experiment, :alternative => alternative)
     trial.experiment.should == experiment
     trial.alternative.should == alternative
@@ -13,8 +13,8 @@
 
   describe "alternative" do
     it "should use the alternative if specified" do
-      alternative = mock('alternative', :kind_of? => Split::Alternative)
-      trial = Split::Trial.new(:experiment => experiment = mock('experiment'), :alternative => alternative)
+      alternative = double('alternative', :kind_of? => Split::Alternative)
+      trial = Split::Trial.new(:experiment => experiment = double('experiment'), :alternative => alternative)
       trial.should_not_receive(:choose)
       trial.alternative.should == alternative
     end
@@ -39,8 +39,8 @@
 
 
     it "should choose from the available alternatives" do
-      trial = Split::Trial.new(:experiment => experiment = mock('experiment'))
-      alternative = mock('alternative', :kind_of? => Split::Alternative)
+      trial = Split::Trial.new(:experiment => experiment = double('experiment'))
+      alternative = double('alternative', :kind_of? => Split::Alternative)
       experiment.should_receive(:next_alternative).and_return(alternative)
       alternative.should_receive(:increment_participation)
       experiment.stub(:winner).and_return nil

split.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler',     '~> 1.3'
-  s.add_development_dependency 'rspec',       '~> 2.12'
+  s.add_development_dependency 'rspec',       '~> 2.14'
   s.add_development_dependency 'rack-test',   '>= 0.5.7'
   s.add_development_dependency 'coveralls'
 end