features/notification_rules.feature in flapjack-0.8.1 vs features/notification_rules.feature in flapjack-0.8.2

@@ -1,24 +1,25 @@
 @notification_rules @resque @processor @notifier
 Feature: Notification rules on a per contact basis
 
   Background:
     Given the following users exist:
-      | id  | first_name | last_name | email             | sms          | timezone         |
-      | c1  | Malak      | Al-Musawi | [e-mail] | [phone] | Asia/Baghdad     |
-      | c2  | Imani      | Farooq    | [e-mail] | [phone] | Europe/Moscow    |
-      | c3  | Vera       | Дурейко   | [e-mail]  | [phone] | Europe/Paris     |
-      | c4  | Lucia      | Moretti   | [e-mail] | [phone] | Europe/Rome      |
-      | c5  | Wang Fang  | Wong      | [e-mail]  | [phone] | Asia/Shanghai    |
+      | id  | first_name | last_name | email             | sms          | timezone            |
+      | c1  | Malak      | Al-Musawi | [e-mail] | [phone] | Asia/Baghdad        |
+      | c2  | Imani      | Farooq    | [e-mail] | [phone] | Europe/Moscow       |
+      | c3  | Vera       | Дурейко   | [e-mail]  | [phone] | Europe/Paris        |
+      | c4  | Lucia      | Moretti   | [e-mail] | [phone] | Europe/Rome         |
+      | c5  | Wang Fang  | Wong      | [e-mail]  | [phone] | Asia/Shanghai       |
+      | c6  | Jive       | Smith     | [e-mail]  | [phone] | America/Los_Angeles |
 
     And the following entities exist:
       | id  | name           | contacts |
       | 1   | foo            | c1       |
       | 2   | bar            | c1,c2,c3 |
       | 3   | baz            | c1,c3    |
       | 4   | buf            | c1,c2,c3 |
-      | 5   | foo-app-01.xyz | c4       |
+      | 5   | foo-app-01.xyz | c4,c6    |
 
     And user c1 has the following notification intervals:
       | email | sms |
       | 15    | 60  |
 
@@ -64,10 +65,15 @@
 
     And user c5 has the following notification rules:
       | unknown_media | critical_media |
       | email         | email, sms     |
 
+    And user c6 has the following notification rules:
+      | entities       | tags            | warning_media | critical_media   |
+      |                |                 |               |                  |
+      | foo-app-01.xyz | check_disk      | email         | email            |
+
   @time_restrictions @time
   Scenario: Alerts only during specified time restrictions
     Given the timezone is Asia/Baghdad
     And   the time is February 1 2013 6:59
     And   the check is check 'ping' on entity 'foo'
@@ -377,9 +383,18 @@
     And   the check is in an ok state
     When  a critical event is received
     And   1 minute passes
     And   a critical event is received
     Then  no sms alerts should be queued for [phone]
+
+  @time
+  Scenario: Don't notify when tags in a rule don't match, but the entity does match
+    Given the check is check 'Memory Util' on entity 'foo-app-01.xyz'
+    And   the check is in an ok state
+    When  a critical event is received
+    And   1 minute passes
+    And   a critical event is received
+    Then  no email alerts should be queued for [e-mail]
 
   @time
   Scenario: Only notify during specified time periods in tag matched rules
     Given the timezone is Europe/Rome
     And   the time is February 1 2013 6:59