From e72d55f4016661c73100519b42911a08e9270674 Mon Sep 17 00:00:00 2001 From: deepak Date: Thu, 22 Mar 2018 21:22:06 +0530 Subject: [PATCH 1/2] Fixed test cases for Microsoft Edge --- spec/helpers/custom_matchers.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/helpers/custom_matchers.js b/spec/helpers/custom_matchers.js index 5ad6ec211..948c12580 100644 --- a/spec/helpers/custom_matchers.js +++ b/spec/helpers/custom_matchers.js @@ -191,13 +191,14 @@ beforeEach(function () { /* URL can be like: url(http://localhost:8888/spec/?random=true#composite-chart-clip) + url("http://localhost:8888/spec/?random=true#composite-chart-clip") http://localhost:8888/spec/?random=true#composite-chart-clip http://localhost:8888/spec/##composite-chart-clip */ var cleanURL = function (u) { var matches = u.match(/url\((.*)\)/); if (matches) { - u = matches[1]; + u = matches[1].replace(/"/g, ''); } return u.replace(/\#+/, '#'); }; From eff5bf963902f816d33a43bf8a608e6f90bb1b3e Mon Sep 17 00:00:00 2001 From: deepak Date: Thu, 22 Mar 2018 21:30:17 +0530 Subject: [PATCH 2/2] Enabling cross browser testing in pull requests as well --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c84eb4e2a..ee64ec7cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: node_js node_js: - '8' script: - - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then grunt ci; else grunt ci-pull; fi' + - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then grunt ci; else grunt ci; fi' env: global: - secure: Kt+5IJDJRVwr28xRnmR5YDsJceXDcDR21/JUBfk6DYFixPbIq7LCPnZUmiSZQs8akU95ucXwB5hsirUAdEhXdYKilec6go70lticVlZBLy8IdJ+Di1uPwMOeMHvalC2P0woIRJSMzP8u5E+e+5ASggTjsXID7/p1rE0jXtoOueQ=