contact_spec.rb in flapjack-1.2.0rc1

- old
+ new

@@ -1,13 +1,8 @@
 require 'spec_helper'
 
-require 'active_support/time_with_zone'
-require 'ice_cube'
 require 'flapjack/data/contact'
-require 'flapjack/data/entity_check'
-require 'flapjack/data/notification_rule'
-require 'flapjack/data/tag_set'
 
 describe Flapjack::Data::Contact, :redis => true do
 
   let(:notification_rule_data) {
     {:tags               => ["database","physical"],
@@ -22,11 +17,11 @@
     }
   }
 
   let(:general_notification_rule_data) {
     {:entities           => [],
-     :tags               => Flapjack::Data::TagSet.new([]),
+     :tags               => Set.new([]),
      :time_restrictions  => [],
      :unknown_media      => [],
      :warning_media      => ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns'],
      :critical_media     => ['email', 'sms', 'sms_twilio', 'jabber', 'pagerduty', 'sns'],
      :unknown_blackhole  => false,
@@ -191,26 +186,23 @@
     rules = contact.notification_rules
     expect(rules.size).to eq(2)
     expect(rules.select {|r| r.is_specific? }.size).to eq(1)
   end
 
-  it "deletes a contact by id, including linked entities, checks, tags and notification rules" do
+  it "deletes a contact by id, including linked entities, checks and notification rules" do
     contact = Flapjack::Data::Contact.find_by_id('c362', :redis => @redis)
-    contact.add_tags('admin')
 
     entity_name = 'abc-123'
 
     entity = Flapjack::Data::Entity.add({'id'   => '5000',
                                          'name' => entity_name,
                                          'contacts' => ['c362']},
                                          :redis => @redis)
 
     expect {
       expect {
-        expect {
-          contact.delete!
-        }.to change { Flapjack::Data::Contact.all(:redis => @redis).size }.by(-1)
-      }.to change { @redis.smembers('contact_tag:admin').size }.by(-1)
+        contact.delete!
+      }.to change { Flapjack::Data::Contact.all(:redis => @redis).size }.by(-1)
     }.to change { entity.contacts.size }.by(-1)
   end
 
   it "deletes all contacts"
 