flapjack 0.6.39 → 0.6.40

data/spec/lib/flapjack/data/contact_spec.rb

@@ -4,7 +4,7 @@ require 'flapjack/data/contact'
 
 describe Flapjack::Data::Contact, :redis => true do
 
-  it "returns a list of all contacts" do
+  def add_contacts
     Flapjack::Data::Contact.add({'id'         => '362',
                                  'first_name' => 'John',
                                  'last_name'  => 'Johnson',
@@ -15,21 +15,21 @@ describe Flapjack::Data::Contact, :redis => true do
                                  'last_name'  => 'Janeley',
                                  'email'      => 'janej@example.com'},
                                  :redis       => @redis)
+  end
+
+  it "returns a list of all contacts" do
+    add_contacts
 
     contacts = Flapjack::Data::Contact.all(:redis => @redis)
     contacts.should_not be_nil
     contacts.should be_an(Array)
     contacts.should have(2).contacts
-    contacts[0].id.should == '362'
-    contacts[1].id.should == '363'
+    contacts[0].name.should == 'Jane Janeley'
+    contacts[1].name.should == 'John Johnson'
   end
 
   it "finds a contact by id" do
-    Flapjack::Data::Contact.add({'id'         => '362',
-                                 'first_name' => 'John',
-                                 'last_name'  => 'Johnson',
-                                 'email'      => 'johnj@example.com' },
-                                 :redis       => @redis)
+    add_contacts
 
     contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
     contact.should_not be_nil
@@ -38,7 +38,15 @@ describe Flapjack::Data::Contact, :redis => true do
 
   it "finds all contacts for a check on an entity"
 
-  it "deletes all contacts"
+  it "deletes all contacts" do
+    add_contacts
+
+    Flapjack::Data::Contact.delete_all(:redis => @redis)
+    contact = Flapjack::Data::Contact.find_by_id('362', :redis => @redis)
+    contact.should be_nil
+    contact = Flapjack::Data::Contact.find_by_id('363', :redis => @redis)
+    contact.should be_nil
+  end
 
   it "returns pagerduty credentials for a contact"
 

data/spec/lib/flapjack/data/entity_check_spec.rb

@@ -214,31 +214,6 @@ describe Flapjack::Data::EntityCheck, :redis => true do
 
   end
 
-  it "creates an event" do
-    ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
-    t = Time.now.to_i
-    ec.create_event('type'    => 'service',
-                    'state'   => 'ok',
-                    'summary' => 'everything checked out',
-                    'time'    => t)
-    event_json = @redis.rpop('events')
-    event_json.should_not be_nil
-    event = nil
-    expect {
-      event = JSON.parse(event_json)
-    }.not_to raise_error
-    event.should_not be_nil
-    event.should be_a(Hash)
-    event.should == {
-      'entity'  => name,
-      'check'   => check,
-      'type'    => 'service',
-      'state'   => 'ok',
-      'summary' => 'everything checked out',
-      'time'    => t
-    }
-  end
-
   it "creates an acknowledgement" do
     ec = Flapjack::Data::EntityCheck.for_entity_name(name, check, :redis => @redis)
     t = Time.now.to_i

data/spec/lib/flapjack/data/entity_spec.rb

@@ -35,6 +35,10 @@ describe Flapjack::Data::Entity, :redis => true do
   end
 
   it "returns a list of all entities" do
+
+    pending "Broken with redis 2.6, which changes the default ordering. " +
+    "I have a fix for this in another branch, will handle on merge."
+
     Flapjack::Data::Entity.add({'id'   => '5000',
                                 'name' => name},
                                 :redis => @redis)

data/spec/lib/flapjack/data/global_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/data/global'
+
+describe Flapjack::Data::Global do
+
+end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/data/message'
+
+describe Flapjack::Data::Message do
+
+end

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

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'flapjack/data/notification'
+
+describe Flapjack::Data::Notification do
+
+end

data/spec/lib/flapjack/executive_spec.rb

@@ -11,7 +11,6 @@ describe Flapjack::Executive, :redis => true do
     redis.should_receive(:rpush).with('events', %q{{"type":"shutdown","host":"","service":"","state":""}})
 
     executive = Flapjack::Executive.new
-    executive.bootstrap(:redis => @redis)
     executive.add_shutdown_event(:redis => redis)
   end
 
