Skip to content

Commit

Permalink
Merge pull request #1378 from kum-deepak/lint
Browse files Browse the repository at this point in the history
Fixed test cases for Microsoft Edge
  • Loading branch information
gordonwoodhull authored Mar 24, 2018
2 parents acff05b + eff5bf9 commit cdecd4b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
3 changes: 2 additions & 1 deletion spec/helpers/custom_matchers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(/\#+/, '#');
};
Expand Down

0 comments on commit cdecd4b

Please sign in to comment.