basic_tracking.feature in metry-2.1.0

- old
+ new
@@ -18,75 +18,56 @@
     Then there should be 3 tracking events
     
   Scenario: Basic request data is tracked
     When I view "/"
     And I view "/subpage"
-    Then there should be a tracking event "1":
-      | key  | value    |
+    Then tracking event #1 should contain:
       | path | /        |
-      | time | _exists_ |
-    And there should be a tracking event "2":
-      | key  | value    |
+      | created_at | _exists_ |
+    And tracking event #2 should contain:
       | path | /subpage |
-      | time | _exists_ |
+      | created_at | _exists_ |
     
   Scenario: New visitor is tracked
     When I view "/"
     And I view "/subpage"
-    Then there should be a tracking event "1":
-      | key     | value |
-      | visitor | 1     |
-    And there should be a tracking event "2":
-      | key     | value |
-      | visitor | 1     |
-    And there should be a visitor "1"
+    Then there should be a tracking event #1 with visitor #1
+    And there should be a tracking event #2 with visitor #1
+    And there should be a visitor #1
 
   Scenario: Two visitors are tracked
     Given I view "/"
     When I am a new visitor
     Given I view "/"
-    Then there should be a tracking event "1":
-      | key     | value |
-      | visitor | 1     |
-    And there should be a tracking event "2":
-      | key     | value |
-      | visitor | 2     |
+    Then there should be a tracking event #1 with visitor #1
+    Then there should be a tracking event #2 with visitor #2
     And there should be 2 visitors
-    And there should be a visitor "1"
-    And there should be a visitor "2"
       
   Scenario: All facets should be tracked
     When I view "/"
-    Then there should be a tracking event "1":
-      | key  | value       |
-      | path | /           |
-      | time | _exists_    |
-      | ip   | 127.0.0.1   |
-      | host | example.org |
+    Then tracking event #1 should contain:
+      | path | /               |
+      | created_at | _exists_        |
+      | ip   | 127.0.0.1       |
+      | host | www.example.com |
 
   Scenario: path should include query string
     When I view "/?here=there"
-    Then there should be a tracking event "1":
-      | key          | value        |
+    Then tracking event #1 should contain:
       | path | /?here=there |
       
   Scenario: Should track status codes
     When I view "/"
     And I view "/missing"
-    Then there should be a tracking event "1":
-      | key    | value |
+    Then tracking event #1 should contain:
       | status | 200   |
-    Then there should be a tracking event "2":
-      | key    | value |
+    Then tracking event #2 should contain:
       | status | 404   |
 
   Scenario: Should track method
     When I view "/"
     And I post to "/post":
-      | key   | value |
       | bogus | bogus |
-    Then there should be a tracking event "1":
-      | key    | value |
+    Then tracking event #1 should contain:
       | method | GET   |
-    Then there should be a tracking event "2":
-      | key    | value |
+    Then tracking event #2 should contain:
       | method | POST  |