@@ -35,14 +34,15 @@ describe Flapjack::Executive, :redis => true do
     Flapjack::Data::Event.should_receive(:next).and_return(shutdown_evt)
 
     executive = Flapjack::Executive.new
+    Flapjack::RedisPool.should_receive(:new).and_return(@redis)
     executive.bootstrap(:config => {})
     @redis.should_receive(:empty!)
-    executive.should_receive(:build_redis_connection_pool).and_return(@redis)
 
     # hacky, but the behaviour it's mimicking (shutdown from another thread) isn't
     # conducive to nice tests
     executive.stub(:should_quit?).and_return(false, true)
     executive.main
+    executive.cleanup
 
     # TODO these will need to be made relative to the running instance,
     # and a list of the running instances maintained somewhere

data/spec/lib/flapjack/jabber_spec.rb

@@ -15,17 +15,12 @@ describe Flapjack::Jabber do
 
   let(:stanza) { mock('stanza') }
 
-  it "is initialized" do
-    fj = Flapjack::Jabber.new
-    fj.should_not be_nil
-  end
-
   it "hooks up event handlers to the appropriate methods" do
     Socket.should_receive(:gethostname).and_return('thismachine')
 
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
-    fj.should_receive(:build_redis_connection_pool)
 
     EventMachine::Synchrony.should_receive(:next_tick).exactly(4).times.and_yield
 
@@ -46,10 +41,9 @@ describe Flapjack::Jabber do
 
   it "joins a chat room after connecting" do
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new).twice
     fj.bootstrap(:config => config)
 
-    fj.should_receive(:build_redis_connection_pool)
-
     fj.should_receive(:connected?).and_return(true)
     fj.should_receive(:write).with(an_instance_of(Blather::Stanza::Presence))
     fj.should_receive(:write).with(an_instance_of(Blather::Stanza::Message))
@@ -79,6 +73,7 @@ describe Flapjack::Jabber do
       and_return(entity_check)
 
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
     fj.instance_variable_set('@redis_handler', redis)
 
@@ -95,6 +90,7 @@ describe Flapjack::Jabber do
     stanza.should_receive(:from).and_return(from)
 
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
     fj.should_receive(:connected?).and_return(true)
@@ -105,6 +101,7 @@ describe Flapjack::Jabber do
 
   it "reconnects when disconnected (if not quitting)" do
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
     EventMachine::Timer.should_receive(:new).with(1).and_yield
@@ -119,6 +116,7 @@ describe Flapjack::Jabber do
     redis.should_receive(:rpush).with('jabber_notifications', %q{{"notification_type":"shutdown"}})
 
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new)
     fj.bootstrap(:config => config)
 
     fj.add_shutdown_event(:redis => redis)
@@ -136,8 +134,8 @@ describe Flapjack::Jabber do
     redis.should_receive(:empty!)
 
     fj = Flapjack::Jabber.new
+    Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fj.bootstrap(:config => config)
-    fj.should_receive(:build_redis_connection_pool).and_return(redis)
     fj.should_receive(:register_handler).exactly(4).times
 
     fj.should_receive(:connect)
@@ -153,6 +151,7 @@ describe Flapjack::Jabber do
     fj.should_receive(:close)
 
     fj.main
+    fj.cleanup
   end
 
 end

data/spec/lib/flapjack/pagerduty_spec.rb

@@ -12,17 +12,19 @@ describe Flapjack::Pagerduty, :redis => true do
 
   it "prompts the blocking redis connection to quit" do
     redis = mock('redis')
-    redis.should_receive(:rpush).with(nil, %q{{"notification_type":"shutdown"}})
+    redis.should_receive(:rpush).with(config['queue'], %q{{"notification_type":"shutdown"}})
 
-    pagerduty = Flapjack::Pagerduty.new
-    pagerduty.bootstrap
-    pagerduty.add_shutdown_event(:redis => redis)
+    fp = Flapjack::Pagerduty.new
+    Flapjack::RedisPool.should_receive(:new)
+    fp.bootstrap(:config => config)
+    fp.add_shutdown_event(:redis => redis)
   end
 
   it "doesn't look for acknowledgements if this search is already running" do
     @redis.set(Flapjack::Pagerduty::SEM_PAGERDUTY_ACKS_RUNNING, 'true')
 
     fp = Flapjack::Pagerduty.new
