features/rollup.feature in flapjack-1.5.0 vs features/rollup.feature in flapjack-1.6.0rc1

@@ -174,9 +174,55 @@
     And   a critical event is received for check 'ping' on entity 'foo'
     Then  2 sms alerts should be queued for [phone]
     And   1 sms alert of type problem and rollup problem should be queued for [phone]
 
   @time
+  Scenario: Disabling a failing check suppresses 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 should be queued for [phone]
+    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  check 'ping' on entity 'foo' is disabled
+    And   30 minutes passes
+    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: Enabling a failing check promotes 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 should be queued for [phone]
+    Then  1 sms alert of type problem and rollup none should be queued for [phone]
+    When  check 'ping' for entity 'foo' is disabled
+    And   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  2 sms alerts should be queued for [phone]
+    Then  1 sms alert of type problem and rollup none should be queued for [phone]
+    Then  1 sms alert of type problem and rollup recovery should be queued for [phone]
+    When  1 hour passes
+    And   check 'ping' on entity 'foo' is enabled
+    And   5 minutes passes
+    And   a critical event is received for check 'ping' on entity 'foo'
+    Then  3 sms alerts should be queued for [phone]
+    Then  1 sms alert of type problem and rollup none should be queued for [phone]
+    Then  1 sms alert of type problem and rollup recovery should be queued for [phone]
+    And   1 sms alert of type problem and rollup problem 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