flapjack 0.7.2 → 0.7.3

data/spec/lib/flapjack/gateways/api_spec.rb

@@ -393,7 +393,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Entity.should_receive(:add).twice
 
     post "/entities", entities.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 204
   end
 
   it "does not create entities if the data is improperly formatted" do
@@ -419,7 +419,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Entity.should_receive(:add)
 
     post "/entities", entities.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 403
   end
 
   it "creates contacts from a submitted list" do
@@ -442,7 +442,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Contact.should_receive(:add).twice
 
     post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 204
   end
 
   it "does not create contacts if the data is improperly formatted" do
@@ -472,7 +472,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Contact.should_receive(:add)
 
     post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 204
   end
 
   it "updates a contact if it is already present" do
@@ -499,7 +499,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Contact.should_receive(:add).with(contacts['contacts'][0], :redis => redis)
 
     post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 204
   end
 
   it "deletes a contact not found in a bulk update list" do
@@ -520,7 +520,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     Flapjack::Data::Contact.should_receive(:add).with(contacts['contacts'][0], :redis => redis)
 
     post "/contacts", contacts.to_json, {'CONTENT_TYPE' => 'application/json'}
-    last_response.status.should == 200
+    last_response.status.should == 204
   end
 
   it "returns all the contacts" do
@@ -624,8 +624,6 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
 
   it "does not create a notification_rule if a rule id is provided" do
     contact.should_not_receive(:add_notification_rule)
-    Flapjack::Data::Contact.should_receive(:find_by_id).
-      with(contact.id, :redis => redis).and_return(contact)
 
     post "/notification_rules", notification_rule_data.merge(:id => 1).to_json,
       {'CONTENT_TYPE' => 'application/json'}
@@ -646,7 +644,7 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
     }
     notification_rule_data_sym.delete(:contact_id)
 
-    notification_rule.should_receive(:update).with(notification_rule_data_sym)
+    notification_rule.should_receive(:update).with(notification_rule_data_sym).and_return(true)
 
     put "/notification_rules/#{notification_rule.id}", notification_rule_data.to_json,
       {'CONTENT_TYPE' => 'application/json'}
@@ -655,8 +653,6 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
   end
 
   it "does not update a notification rule that's not present" do
-    Flapjack::Data::Contact.should_receive(:find_by_id).
-      with(contact.id, :redis => redis).and_return(contact)
     Flapjack::Data::NotificationRule.should_receive(:find_by_id).
       with(notification_rule.id, :redis => redis).and_return(nil)
 
@@ -665,6 +661,8 @@ describe 'Flapjack::Gateways::API', :sinatra => true, :logger => true, :json =>
   end
 
   it "does not update a notification_rule for a contact that's not present" do
+    Flapjack::Data::NotificationRule.should_receive(:find_by_id).
+      with(notification_rule.id, :redis => redis).and_return(notification_rule)
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with(contact.id, :redis => redis).and_return(nil)
 

data/spec/lib/flapjack/gateways/web_spec.rb

@@ -34,9 +34,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   def expect_stats
-    redis.should_receive(:keys).with('*').and_return(['a', 'b', 'c'])
-    redis.should_receive(:keys).with('check:*:*').and_return([])
-    redis.should_receive(:zcard).with('failed_checks')
+    redis.should_receive(:dbsize).and_return(3)
     redis.should_receive(:keys).with('executive_instance:*').and_return(["executive_instance:foo-app-01"])
     redis.should_receive(:hget).twice.and_return(Time.now.to_i - 60)
     redis.should_receive(:hgetall).twice.and_return({'all' => '8001', 'ok' => '8002'},
@@ -44,6 +42,14 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     redis.should_receive(:llen).with('events')
   end
 
+  def expect_check_stats
+    redis.should_receive(:keys).with('check:*:*').and_return([])
+    redis.should_receive(:zcard).with('failed_checks')
+  end
+
+  def expect_entity_stats
+  end
+
   def expect_entity_check_status(ec)
     time = Time.now.to_i
 
@@ -62,11 +68,8 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   it "shows a page listing all checks" do
     redis.should_receive(:keys).with('*:*:states').and_return(["#{entity_name}:#{check}:states"])
-    redis.should_receive(:keys).with('check:*').and_return(["#{entity_name}:#{check}:states"])
-
-    expect_stats
 
-    redis.should_receive(:zrange).with("failed_checks", 0, -1).and_return([])
+    expect_check_stats
 
     expect_entity_check_status(entity_check)
 
@@ -81,10 +84,9 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
   end
 
   it "shows a page listing failing checks" do
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).twice.and_return(["#{entity_name}:#{check}:states"])
-    redis.should_receive(:keys).with('check:*').and_return(["#{entity_name}:#{check}:states"])
+    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
 
-    expect_stats
+    expect_check_stats
 
     expect_entity_check_status(entity_check)
 
@@ -101,6 +103,8 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     redis.should_receive(:keys).with('check:*').and_return([])
     redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
     expect_stats
