picky 4.19.4 → 4.19.5

data/spec/lib/interfaces/live_parameters/master_child_spec.rb

@@ -5,11 +5,11 @@ require 'spec_helper'
 describe Picky::Interfaces::LiveParameters::MasterChild do
 
   before(:each) do
-    @parent = stub :parent
-    @child  = stub :child
-    IO.stub! :pipe => [@child, @parent]
+    @parent = double :parent
+    @child  = double :child
+    IO.stub :pipe => [@child, @parent]
     @parameters = described_class.new
-    @parameters.stub! :exclaim
+    @parameters.stub :exclaim
   end
 
   describe Picky::Interfaces::LiveParameters::MasterChild::CouldNotUpdateConfigurationError do
@@ -43,10 +43,10 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
   describe 'parameters' do
     context 'all goes well' do
       it 'does a few things in order' do
-        @parameters.should_receive(:close_child).once.with().ordered
+        @parameters.should_receive(:close_child).once.with(no_args).ordered
         @parameters.should_receive(:try_updating_configuration_with).once.with(:a => :b).ordered
         @parameters.should_receive(:write_parent).once.with(:a => :b).ordered
-        @parameters.should_receive(:extract_configuration).once.with().ordered
+        @parameters.should_receive(:extract_configuration).once.with(no_args).ordered
 
         @parameters.parameters :a => :b
       end
@@ -66,7 +66,7 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
 
   describe 'harakiri' do
     before(:each) do
-      Process.stub! :pid => :some_pid
+      Process.stub :pid => :some_pid
     end
     it 'kills itself' do
       Process.should_receive(:kill).once.with :QUIT, :some_pid
@@ -77,7 +77,7 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
 
   describe 'write_parent' do
     before(:each) do
-      Process.stub! :pid => :some_pid
+      Process.stub :pid => :some_pid
     end
     it 'calls the parent' do
       @parent.should_receive(:write).once.with "[:some_pid, {:a=>:b}];;;"
@@ -89,7 +89,7 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
   describe 'close_child' do
     context 'child is closed' do
       before(:each) do
-        @child.stub! :closed? => true
+        @child.stub :closed? => true
       end
       it 'does not receive close' do
         @child.should_receive(:close).never
@@ -99,10 +99,10 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
     end
     context 'child not yet closed' do
       before(:each) do
-        @child.stub! :closed? => false
+        @child.stub :closed? => false
       end
       it 'does receives close' do
-        @child.should_receive(:close).once.with()
+        @child.should_receive(:close).once.with no_args
 
         @parameters.close_child
       end
@@ -131,7 +131,7 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
   describe 'kill_each_worker_except' do
     context 'worker pid in the worker pids' do
       before(:each) do
-        @parameters.stub! :worker_pids => [1,2,3,4]
+        @parameters.stub :worker_pids => [1,2,3,4]
       end
       it 'kills each except the one' do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 1)
@@ -144,7 +144,7 @@ describe Picky::Interfaces::LiveParameters::MasterChild do
     end
     context 'worker pid not in the worker pids (unrealistic, but...)' do
       before(:each) do
-        @parameters.stub! :worker_pids => [1,2,3,4]
+        @parameters.stub :worker_pids => [1,2,3,4]
       end
       it 'kills each except the one' do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 1)

data/spec/lib/interfaces/live_parameters/unicorn_spec.rb

@@ -5,11 +5,11 @@ require 'spec_helper'
 describe Picky::Interfaces::LiveParameters::Unicorn do
 
   before(:each) do
-    @parent = stub :parent
-    @child  = stub :child
-    IO.stub! :pipe => [@child, @parent]
+    @parent = double :parent
+    @child  = double :child
+    IO.stub :pipe => [@child, @parent]
     @parameters = described_class.new
-    @parameters.stub! :exclaim
+    @parameters.stub :exclaim
   end
 
   describe Picky::Interfaces::LiveParameters::Unicorn::CouldNotUpdateConfigurationError do
@@ -43,10 +43,10 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
   describe 'parameters' do
     context 'all goes well' do
       it 'does a few things in order' do
-        @parameters.should_receive(:close_child).once.with().ordered
+        @parameters.should_receive(:close_child).once.with(no_args).ordered
         @parameters.should_receive(:try_updating_configuration_with).once.with(:a => :b).ordered
         @parameters.should_receive(:write_parent).once.with(:a => :b).ordered
