flapjack 0.7.27 → 0.7.28

data/spec/lib/flapjack/data/event_spec.rb

@@ -5,7 +5,7 @@ describe Flapjack::Data::Event do
 
   let(:entity_name) { 'xyz-example.com' }
   let(:check)       { 'ping' }
-  let(:mock_redis)  { mock(::Redis) }
+  let(:mock_redis)  { double(::Redis) }
 
   let!(:time) { Time.now}
 

data/spec/lib/flapjack/data/message_spec.rb

@@ -3,7 +3,7 @@ require 'flapjack/data/message'
 
 describe Flapjack::Data::Message do
 
-  let(:contact) { mock(Flapjack::Data::Contact) }
+  let(:contact) { double(Flapjack::Data::Contact) }
 
   it "assigns itself an ID" do
     message = Flapjack::Data::Message.for_contact(contact)

data/spec/lib/flapjack/data/notification_spec.rb

@@ -3,11 +3,11 @@ require 'flapjack/data/notification'
 
 describe Flapjack::Data::Notification, :redis => true, :logger => true do
 
-  let(:event)   { mock(Flapjack::Data::Event) }
+  let(:event)   { double(Flapjack::Data::Event) }
 
-  let(:contact) { mock(Flapjack::Data::Contact) }
+  let(:contact) { double(Flapjack::Data::Contact) }
 
-  let(:timezone) { mock('timezone') }
+  let(:timezone) { double('timezone') }
 
   it "generates a notification for an event" # do
   #   notification = Flapjack::Data::Notification.for_event(event, :type => 'problem',
@@ -27,6 +27,14 @@ describe Flapjack::Data::Notification, :redis => true, :logger => true do
     contact.should_receive(:notification_rules).and_return([])
     contact.should_receive(:media).and_return('email' => 'example@example.com',
                                               'sms'   => '0123456789')
+    contact.should_receive(:add_alerting_check_for_media).with("email", nil)
+    contact.should_receive(:add_alerting_check_for_media).with("sms", nil)
+    contact.should_receive(:clean_alerting_checks_for_media).with("email").and_return(0)
+    contact.should_receive(:clean_alerting_checks_for_media).with("sms").and_return(0)
+    contact.should_receive(:count_alerting_checks_for_media).with("email").and_return(0)
+    contact.should_receive(:count_alerting_checks_for_media).with("sms").and_return(0)
+    contact.should_receive(:rollup_threshold_for_media).with("email").and_return(nil)
+    contact.should_receive(:rollup_threshold_for_media).with("sms").and_return(nil)
 
     messages = notification.messages([contact], :default_timezone => timezone,
       :logger => @logger)

data/spec/lib/flapjack/gateways/api/contact_methods_spec.rb

@@ -7,7 +7,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     Flapjack::Gateways::API
   end
 
-  let(:contact)         { mock(Flapjack::Data::Contact, :id => '21') }
+  let(:contact)         { double(Flapjack::Data::Contact, :id => '21') }
   let(:contact_core)    {
     {'id'         => contact.id,
      'first_name' => "Ada",
@@ -29,10 +29,14 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     }
   }
 
-  let(:redis)           { mock(::Redis) }
+  let(:media_rollup_thresholds) {
+    {'email' => 5}
+  }
+
+  let(:redis)           { double(::Redis) }
 
   let(:notification_rule) {
-    mock(Flapjack::Data::NotificationRule, :id => '1', :contact_id => '21')
+    double(Flapjack::Data::NotificationRule, :id => '1', :contact_id => '21')
   }
 
   let(:notification_rule_data) {
@@ -134,7 +138,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
       ]
     }
 
-    existing = mock(Flapjack::Data::Contact)
+    existing = double(Flapjack::Data::Contact)
     existing.should_receive(:id).and_return("0363")
     existing.should_receive(:update).with(contacts['contacts'][1])
 
@@ -155,7 +159,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
       ]
     }
 
-    existing = mock(Flapjack::Data::Contact)
+    existing = double(Flapjack::Data::Contact)
     existing.should_receive(:id).twice.and_return("0362")
     existing.should_receive(:delete!)
 
@@ -195,7 +199,7 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   end
 
   it "lists a contact's notification rules" do
-    notification_rule_2 = mock(Flapjack::Data::NotificationRule, :id => '2', :contact_id => '21')
+    notification_rule_2 = double(Flapjack::Data::NotificationRule, :id => '2', :contact_id => '21')
     notification_rule.should_receive(:to_json).and_return('"rule_1"')
     notification_rule_2.should_receive(:to_json).and_return('"rule_2"')
     notification_rules = [ notification_rule, notification_rule_2 ]
