diff options
author | Anthon Pang <apang@softwaredevelopment.ca> | 2013-03-24 08:26:06 +0400 |
---|---|---|
committer | Anthon Pang <apang@softwaredevelopment.ca> | 2013-03-24 08:53:49 +0400 |
commit | 8dc5433e4b9056ad8f6047af73b8db65155ca507 (patch) | |
tree | 8786ac861cf5b4e3cb9275f66cc8c0ed59d81b57 /tests | |
parent | 55b52ef2b6d229662b6337b881a0fe5b77673af9 (diff) |
fix javascript tests (Firefox 20, Safari 6, Chrome 25)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/javascript/index.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/javascript/index.php b/tests/javascript/index.php index 1164072f2d..8e45f0fa94 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -1114,7 +1114,8 @@ if ($sqlite) { || /(EcommerceView).*(&cvar=%7B%223%22%3A%5B%22_pks%22%2C%22SKU%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22NAME%20HERE%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22CATEGORY%20HERE%22%5D%7D)/.test(results), "ecommerce view"); // ecommerce view multiple categories - ok( /(MultipleCategories).*(&cvar=%7B%222%22%3A%5B%22cookiename2PAGE%22%2C%22cookievalue2PAGE%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22%5B%5C%22CATEGORY1%5C%22%2C%5C%22CATEGORY2%5C%22%5D%22%5D%2C%223%22%3A%5B%22_pks%22%2C%22SKUMultiple%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22%22%5D%7D)/.test(results), "ecommerce view multiple categories"); + ok( /(MultipleCategories).*(&cvar=%7B%222%22%3A%5B%22cookiename2PAGE%22%2C%22cookievalue2PAGE%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22%5B%5C%22CATEGORY1%5C%22%2C%5C%22CATEGORY2%5C%22%5D%22%5D%2C%223%22%3A%5B%22_pks%22%2C%22SKUMultiple%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22%22%5D%7D)/.test(results) + || /(MultipleCategories).*(&cvar=%7B%222%22%3A%5B%22cookiename2PAGE%22%2C%22cookievalue2PAGE%22%5D%2C%223%22%3A%5B%22_pks%22%2C%22SKUMultiple%22%5D%2C%224%22%3A%5B%22_pkn%22%2C%22%22%5D%2C%225%22%3A%5B%22_pkc%22%2C%22%5B%5C%22CATEGORY1%5C%22%2C%5C%22CATEGORY2%5C%22%5D%22%5D%7D)/.test(results), "ecommerce view multiple categories"); // Ecommerce order ok( /idgoal=0&ec_id=ORDER%20ID%20YES&revenue=666.66&ec_st=333&ec_tx=222&ec_sh=111&ec_dt=1&ec_items=%5B%5B%22SKU%20PRODUCT%22%2C%22random%22%2C%22random%20PRODUCT%20CATEGORY%22%2C11.1111%2C2%5D%2C%5B%22SKU%20ONLY%20SKU%22%2C%22%22%2C%22%22%2C0%2C1%5D%2C%5B%22SKU%20ONLY%20NAME%22%2C%22PRODUCT%20NAME%202%22%2C%22%22%2C0%2C1%5D%2C%5B%22SKU%20NO%20PRICE%20NO%20QUANTITY%22%2C%22PRODUCT%20NAME%203%22%2C%22CATEGORY%22%2C0%2C1%5D%2C%5B%22SKU%20ONLY%22%2C%22%22%2C%22%22%2C0%2C1%5D%5D/.test( results ), "logEcommerceOrder() with items" ); @@ -1133,11 +1134,11 @@ if ($sqlite) { ok( /testlink/.test( results ), "plugin hook link" ); ok( /testgoal/.test( results ), "plugin hook goal" ); - // Testing the Tracking URL append - ok( /&appended=1&appended2=value/.test( results ), "appendToTrackingUrl(query) function"); + // Testing the Tracking URL append + ok( /&appended=1&appended2=value/.test( results ), "appendToTrackingUrl(query) function"); start(); - }, 4500); + }, 5000); }); '; } |