+    Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
     fp.instance_variable_set("@redis_timer", @redis)
 
@@ -32,6 +34,7 @@ describe Flapjack::Pagerduty, :redis => true do
 
   it "looks for acknowledgements if the search is not already running" do
     fp = Flapjack::Pagerduty.new
+    Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
     fp.instance_variable_set("@redis_timer", @redis)
 
@@ -45,33 +48,34 @@ describe Flapjack::Pagerduty, :redis => true do
 
   # NB: needs to run in synchrony block to catch the evented HTTP requests
   it "looks for acknowledgements via the PagerDuty API" do
+    check = 'PING'
+    Time.should_receive(:now).and_return(time)
+    since = (time.utc - (60*60*24*7)).iso8601 # the last week
+    unt   = (time.utc + (60*60*24)).iso8601   # 1 day in the future
+
+    response = {"incidents" =>
+      [{"incident_number" => 12,
+        "status" => "acknowledged",
+        "last_status_change_by" => {"id"=>"ABCDEFG", "name"=>"John Smith",
+                                    "email"=>"johns@example.com",
+                                    "html_url"=>"http://flpjck.pagerduty.com/users/ABCDEFG"}
+       }
+      ],
+      "limit"=>100,
+      "offset"=>0,
+      "total"=>1}
+
+    stub_request(:get, "https://flpjck.pagerduty.com/api/v1/incidents?" +
+      "fields=incident_number,status,last_status_change_by&incident_key=#{check}&" +
+      "since=#{since}&status=acknowledged&until=#{unt}").
+       with(:headers => {'Authorization'=>['flapjack', 'password123']}).
+       to_return(:status => 200, :body => response.to_json, :headers => {})
+
     EM.synchrony do
       fp = Flapjack::Pagerduty.new
+      Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 
-      check = 'PING'
-      Time.should_receive(:now).and_return(time)
-      since = (time.utc - (60*60*24*7)).iso8601 # the last week
-      unt   = (time.utc + (60*60*24)).iso8601   # 1 day in the future
-
-      response = {"incidents" =>
-        [{"incident_number" => 12,
-          "status" => "acknowledged",
-          "last_status_change_by" => {"id"=>"ABCDEFG", "name"=>"John Smith",
-                                      "email"=>"johns@example.com",
-                                      "html_url"=>"http://flpjck.pagerduty.com/users/ABCDEFG"}
-         }
-        ],
-        "limit"=>100,
-        "offset"=>0,
-        "total"=>1}
-
-      stub_request(:get, "https://flpjck.pagerduty.com/api/v1/incidents?" +
-        "fields=incident_number,status,last_status_change_by&incident_key=#{check}&" +
-        "since=#{since}&status=acknowledged&until=#{unt}").
-         with(:headers => {'Authorization'=>['flapjack', 'password123']}).
-         to_return(:status => 200, :body => response.to_json, :headers => {})
-
       result = fp.send(:pagerduty_acknowledged?, 'subdomain' => 'flpjck', 'username' => 'flapjack',
         'password' => 'password123', 'check' => check)
 
@@ -86,6 +90,7 @@ describe Flapjack::Pagerduty, :redis => true do
 
   it "creates acknowledgements when pagerduty acknowledgements are found" do
     fp = Flapjack::Pagerduty.new
+    Flapjack::RedisPool.should_receive(:new)
     fp.bootstrap(:config => config)
 
     entity_check = mock('entity_check')
@@ -115,8 +120,8 @@ describe Flapjack::Pagerduty, :redis => true do
     redis.should_receive(:empty!)
 
     fp = Flapjack::Pagerduty.new
+    Flapjack::RedisPool.should_receive(:new).and_return(redis)
     fp.bootstrap(:config => config)