@@ -351,11 +355,13 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   it "returns the media of a contact" do
     contact.should_receive(:media).and_return(media)
     contact.should_receive(:media_intervals).and_return(media_intervals)
+    contact.should_receive(:media_rollup_thresholds).and_return(media_rollup_thresholds)
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
     result = Hash[ *(media.keys.collect {|m|
-      [m, {'address'  => media[m],
-           'interval' => media_intervals[m] }]
+      [m, {'address'          => media[m],
+           'interval'         => media_intervals[m],
+           'rollup_threshold' => media_rollup_thresholds[m] }]
       }).flatten(1)].to_json
 
     get "/contacts/#{contact.id}/media"
@@ -375,10 +381,15 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   it "returns the specified media of a contact" do
     contact.should_receive(:media).and_return(media)
     contact.should_receive(:media_intervals).and_return(media_intervals)
+    contact.should_receive(:media_rollup_thresholds).and_return(media_rollup_thresholds)
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    result = {'address' => media['sms'], 'interval' => media_intervals['sms']}
+    result = {
+      'address'          => media['sms'],
+      'interval'         => media_intervals['sms'],
+      'rollup_threshold' => media_rollup_thresholds['sms'],
+    }
 
     get "/contacts/#{contact.id}/media/sms"
     last_response.should be_ok
@@ -408,17 +419,22 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
     # may distinguish between them
     alt_media = media.merge('sms' => '04987654321')
     alt_media_intervals = media_intervals.merge('sms' => '200')
+    alt_media_rollup_thresholds = media_rollup_thresholds.merge('sms' => '5')
 
     contact.should_receive(:set_address_for_media).with('sms', '04987654321')
     contact.should_receive(:set_interval_for_media).with('sms', '200')
+    contact.should_receive(:set_rollup_threshold_for_media).with('sms', '5')
     contact.should_receive(:media).and_return(alt_media)
     contact.should_receive(:media_intervals).and_return(alt_media_intervals)
+    contact.should_receive(:media_rollup_thresholds).and_return(alt_media_rollup_thresholds)
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
-    result = {'address' => alt_media['sms'], 'interval' => alt_media_intervals['sms']}
+    result = {'address'          => alt_media['sms'],
+              'interval'         => alt_media_intervals['sms'],
+              'rollup_threshold' => alt_media_rollup_thresholds['sms']}
 
-    put "/contacts/#{contact.id}/media/sms", {:address => '04987654321', :interval => '200'}
+    put "/contacts/#{contact.id}/media/sms", {:address => '04987654321', :interval => '200', :rollup_threshold => '5'}
     last_response.should be_ok
     last_response.body.should be_json_eql(result.to_json)
   end
@@ -442,11 +458,14 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   it "creates a media of a contact even if no interval is provided" do
     alt_media = media.merge('sms' => '04987654321')
     alt_media_intervals = media_intervals.merge('sms' => nil)
+    alt_media_rollup_thresholds = media_rollup_thresholds.merge('sms' => nil)
 
     contact.should_receive(:set_address_for_media).with('sms', '04987654321')
     contact.should_receive(:set_interval_for_media).with('sms', nil)
+    contact.should_receive(:set_rollup_threshold_for_media).with("sms", nil)
     contact.should_receive(:media).and_return(alt_media)
     contact.should_receive(:media_intervals).and_return(alt_media_intervals)
+    contact.should_receive(:media_rollup_thresholds).and_return(alt_media_rollup_thresholds)
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, {:redis => redis, :logger => @logger}).and_return(contact)
 
@@ -618,9 +637,9 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   end
 
   it "gets all entity tags for a contact" do
-    entity_1 = mock(Flapjack::Data::Entity)
+    entity_1 = double(Flapjack::Data::Entity)
     entity_1.should_receive(:name).and_return('entity_1')
-    entity_2 = mock(Flapjack::Data::Entity)
+    entity_2 = double(Flapjack::Data::Entity)
     entity_2.should_receive(:name).and_return('entity_2')
     tag_data = [{:entity => entity_1, :tags => ['web']},
                 {:entity => entity_2, :tags => ['app']}]
@@ -646,10 +665,10 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   end
 
   it "adds tags to multiple entities for a contact" do
