features/rollup.feature in flapjack-0.7.28 vs features/rollup.feature in flapjack-0.7.29

@@ -175,24 +175,44 @@
     And   1 minute passes
     And   a critical event is received for check 'ping' on entity 'foo'
     Then  1 sms alert of type problem and rollup problem should be queued for [phone]
     And   2 sms alerts should be queued for [phone]
 
-#  @time
-#  Scenario: Contact ceases to be a contact on an entity that they were being alerted for
-#    Given check 'ping' for entity 'foo' is in an ok state
-#    And   check 'ping' for entity 'baz' is in an ok state
-#    When  a critical event is received for check 'ping' on entity 'foo'
-#    And   1 minute passes
-#    And   a critical event is received for check 'ping' on entity 'foo'
-#    Then  1 sms alerts of type problem and rollup none should be queued for [phone]
-#    When  5 minutes passes
-#    And   a critical event is received for check 'ping' on entity 'baz'
-#    And   1 minute passes
-#    And   a critical event is received for check 'ping' on entity 'baz'
-#    Then  1 sms alert of type problem and rollup problem should be queued for [phone]
-#    And   2 sms alerts should be queued for [phone]
-#    When  1 minute passes
-#    And   user 1 ceases to be a contact of entity 'foo'
-#    And   a critical event is received for check 'ping' on entity 'baz'
-#    Then  1 sms alert of rollup recovery should be queued for [phone]
+  @time
+  Scenario: Contact ceases to be a contact on an entity that they were being alerted for
+    Given check 'ping' for entity 'foo' is in an ok state
+    And   check 'ping' for entity 'baz' is in an ok state
+    When  a critical event is received for check 'ping' on entity 'foo'
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  1 sms alerts of type problem and rollup none should be queued for [phone]
+    When  5 minutes passes
+    And   a critical event is received for check 'ping' on entity 'baz'
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'baz'
+    Then  1 sms alert of type problem and rollup problem should be queued for [phone]
+    And   1 sms alerts of type problem and rollup none should be queued for [phone]
+    And   2 sms alerts should be queued for [phone]
+    When  20 minute passes
+    And   user 1 ceases to be a contact of entity 'foo'
+    And   a critical event is received for check 'ping' on entity 'baz'
+    Then  1 sms alert of rollup recovery should be queued for [phone]
+
+  @time
+  Scenario: Test notification to not contribute to rollup
+    Given check 'ping' for entity 'foo' is in an ok state
+    And   check 'ping' for entity 'baz' is in an ok state
+    When  a critical event is received for check 'ping' on entity 'foo'
+    And   1 minute passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  1 sms alert of type problem and rollup none should be queued for [phone]
+    And   1 sms alert should be queued for [phone]
+    When  1 minute passes
+    And   a test event is received for check 'sausage' on entity 'foo'
+    Then  1 sms alert of type problem and rollup none should be queued for [phone]
+    And   1 sms alert of type test and rollup none should be queued for [phone]
+    And   2 sms alerts should be queued for [phone]
+    When  20 minutes passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  2 sms alerts of type problem and rollup none should be queued for [phone]
+    And   3 sms alerts should be queued for [phone]