Merge pull request YahooArchive#42 from SOASTA/test-e2e-04-03-query-p…

…aram E2E test 04-page-params/03-custom-dimensions-js.js validates URLQueryParam type Reviewed By: @cvazac
bluesmoon · Apr 23, 2015 · 5434b15 · 5434b15
2 parents b6fccc2 + 108bcd6
commit 5434b15
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 14 deletions.
diff --git a/tests/page-templates/04-page-params/03-custom-dimensions-js.html b/tests/page-templates/04-page-params/03-custom-dimensions-js.html
@@ -74,6 +74,14 @@
                 "label": "cdim.CD7",
                 "dataType": "Boolean",
                 "varName": "custom_dimension_missing"
+            },
+            {
+                "name": "CD8",
+                "index": 8,
+                "type": "URLQueryParam",
+                "label": "cdim.CD8",
+                "dataType": "Boolean",
+                "parameter2": "query"
             }
         ]
     }

diff --git a/tests/page-templates/04-page-params/03-custom-dimensions-js.js b/tests/page-templates/04-page-params/03-custom-dimensions-js.js
@@ -21,12 +21,12 @@ describe("e2e/04-page-params/03-custom-dimensions-js", function() {
 
     it("Should have the custom dimension 3 - JavaScript var Numeric", function() {
         var b = tf.lastBeacon();
-        assert.equal(b["cdim.CD3"], 111);
+        assert.equal(b["cdim.CD3"], "111");
     });
 
     it("Should have the custom dimension 4 - JavaScript function Numeric", function() {
         var b = tf.lastBeacon();
-        assert.equal(b["cdim.CD4"], 222);
+        assert.equal(b["cdim.CD4"], "222");
     });
 
     it("Should have the custom dimension 5 - JavaScript Var Text", function() {
@@ -43,4 +43,9 @@ describe("e2e/04-page-params/03-custom-dimensions-js", function() {
         var b = tf.lastBeacon();
         assert.equal(b["cdim.CD7"], undefined);
     });
+
+    it("Should be missing custom dimension 8 - QueryParam", function() {
+        var b = tf.lastBeacon();
+        assert.equal(b["cdim.CD8"], undefined);
+    });
 });
diff --git a/tests/page-templates/04-page-params/04-custom-dimensions-cookies.html b/tests/page-templates/04-page-params/04-custom-dimensions-cookies.html
@@ -2,18 +2,9 @@
 <%= boomerangSnippet %>
 <script src="04-custom-dimensions-cookies.js" type="text/javascript"></script>
 <script>
-custom_dimension_1 = true;
-custom_dimension_2 = function() {
-    return false;
-}
-custom_dimension_3 = 111;
-custom_dimension_4 = function() {
-    return 222;
-}
-custom_dimension_5 = "abc";
-custom_dimension_6 = function() {
-    return "def";
-}
+
+// Set a cookie.  Note this won't work on localhost or IP tests
+document.cookie = ["cookie_set=true", "path=/", "domain=" + location.hostname].join("; ");
 
 BOOMR_test.init({
     testAfterOnBeacon: true,
@@ -28,6 +19,16 @@
                 "regex": "^(.*)$",
                 "replacement": "$1",
                 "cookieName": "cookie_undefined"
+            },
+            {
+                "name": "CD2",
+                "index": 2,
+                "type": "CookieRegex",
+                "label": "cdim.CD2",
+                "dataType": "Boolean",
+                "regex": "^(.*)$",
+                "replacement": "$1",
+                "cookieName": "cookie_set"
             }
         ]
     }

diff --git a/tests/page-templates/04-page-params/04-custom-dimensions-cookies.js b/tests/page-templates/04-page-params/04-custom-dimensions-cookies.js
@@ -5,6 +5,9 @@ describe("e2e/04-page-params/04-custom-dimensions-cookies", function() {
     var tf = BOOMR.plugins.TestFramework;
     var t = BOOMR_test;
 
+    var dom = location.hostname;
+    var onDomain = !(!dom || dom === "localhost" || dom.match(/\.\d+$/) || dom.match(/^mhtml/) || dom.match(/^file:\//));
+
     it("Should pass basic beacon validation", function(done) {
         t.validateBeaconWasSent(done);
     });
@@ -13,4 +16,18 @@ describe("e2e/04-page-params/04-custom-dimensions-cookies", function() {
         var b = tf.lastBeacon();
         assert.equal(b["cdim.CD1"], undefined);
     });
+
+    it("Should be have custom dimension 2 - Cookie - If running on a domain", function() {
+        if (onDomain) {
+            var b = tf.lastBeacon();
+            assert.equal(b["cdim.CD2"], "true");
+        }
+    });
+
+    it("Should be missing custom dimension 2 - Cookie - If running on localhost or an IP", function() {
+        if (!onDomain) {
+            var b = tf.lastBeacon();
+            assert.equal(b["cdim.CD2"], undefined);
+        }
+    });
 });