-    entity_1 = mock(Flapjack::Data::Entity)
+    entity_1 = double(Flapjack::Data::Entity)
     entity_1.should_receive(:name).twice.and_return('entity_1')
     entity_1.should_receive(:add_tags).with('web')
-    entity_2 = mock(Flapjack::Data::Entity)
+    entity_2 = double(Flapjack::Data::Entity)
     entity_2.should_receive(:name).twice.and_return('entity_2')
     entity_2.should_receive(:add_tags).with('app')
 
@@ -680,10 +699,10 @@ describe 'Flapjack::Gateways::API::ContactMethods', :sinatra => true, :logger =>
   end
 
   it "deletes tags from multiple entities for a contact" do
-    entity_1 = mock(Flapjack::Data::Entity)
+    entity_1 = double(Flapjack::Data::Entity)
     entity_1.should_receive(:name).and_return('entity_1')
     entity_1.should_receive(:delete_tags).with('web')
-    entity_2 = mock(Flapjack::Data::Entity)
+    entity_2 = double(Flapjack::Data::Entity)
     entity_2.should_receive(:name).and_return('entity_2')
     entity_2.should_receive(:delete_tags).with('app')
 

data/spec/lib/flapjack/gateways/api/entity_check_presenter_spec.rb

@@ -3,7 +3,7 @@ require 'flapjack/gateways/api/entity_check_presenter'
 
 describe 'Flapjack::Gateways::API::EntityCheckPresenter' do
 
-  let(:entity_check) { mock(Flapjack::Data::EntityCheck) }
+  let(:entity_check) { double(Flapjack::Data::EntityCheck) }
 
   let(:time) { Time.now.to_i }
 

data/spec/lib/flapjack/gateways/api/entity_methods_spec.rb

@@ -7,17 +7,17 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     Flapjack::Gateways::API
   end
 
-  let(:entity)          { mock(Flapjack::Data::Entity) }
-  let(:entity_check)    { mock(Flapjack::Data::EntityCheck) }
+  let(:entity)          { double(Flapjack::Data::Entity) }
+  let(:entity_check)    { double(Flapjack::Data::EntityCheck) }
 
   let(:entity_name)     { 'www.example.net'}
   let(:entity_name_esc) { URI.escape(entity_name) }
   let(:check)           { 'ping' }
 
-  let(:entity_presenter)       { mock(Flapjack::Gateways::API::EntityPresenter) }
-  let(:entity_check_presenter) { mock(Flapjack::Gateways::API::EntityCheckPresenter) }
+  let(:entity_presenter)       { double(Flapjack::Gateways::API::EntityPresenter) }
+  let(:entity_check_presenter) { double(Flapjack::Gateways::API::EntityCheckPresenter) }
 