-        @parameters.should_receive(:extract_configuration).once.with().ordered
+        @parameters.should_receive(:extract_configuration).once.with(no_args).ordered
 
         @parameters.parameters :a => :b
       end
@@ -66,7 +66,7 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
 
   describe 'harakiri' do
     before(:each) do
-      Process.stub! :pid => :some_pid
+      Process.stub :pid => :some_pid
     end
     it 'kills itself' do
       Process.should_receive(:kill).once.with :QUIT, :some_pid
@@ -77,7 +77,7 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
 
   describe 'write_parent' do
     before(:each) do
-      Process.stub! :pid => :some_pid
+      Process.stub :pid => :some_pid
     end
     it 'calls the parent' do
       @parent.should_receive(:write).once.with "[:some_pid, {:a=>:b}];;;"
@@ -89,7 +89,7 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
   describe 'close_child' do
     context 'child is closed' do
       before(:each) do
-        @child.stub! :closed? => true
+        @child.stub :closed? => true
       end
       it 'does not receive close' do
         @child.should_receive(:close).never
@@ -99,10 +99,10 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
     end
     context 'child not yet closed' do
       before(:each) do
-        @child.stub! :closed? => false
+        @child.stub :closed? => false
       end
       it 'does receives close' do
-        @child.should_receive(:close).once.with()
+        @child.should_receive(:close).once.with no_args
 
         @parameters.close_child
       end
@@ -131,7 +131,7 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
   describe 'kill_each_worker_except' do
     context 'worker pid in the worker pids' do
       before(:each) do
-        @parameters.stub! :worker_pids => [1,2,3,4]
+        @parameters.stub :worker_pids => [1,2,3,4]
       end
       it 'kills each except the one' do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 1)
@@ -144,7 +144,7 @@ describe Picky::Interfaces::LiveParameters::Unicorn do
     end
     context 'worker pid not in the worker pids (unrealistic, but...)' do
       before(:each) do
-        @parameters.stub! :worker_pids => [1,2,3,4]
+        @parameters.stub :worker_pids => [1,2,3,4]
       end
       it 'kills each except the one' do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 1)

data/spec/lib/loader_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Loader do
 
   before(:each) do
-    described_class.stub! :exclaim
+    described_class.stub :exclaim
     @loader_path = File.absolute_path("#{File.dirname(__FILE__)}/../../lib/picky/loader.rb")
   end
 
@@ -36,7 +36,7 @@ describe Picky::Loader do
 
   describe 'load_framework' do
     before(:each) do
-      described_class.stub! :load_relative
+      described_class.stub :load_relative
     end
     it 'does ok' do
       lambda { described_class.load_framework }.should_not raise_error
@@ -45,7 +45,7 @@ describe Picky::Loader do
 
   describe 'load_self' do
     before(:each) do
-      described_class.stub! :load
+      described_class.stub :load
     end
     after(:each) do
       described_class.load_self
@@ -58,9 +58,9 @@ describe Picky::Loader do
   describe 'reload' do
     before(:each) do
       load @loader_path
-      described_class.stub! :load_framework
-      described_class.stub! :load_application
-      Dir.stub! :chdir
+      described_class.stub :load_framework
+      described_class.stub :load_application
+      Dir.stub :chdir
     end
     it 'should call the right methods in order' do
       described_class.should_receive(:load_self).ordered
@@ -84,9 +84,9 @@ describe Picky::Loader do
   describe 'load' do
     before(:each) do
       load @loader_path
-      described_class.stub! :load_framework
-      described_class.stub! :load_application
-      Dir.stub! :chdir
+      described_class.stub :load_framework
+      described_class.stub :load_application
+      Dir.stub :chdir
     end
     after(:each) do
       described_class.load

data/spec/lib/loggers/verbose_spec.rb

@@ -4,14 +4,21 @@ describe Picky::Loggers::Verbose do
   
   let(:index) { Picky::Index.new :some_index }
   let(:category) { Picky::Category.new :some_category, index }