+    expect_check_stats
+    expect_entity_stats
 
     get '/self_stats'
     last_response.should be_ok
@@ -113,9 +117,7 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
                           :recovery        => time - (3 * 60 * 60),
                           :acknowledgement => nil }
 
-    expect_stats
-    redis.should_receive(:keys).with('check:*').and_return([])
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return([])
+    expect_check_stats
     entity_check.should_receive(:state).and_return('ok')
     entity_check.should_receive(:last_update).and_return(time - (3 * 60 * 60))
     entity_check.should_receive(:last_change).and_return(time - (3 * 60 * 60))
@@ -235,9 +237,6 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
 
   it "shows a list of all known contacts" do
     Flapjack::Data::Contact.should_receive(:all)
-    redis.should_receive(:keys).with('check:*').and_return([])
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
-    expect_stats
 
     get "/contacts"
     last_response.should be_ok
@@ -249,9 +248,6 @@ describe Flapjack::Gateways::Web, :sinatra => true, :logger => true do
     contact.should_receive(:media).exactly(3).times.and_return({})
     contact.should_receive(:entities).with(:checks => true).and_return([])
     contact.should_receive(:notification_rules).and_return([])
-    redis.should_receive(:keys).with('check:*').and_return([])
-    redis.should_receive(:zrange).with('failed_checks', 0, -1).and_return(["#{entity_name}:#{check}:states"])
-    expect_stats
 
     Flapjack::Data::Contact.should_receive(:find_by_id).
       with('0362', :redis => redis).and_return(contact)

data/spec/lib/flapjack/pikelet_spec.rb

@@ -33,27 +33,6 @@ describe Flapjack::Pikelet do
     pik.start
   end
 
-  it "handles an exception raised by a jabber pikelet" do
-    Flapjack::Logger.should_receive(:new).and_return(logger)
-    logger.should_receive(:fatal)
-
-    config.should_receive(:[]).with('logger').and_return(nil)
-
-    jabber = mock('jabber')
-    jabber.should_receive(:start).and_raise(RuntimeError)
-    jabber.should_receive(:stop)
-    Flapjack::Gateways::Jabber.should_receive(:new).with(:config => config,
-      :redis_config => redis_config, :logger => logger).and_return(jabber)
-
-    fiber.should_receive(:resume)
-    Fiber.should_receive(:new).and_yield.and_return(fiber)
-
-    pik = Flapjack::Pikelet.create('jabber', :config => config,
-      :redis_config => redis_config)
-    pik.should be_a(Flapjack::Pikelet::Generic)
-    pik.start
-  end
-
   it "creates and starts a resque worker gateway" do
     Flapjack::Logger.should_receive(:new).and_return(logger)
 
@@ -85,48 +64,15 @@ describe Flapjack::Pikelet do
     pik.start
   end
 
-
-  it "handles an exception raised by a resque worker gateway" do
-
-    Flapjack::Logger.should_receive(:new).and_return(logger)
-    logger.should_receive(:fatal)
-
-    config.should_receive(:[]).with('logger').and_return(nil)
-    config.should_receive(:[]).with('queue').and_return('email_notif')
-
-    redis = mock('redis')
-    Flapjack::RedisPool.should_receive(:new).and_return(redis)
-    Resque.should_receive(:redis=).with( redis )
-
-    Flapjack::Gateways::Email.should_receive(:instance_variable_set).
-      with('@config', config)
-    Flapjack::Gateways::Email.should_receive(:instance_variable_set).
-      with('@redis_config', redis_config)
-    Flapjack::Gateways::Email.should_receive(:instance_variable_set).
-      with('@logger', logger)
-
-    worker = mock('worker')
-    worker.should_receive(:work).with(0.1).and_raise(RuntimeError)
-    Flapjack::Gateways::Email.should_receive(:start)
-    Flapjack::Gateways::Email.should_receive(:stop)
-    EM::Resque::Worker.should_receive(:new).with('email_notif').and_return(worker)
-
-    fiber.should_receive(:resume)
-    Fiber.should_receive(:new).and_yield.and_return(fiber)
-
-    pik = Flapjack::Pikelet.create('email', :config => config,
-      :redis_config => redis_config)
-    pik.should be_a(Flapjack::Pikelet::Resque)
-    pik.start
-  end
-
   it "creates a thin server gateway" do
     Flapjack::Logger.should_receive(:new).and_return(logger)
 
     config.should_receive(:[]).with('logger').and_return(nil)
     config.should_receive(:[]).with('port').and_return(7654)
+    config.should_receive(:[]).with('timeout').and_return(90)
 
     server = mock('server')
+    server.should_receive(:timeout=).with(90)
     server.should_receive(:start)
     Thin::Server.should_receive(:new).
       with(/^(?:\d{1,3}\.){3}\d{1,3}$/, 7654,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
@@ -551,12 +551,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2332608677203659919
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2332608677203659919
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23