-    fp.should_receive(:build_redis_connection_pool).and_return(redis)
 
     fp.should_receive(:should_quit?).exactly(3).times.and_return(false, false, true)
     redis.should_receive(:blpop).twice.and_return(
@@ -128,21 +133,22 @@ describe Flapjack::Pagerduty, :redis => true do
     fp.should_receive(:send_pagerduty_event)
 
     fp.main
+    fp.cleanup
   end
 
   it "tests the pagerduty connection" do
-    EM.synchrony do
+    evt = { "service_key"  => "11111111111111111111111111111111",
+            "incident_key" => "Flapjack is running a NOOP",
+            "event_type"   => "nop",
+            "description"  => "I love APIs with noops." }
+    body = evt.to_json
 
-      evt = { "service_key"  => "11111111111111111111111111111111",
-              "incident_key" => "Flapjack is running a NOOP",
-              "event_type"   => "nop",
-              "description"  => "I love APIs with noops." }
-
-      body = evt.to_json
-      stub_request(:post, "https://events.pagerduty.com/generic/2010-04-15/create_event.json").
-        with(:body => body).to_return(:status => 200, :body => '{"status":"success"}', :headers => {})
+    stub_request(:post, "https://events.pagerduty.com/generic/2010-04-15/create_event.json").
+      with(:body => body).to_return(:status => 200, :body => '{"status":"success"}', :headers => {})
 
+    EM.synchrony do
       fp = Flapjack::Pagerduty.new
+      Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 
       ret = fp.send(:test_pagerduty_connection)
@@ -153,17 +159,19 @@ describe Flapjack::Pagerduty, :redis => true do
   end
 
   it "sends an event to pagerduty" do
-    EM.synchrony do
+    evt = {"service_key"  => "abcdefg",
+           "incident_key" => "Flapjack test",
+           "event_type"   => "nop",
+           "description"  => "Not really sent anyway"}
+    body = evt.to_json
 
-      evt = {"service_key"  => "abcdefg",
-             "incident_key" => "Flapjack test",
-             "event_type"   => "nop",
-             "description"  => "Not really sent anyway"}
-      body = evt.to_json
-      stub_request(:post, "https://events.pagerduty.com/generic/2010-04-15/create_event.json").
-        with(:body => body).to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:post, "https://events.pagerduty.com/generic/2010-04-15/create_event.json").
+      with(:body => body).to_return(:status => 200, :body => "", :headers => {})
+
+    EM.synchrony do
 
       fp = Flapjack::Pagerduty.new
+      Flapjack::RedisPool.should_receive(:new)
       fp.bootstrap(:config => config)
 
       ret = fp.send(:send_pagerduty_event, evt)

data/spec/lib/flapjack/utility_spec.rb

@@ -0,0 +1,55 @@
+
+require 'spec_helper'
+require 'flapjack/utility'
+
+describe Flapjack::Utility do
+
+  context "relative time ago" do
+
+    # ported from sinatra_more tests for the method
+    include Flapjack::Utility
+
+    let(:time) { Time.new }
+
+    before(:each) do
+      Time.should_receive(:now).and_return(time)
+    end
+
+    it 'displays now as a minute ago' do
+      'about a minute'.should == relative_time_ago(time - 60)
+    end
+    it "displays a few minutes ago" do
+      '4 minutes'.should == relative_time_ago(time - (4 * 60))
+    end
+    it "displays an hour ago" do
+      'about 1 hour'.should == relative_time_ago(time - (65 * 60))
+    end
+    it "displays a few hours ago" do
+      'about 3 hours'.should == relative_time_ago(time - (185 * 60))
+    end
+    it "displays a day ago" do
+      '1 day'.should == relative_time_ago(time - (24 * 60 * 60))
+    end
+    it "displays about 2 days ago" do
+      'about 2 days'.should == relative_time_ago(time - (2 * 24 * 60 * 60) + (5 * 60))
+    end
+    it "displays a few days ago" do
+      '5 days'.should == relative_time_ago(time - (5 * 24 * 60 * 60) - (5 * 60))
+    end
+    it "displays a month ago" do
+      'about 1 month'.should == relative_time_ago(time - (32 * 24 * 60 * 60) - (5 * 60))
+    end
+    it "displays a few months ago" do
+      '6 months'.should == relative_time_ago(time - (180 * 24 * 60 * 60) - (5 * 60))
+    end
+    it "displays a year ago" do
+      'about 1 year'.should == relative_time_ago(time - (365 * 24 * 60 * 60) - (5 * 60))
+    end
+    it "displays a few years ago" do
+      'over 7 years'.should == relative_time_ago(time - (2800 * 24 * 60 * 60) + (5 * 60))
+    end
+
+  end
+
+end
+