-  let(:file) { stub :file, :path => 'some/path' }
+  let(:file) { double :file, :path => 'some/path' }
   let(:io) { StringIO.new }
   let(:logger) { described_class.new thing }
   context 'with Logger' do
     let(:thing) { Logger.new io }
+    before :each do
+      # Explicitly define formatting for these specs.
+      #
+      thing.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+    end
     describe 'more complicated test case' do
       it 'is correct' do
-        Time.stub! :now => Time.new('zeros')
+        Time.stub :now => Time.new('zeros')
       
         logger.info 'Tokenizing '
         logger.tokenize category, file
@@ -34,7 +41,7 @@ describe Picky::Loggers::Verbose do
     let(:thing) { io }
     describe 'more complicated test case' do
       it 'is correct' do
-        Time.stub! :now => Time.new('zeros')
+        Time.stub :now => Time.new('zeros')
       
         logger.info 'Tokenizing '
         logger.tokenize category, file

data/spec/lib/query/allocation_spec.rb

@@ -3,21 +3,21 @@ require 'spec_helper'
 describe Picky::Query::Allocation do
 
   before(:each) do
-    @backend      = stub :backend
-    @index        = stub :index, :result_identifier => :some_result_identifier, :backend => @backend
-    @combinations = stub :combinations, :empty? => false
+    @backend      = double :backend
+    @index        = double :index, :result_identifier => :some_result_identifier, :backend => @backend
+    @combinations = double :combinations, :empty? => false
     @allocation   = described_class.new @index, @combinations
   end
 
   describe "to_s" do
     before(:each) do
-      @combinations.stub! :to_result => 'combinations_result'
+      @combinations.stub :to_result => 'combinations_result'
     end
     context "allocation.count > 0" do
       before(:each) do
-        @allocation.stub! :count => 10
-        @allocation.stub! :score => :score
-        @allocation.stub! :ids => :ids
+        @allocation.stub :count => 10
+        @allocation.stub :score => :score
+        @allocation.stub :ids => :ids
       end
       it "represents correctly" do
         @allocation.to_s.should == "Allocation([:some_result_identifier, :score, 10, \"combinations_result\", :ids])"
@@ -36,7 +36,7 @@ describe Picky::Query::Allocation do
   describe 'process!' do
     context 'no ids' do
       before(:each) do
-        @allocation.stub! :calculate_ids => []
+        @allocation.stub :calculate_ids => []
       end
       it 'should process right' do
         @allocation.process!(0, 0).should == []
@@ -53,7 +53,7 @@ describe Picky::Query::Allocation do
     end
     context 'with ids' do
       before(:each) do
-        @allocation.stub! :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
+        @allocation.stub :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
       end
       it 'should process right' do
         @allocation.process!(0, 0).should == []
@@ -79,7 +79,7 @@ describe Picky::Query::Allocation do
     end
     context 'with symbol ids' do
       before(:each) do
-        @allocation.stub! :calculate_ids => [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j]
+        @allocation.stub :calculate_ids => [:a,:b,:c,:d,:e,:f,:g,:h,:i,:j]
       end
       it 'should process right' do
         @allocation.process!(0, 0).should == []
@@ -107,7 +107,7 @@ describe Picky::Query::Allocation do
   
   describe "subject" do
     before(:each) do
-      @allocation.stub! :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
+      @allocation.stub :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
     end
     it 'should process right' do
       @allocation.process_with_illegals!(0, 0, [1,3,7]).should == []
@@ -135,12 +135,12 @@ describe Picky::Query::Allocation do
   describe 'to_result' do
     context 'with few combinations' do
       before(:each) do
-        @allocation = described_class.new @index, stub(:combinations, :empty? => false, :to_result => [:some_result])
+        @allocation = described_class.new @index, double(:combinations, :empty? => false, :to_result => [:some_result])
         @allocation.instance_variable_set :@score, :some_score
       end
       context 'with ids' do
         it 'should output an array of information' do
-          @backend.stub! :ids => [1,2,3]
+          @backend.stub :ids => [1,2,3]
 
           @allocation.process! 20, 0
 
@@ -150,7 +150,7 @@ describe Picky::Query::Allocation do
     end
     context 'with results' do
       before(:each) do
-        combinations = stub :combinations,
+        combinations = double :combinations,
                             :empty? => false,
                             :to_result => [:some_result1, :some_result2]
         @allocation = described_class.new @index, combinations