-  let(:redis)           { mock(::Redis) }
+  let(:redis)           { double(::Redis) }
 
   before(:all) do
     Flapjack::Gateways::API.class_eval {
@@ -48,7 +48,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
   context 'non-bulk API calls' do
 
     it "returns the status for all checks on an entity" do
-      status = mock('status', :to_json => 'status!'.to_json)
+      status = double('status', :to_json => 'status!'.to_json)
       result = {:entity => entity_name, :check => check, :status => status}
       entity_presenter.should_receive(:status).and_return(result)
 
@@ -72,7 +72,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns the status for a check on an entity" do
-      status = mock('status', :to_json => 'status!'.to_json)
+      status = double('status', :to_json => 'status!'.to_json)
       entity_check_presenter.should_receive(:status).and_return(status)
 
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
@@ -109,7 +109,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of scheduled maintenance periods for an entity" do
-      sched = mock('sched', :to_json => 'sched!'.to_json)
+      sched = double('sched', :to_json => 'sched!'.to_json)
       result = {:entity => entity_name, :check => check, :scheduled_maintenances => sched}
       entity_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(result)
       Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
@@ -126,7 +126,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
       start  = Time.parse('1 Jan 2012')
       finish = Time.parse('6 Jan 2012')
 
-      sched = mock('sched', :to_json => 'sched!'.to_json)
+      sched = double('sched', :to_json => 'sched!'.to_json)
       result = {:entity => entity_name, :check => check, :scheduled_maintenances => sched}
       entity_presenter.should_receive(:scheduled_maintenances).with(start.to_i, finish.to_i).and_return(result)
       Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
@@ -141,7 +141,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of scheduled maintenance periods for a check on an entity" do
-      sched = mock('sched', :to_json => 'sched!'.to_json)
+      sched = double('sched', :to_json => 'sched!'.to_json)
       entity_check_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(sched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
         with(entity_check).and_return(entity_check_presenter)
@@ -171,7 +171,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of unscheduled maintenance periods for an entity" do
-      unsched = mock('unsched', :to_json => 'unsched!'.to_json)
+      unsched = double('unsched', :to_json => 'unsched!'.to_json)
       result = {:entity => entity_name, :check => check, :unscheduled_maintenances => unsched}
       entity_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(result)
       Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
@@ -185,7 +185,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of unscheduled maintenance periods for a check on an entity" do
-      unsched = mock('unsched', :to_json => 'unsched!'.to_json)
+      unsched = double('unsched', :to_json => 'unsched!'.to_json)
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(unsched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
         with(entity_check).and_return(entity_check_presenter)
@@ -203,7 +203,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
       start    = Time.parse('1 Jan 2012')
       finish   = Time.parse('6 Jan 2012')
 
-      unsched = mock('unsched', :to_json => 'unsched!'.to_json)
+      unsched = double('unsched', :to_json => 'unsched!'.to_json)
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(start.to_i, finish.to_i).and_return(unsched)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
         with(entity_check).and_return(entity_check_presenter)
@@ -219,7 +219,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of outages for an entity" do
-      out = mock('out', :to_json => 'out!'.to_json)
+      out = double('out', :to_json => 'out!'.to_json)
       result = {:entity => entity_name, :check => check, :outages => out}
       entity_presenter.should_receive(:outages).with(nil, nil).and_return(result)
       Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
@@ -233,7 +233,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of outages for a check on an entity" do
-      out = mock('out', :to_json => 'out!'.to_json)
+      out = double('out', :to_json => 'out!'.to_json)
       entity_check_presenter.should_receive(:outages).with(nil, nil).and_return(out)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
         with(entity_check).and_return(entity_check_presenter)
@@ -248,7 +248,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of downtimes for an entity" do
-      down = mock('down', :to_json => 'down!'.to_json)
+      down = double('down', :to_json => 'down!'.to_json)
       result = {:entity => entity_name, :check => check, :downtime => down}
       entity_presenter.should_receive(:downtime).with(nil, nil).and_return(result)
       Flapjack::Gateways::API::EntityPresenter.should_receive(:new).
@@ -262,7 +262,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of downtimes for a check on an entity" do
-      down = mock('down', :to_json => 'down!'.to_json)
+      down = double('down', :to_json => 'down!'.to_json)
       entity_check_presenter.should_receive(:downtime).with(nil, nil).and_return(down)
       Flapjack::Gateways::API::EntityCheckPresenter.should_receive(:new).
         with(entity_check).and_return(entity_check_presenter)
@@ -298,7 +298,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
   context 'bulk API calls' do
 
     it "returns the status for all checks on an entity" do
-      status = mock('status')
+      status = double('status')
       result = [{:entity => entity_name, :check => check, :status => status}]
       entity_presenter.should_receive(:status).and_return(result)
 
@@ -321,7 +321,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns the status for a check on an entity" do
-      status = mock('status')
+      status = double('status')
       result = [{:entity => entity_name, :check => check, :status => status}]
       entity_check_presenter.should_receive(:status).and_return(status)
 
@@ -435,7 +435,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     it "deletes scheduled maintenance periods for multiple entity checks" do
       start_time = Time.now + (60 * 60) # an hour from now
 
-      entity_check_2 = mock(Flapjack::Data::EntityCheck)
+      entity_check_2 = double(Flapjack::Data::EntityCheck)
 
       entity_check.should_receive(:end_scheduled_maintenance).with(start_time.to_i)
       entity_check_2.should_receive(:end_scheduled_maintenance).with(start_time.to_i)
@@ -453,7 +453,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of scheduled maintenance periods for an entity" do
-      sm = mock('sched_maint')
+      sm = double('sched_maint')
       result = [{:entity => entity_name, :check => check, :scheduled_maintenances => sm}]
 
       entity_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(result)
@@ -473,7 +473,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
       start  = Time.parse('1 Jan 2012')
       finish = Time.parse('6 Jan 2012')
 
-      sm = mock('sched_maint')
+      sm = double('sched_maint')
       result = [{:entity => entity_name, :check => check, :scheduled_maintenances => sm}]
 
       entity_presenter.should_receive(:scheduled_maintenances).with(start.to_i, finish.to_i).and_return(result)
@@ -491,7 +491,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of scheduled maintenance periods for a check on an entity" do
-      sm = mock('sched_maint')
+      sm = double('sched_maint')
       result = [{:entity => entity_name, :check => check, :scheduled_maintenances => sm}]
 
       entity_check_presenter.should_receive(:scheduled_maintenances).with(nil, nil).and_return(sm)
@@ -511,7 +511,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of unscheduled maintenance periods for an entity" do
-      um = mock('unsched_maint')
+      um = double('unsched_maint')
       result = [{:entity => entity_name, :check => check, :unscheduled_maintenances => um}]
 
       entity_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(result)
@@ -528,7 +528,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of unscheduled maintenance periods for a check on an entity" do
-      um = mock('unsched_maint')
+      um = double('unsched_maint')
       result = [{:entity => entity_name, :check => check, :unscheduled_maintenances => um}]
 
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(nil, nil).and_return(um)
@@ -551,7 +551,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
       start  = Time.parse('1 Jan 2012')
       finish = Time.parse('6 Jan 2012')
 
-      um = mock('unsched_maint')
+      um = double('unsched_maint')
       result = [{:entity => entity_name, :check => check, :unscheduled_maintenances => um}]
 
       entity_check_presenter.should_receive(:unscheduled_maintenances).with(start.to_i, finish.to_i).and_return(um)
@@ -572,22 +572,22 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of outages, for one whole entity and two checks on another entity" do
-      outages_1 = mock('outages_1')
-      outages_2 = mock('outages_2')
-      outages_3 = mock('outages_3')
+      outages_1 = double('outages_1')
+      outages_2 = double('outages_2')
+      outages_3 = double('outages_3')
 
       entity_2_name = 'entity_2'
-      entity_2 = mock(Flapjack::Data::Entity)
+      entity_2 = double(Flapjack::Data::Entity)
 
       result = [{:entity => entity_name,   :check => check, :outages => outages_1},
                 {:entity => entity_2_name, :check => 'foo', :outages => outages_2},
                 {:entity => entity_2_name, :check => 'bar', :outages => outages_3}]
 
-      foo_check = mock(Flapjack::Data::EntityCheck)
-      bar_check = mock(Flapjack::Data::EntityCheck)
+      foo_check = double(Flapjack::Data::EntityCheck)
+      bar_check = double(Flapjack::Data::EntityCheck)
 
-      foo_check_presenter = mock(Flapjack::Gateways::API::EntityCheckPresenter)
-      bar_check_presenter = mock(Flapjack::Gateways::API::EntityCheckPresenter)
+      foo_check_presenter = double(Flapjack::Gateways::API::EntityCheckPresenter)
+      bar_check_presenter = double(Flapjack::Gateways::API::EntityCheckPresenter)
 
       entity_presenter.should_receive(:outages).with(nil, nil).and_return(result[0])
       foo_check_presenter.should_receive(:outages).with(nil, nil).and_return(outages_2)
@@ -617,7 +617,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of outages for a check on an entity" do
-      outages = mock('outages')
+      outages = double('outages')
       result = [{:entity => entity_name, :check => check, :outages => outages}]
 
       entity_check_presenter.should_receive(:outages).with(nil, nil).and_return(outages)
@@ -637,7 +637,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of downtimes for an entity" do
-      downtime = mock('downtime')
+      downtime = double('downtime')
       result = [{:entity => entity_name, :check => check, :downtime => downtime}]
 
       entity_presenter.should_receive(:downtime).with(nil, nil).and_return(result)
@@ -654,7 +654,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
     end
 
     it "returns a list of downtimes for a check on an entity" do
-      downtime = mock('downtime')
+      downtime = double('downtime')
       result = [{:entity => entity_name, :check => check, :downtime => downtime}]
 
       entity_check_presenter.should_receive(:downtime).with(nil, nil).and_return(downtime)
@@ -686,7 +686,7 @@ describe 'Flapjack::Gateways::API::EntityMethods', :sinatra => true, :logger =>
       Flapjack::Data::EntityCheck.should_receive(:for_entity).
         with(entity, check, :redis => redis).and_return(entity_check)
 
-      entity_check_2 = mock(Flapjack::Data::EntityCheck)
+      entity_check_2 = double(Flapjack::Data::EntityCheck)
       entity_check_2.should_receive(:entity).and_return(entity)
       entity_check_2.should_receive(:entity_name).and_return(entity_name)
       entity_check_2.should_receive(:check).and_return('foo')