@@ -158,7 +158,7 @@ describe Picky::Query::Allocation do
       end
       context 'with ids' do
         it 'should output an array of information' do
-          @backend.stub! :ids => [1,2,3]
+          @backend.stub :ids => [1,2,3]
 
           @allocation.process! 20, 0
 
@@ -168,11 +168,11 @@ describe Picky::Query::Allocation do
     end
     context 'without results' do
       before(:each) do
-        @allocation = described_class.new @index, stub(:combinations, :empty? => true)
+        @allocation = described_class.new @index, double(:combinations, :empty? => true)
         @allocation.instance_variable_set :@score, :some_score
       end
       it 'should return nil' do
-        @backend.stub! :ids => []
+        @backend.stub :ids => []
 
         @allocation.process! 20, 0
 
@@ -185,7 +185,7 @@ describe Picky::Query::Allocation do
     context 'non-empty combinations' do
       it 'should forward to backend and combinations' do
         @combinations.should_receive(:score).once.and_return 1
-        boosts = stub :weights, :boost_for => 2
+        boosts = double :weights, :boost_for => 2
 
         @allocation.calculate_score(boosts).should == 3
       end
@@ -220,10 +220,10 @@ describe Picky::Query::Allocation do
 
   describe "process!" do
     before(:each) do
-      @amount = stub :amount
-      @offset = stub :offset
-      @ids    = stub :ids, :size => :some_original_size, :slice! => :some_sliced_ids
-      @allocation.stub! :calculate_ids => @ids
+      @amount = double :amount
+      @offset = double :offset
+      @ids    = double :ids, :size => :some_original_size, :slice! => :some_sliced_ids
+      @allocation.stub :calculate_ids => @ids
     end
     it 'should calculate_ids' do
       @allocation.should_receive(:calculate_ids).once.with(@amount, @offset).and_return @ids

data/spec/lib/query/allocations_spec.rb

@@ -4,9 +4,9 @@ describe Picky::Query::Allocations do
 
   describe 'reduce_to' do
     before(:each) do
-      @allocation1 = stub :allocation1
-      @allocation2 = stub :allocation2
-      @allocation3 = stub :allocation3
+      @allocation1 = double :allocation1
+      @allocation2 = double :allocation2
+      @allocation3 = double :allocation3
       @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     it 'should do nothing' do
@@ -18,9 +18,9 @@ describe Picky::Query::Allocations do
 
   describe 'remove' do
     before(:each) do
-      @allocation1 = stub :allocation1
-      @allocation2 = stub :allocation2
-      @allocation3 = stub :allocation3
+      @allocation1 = double :allocation1
+      @allocation2 = double :allocation2
+      @allocation3 = double :allocation3
       @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     context 'identifiers empty' do
@@ -45,9 +45,9 @@ describe Picky::Query::Allocations do
   describe 'ids' do
     context 'integers' do
       before(:each) do
-        @allocation1 = stub :allocation1, :ids => [1, 2, 3, 4]
-        @allocation2 = stub :allocation2, :ids => [5, 6, 7]
-        @allocation3 = stub :allocation3, :ids => [8, 9]
+        @allocation1 = double :allocation1, :ids => [1, 2, 3, 4]
+        @allocation2 = double :allocation2, :ids => [5, 6, 7]
+        @allocation3 = double :allocation3, :ids => [8, 9]
         @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
       end
       it 'should return the right amount of ids' do
@@ -62,9 +62,9 @@ describe Picky::Query::Allocations do
     end
     context 'symbols' do
       before(:each) do
-        @allocation1 = stub :allocation1, :ids => [:a, :b, :c, :d]
-        @allocation2 = stub :allocation2, :ids => [:e, :f, :g]
-        @allocation3 = stub :allocation3, :ids => [:h, :i]
+        @allocation1 = double :allocation1, :ids => [:a, :b, :c, :d]
+        @allocation2 = double :allocation2, :ids => [:e, :f, :g]
+        @allocation3 = double :allocation3, :ids => [:h, :i]
         @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
       end
       it 'should return the right amount of ids' do
@@ -81,9 +81,9 @@ describe Picky::Query::Allocations do
 
   describe 'process!' do
     before(:each) do
-      @allocation1 = stub :allocation1, :count => 4, ids: [1, 2, 3, 4]
-      @allocation2 = stub :allocation2, :count => 3, ids: [5, 6, 7]
-      @allocation3 = stub :allocation3, :count => 2, ids: [8, 9]
+      @allocation1 = double :allocation1, :count => 4, ids: [1, 2, 3, 4]
+      @allocation2 = double :allocation2, :count => 3, ids: [5, 6, 7]
+      @allocation3 = double :allocation3, :count => 2, ids: [8, 9]
       @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     describe 'lazy evaluation' do
@@ -284,19 +284,19 @@ describe Picky::Query::Allocations do
   describe 'to_result' do
     context 'all allocations have results' do
       before(:each) do
-        @allocation = stub :allocation
+        @allocation = double :allocation
         @allocations = described_class.new [@allocation, @allocation, @allocation]
       end
       it 'should forward to each allocation with no params' do
-        @allocation.should_receive(:to_result).exactly(3).times.with
+        @allocation.should_receive(:to_result).exactly(3).times.with no_args
 
         @allocations.to_result
       end
     end
     context 'one allocation has no results' do
       before(:each) do
-        @allocation           = stub :allocation, :to_result => :some_result
-        @no_result_allocation = stub :no_results, :to_result => nil
+        @allocation           = double :allocation, :to_result => :some_result
+        @no_result_allocation = double :no_results, :to_result => nil
         @allocations = described_class.new [@allocation, @no_result_allocation, @allocation]
       end
       it 'should forward to each allocation with the same params' do
@@ -309,9 +309,9 @@ describe Picky::Query::Allocations do
     context 'with allocations' do
       before(:each) do
         @allocations = described_class.new [
-          stub(:allocation, :process! => (1..10).to_a, :count => 10),
-          stub(:allocation, :process! => (1..80).to_a, :count => 80),
-          stub(:allocation, :process! => (1..20).to_a, :count => 20)
+          double(:allocation, :process! => (1..10).to_a, :count => 10),
+          double(:allocation, :process! => (1..80).to_a, :count => 80),
+          double(:allocation, :process! => (1..20).to_a, :count => 20)
         ]
       end
       it 'should traverse the allocations and sum the counts' do
@@ -334,31 +334,31 @@ describe Picky::Query::Allocations do
 
   describe "each" do
     before(:each) do
-      @internal_allocations = mock :internal_allocations
+      @internal_allocations = double :internal_allocations
       @allocations = described_class.new @internal_allocations
     end
     it "should forward to the internal allocations" do
       stub_proc = lambda {}
-      @internal_allocations.should_receive(:each).once.with &stub_proc
+      @internal_allocations.should_receive(:each).once.with no_args, &stub_proc
 
       @allocations.each &stub_proc
     end
   end
   describe "inject" do
     before(:each) do
-      @internal_allocations = mock :internal_allocations
+      @internal_allocations = double :internal_allocations
       @allocations = described_class.new @internal_allocations
     end
     it "should forward to the internal allocations" do
       stub_proc = lambda {}
-      @internal_allocations.should_receive(:inject).once.with &stub_proc
+      @internal_allocations.should_receive(:inject).once.with no_args, &stub_proc
 
       @allocations.inject &stub_proc
     end
   end
   describe "empty?" do
     before(:each) do
-      @internal_allocations = mock :internal_allocations
+      @internal_allocations = double :internal_allocations
       @allocations = described_class.new @internal_allocations
     end
     it "should forward to the internal allocations array" do
@@ -369,8 +369,8 @@ describe Picky::Query::Allocations do
 
   describe "to_s" do
     before(:each) do
-      @allocation           = stub :allocation, :to_result => :some_result
-      @no_result_allocation = stub :no_results, :to_result => nil
+      @allocation           = double :allocation, :to_result => :some_result
+      @no_result_allocation = double :no_results, :to_result => nil
       @allocations = described_class.new [@allocation, @no_result_allocation, @allocation]
     end
     it "should forward to the internal allocations array" do
@@ -382,9 +382,9 @@ describe Picky::Query::Allocations do
     context 'some allocations' do
       before(:each) do
         @allocations = described_class.new [
-          stub(:allocation, :process! => (1..10).to_a, :count => 10),
-          stub(:allocation, :process! => (1..80).to_a, :count => 80),
-          stub(:allocation, :process! => (1..20).to_a, :count => 20)
+          double(:allocation, :process! => (1..10).to_a, :count => 10),
+          double(:allocation, :process! => (1..80).to_a, :count => 80),
+          double(:allocation, :process! => (1..20).to_a, :count => 20)
         ]
       end
       it 'should calculate the right total' do

data/spec/lib/query/boosts_spec.rb

@@ -22,8 +22,8 @@ describe Picky::Query::Boosts do
     describe 'boost_for' do
       it 'gets the category names from the combinations' do
         combinations = [
-          stub(:combination1, :category_name => :test1),
-          stub(:combination1, :category_name => :test2)
+          double(:combination1, :category_name => :test1),
+          double(:combination1, :category_name => :test2)
         ]
 
         boosts.boost_for(combinations).should == +6

data/spec/lib/query/combination_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Picky::Query::Combination do
 
   before(:each) do
-    @bundle      = stub :bundle, :identifier => :bundle_name
+    @bundle      = double :bundle, :identifier => :bundle_name
     @token       = Picky::Query::Token.processed('some_text~', 'Some Original~')
-    @category    = stub :category,
+    @category    = double :category,
                         :bundle_for => @bundle,
                         :name => :some_category_name,
                         :identifier => 'some_category_identifier'
@@ -17,7 +17,7 @@ describe Picky::Query::Combination do
 
   describe "to_s" do
     it "shows the combination's info" do
-      @token.stub! :to_result => :token_result
+      @token.stub :to_result => :token_result
 
       @combination.to_s.should == '(bundle_name,some_category_name:token_result)'
     end
@@ -35,7 +35,7 @@ describe Picky::Query::Combination do
       end
     end
     it 'should return a correct result' do
-      @token.stub! :to_result => [:some_original_text, :some_text]
+      @token.stub :to_result => [:some_original_text, :some_text]
 
       @combination.to_result.should == [:some_category_name, :some_original_text, :some_text]
     end
@@ -54,7 +54,7 @@ describe Picky::Query::Combination do
       @combination.ids
     end
     it 'should not call it twice, but cache' do
-      @category.stub! :ids => :some_ids
+      @category.stub :ids => :some_ids
       @combination.ids
 
       @category.should_receive(:ids).never

data/spec/lib/query/combinations_spec.rb

@@ -5,15 +5,15 @@ require 'spec_helper'
 describe Picky::Query::Combinations do
 
   before(:each) do
-    @combinations_ary = stub :combinations_ary
+    @combinations_ary = double :combinations_ary
 
     @combinations = described_class.new @combinations_ary
   end
 
   describe "to_result" do
     before(:each) do
-      @combination1 = stub :combination1, :to_result => :result1
-      @combination2 = stub :combination2, :to_result => :result2
+      @combination1 = double :combination1, :to_result => :result1
+      @combination2 = double :combination2, :to_result => :result2
 
       @combinations_ary = [@combination1, @combination2]
 
@@ -26,8 +26,8 @@ describe Picky::Query::Combinations do
 
   describe "total_score" do
     before(:each) do
-      @combination1 = stub :combination1, :weight => 3.14
-      @combination2 = stub :combination2, :weight => 2.76
+      @combination1 = double :combination1, :weight => 3.14
+      @combination2 = double :combination2, :weight => 2.76
 
       @combinations_ary = [@combination1, @combination2]
 
@@ -40,9 +40,9 @@ describe Picky::Query::Combinations do
 
   describe 'remove' do
     before(:each) do
-      @combination1 = stub :combination1, :category => stub(:other, :name => :other)
-      @combination2 = stub :combination2, :category => stub(:to_remove, :name => :to_remove)
-      @combination3 = stub :combination3, :category => stub(:to_remove, :name => :to_remove)
+      @combination1 = double :combination1, :category => double(:other, :name => :other)
+      @combination2 = double :combination2, :category => double(:to_remove, :name => :to_remove)
+      @combination3 = double :combination3, :category => double(:to_remove, :name => :to_remove)
 
       @combinations = described_class.new [@combination1, @combination2, @combination3]
     end