From 6fec61b5ebfd1e1f51fe86be230ec1a4188e1602 Mon Sep 17 00:00:00 2001 From: Yasu Flores Date: Thu, 24 Oct 2019 00:49:42 -0700 Subject: [PATCH 1/5] Change syntax to see if build passes --- test/specs/helpers/isURLSameOrigin.spec.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/specs/helpers/isURLSameOrigin.spec.js b/test/specs/helpers/isURLSameOrigin.spec.js index 918bc99cee..1415392621 100644 --- a/test/specs/helpers/isURLSameOrigin.spec.js +++ b/test/specs/helpers/isURLSameOrigin.spec.js @@ -10,7 +10,8 @@ describe('helpers::isURLSameOrigin', function () { }); it('should detect XSS scripts on a same origin request', function () { - expect(() => { isURLSameOrigin('https://github.com/axios/axios?'); }) - .toThrowError(Error, 'URL contains XSS injection attempt') + expect(function() { + isURLSameOrigin('https://github.com/axios/axios?'); + }).toThrowError(Error, 'URL contains XSS injection attempt') }) }); From 2ef37a24d1e63dd8dcf7243447b698da960ca0cd Mon Sep 17 00:00:00 2001 From: Yasu Flores Date: Thu, 24 Oct 2019 00:54:57 -0700 Subject: [PATCH 2/5] Test commit --- test/specs/helpers/isURLSameOrigin.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/specs/helpers/isURLSameOrigin.spec.js b/test/specs/helpers/isURLSameOrigin.spec.js index 1415392621..ab43472636 100644 --- a/test/specs/helpers/isURLSameOrigin.spec.js +++ b/test/specs/helpers/isURLSameOrigin.spec.js @@ -13,5 +13,5 @@ describe('helpers::isURLSameOrigin', function () { expect(function() { isURLSameOrigin('https://github.com/axios/axios?'); }).toThrowError(Error, 'URL contains XSS injection attempt') - }) + }); }); From 6ad762a273f219ed95bf80307a5d829873ba0b3e Mon Sep 17 00:00:00 2001 From: Yasu Flores Date: Thu, 24 Oct 2019 01:04:47 -0700 Subject: [PATCH 3/5] Test with node 10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e12ba8d29c..fe08cc4870 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ services: - xvfb language: node_js node_js: - - node + - 10 email: on_failure: change on_success: never From 119d1a2adbe1b0ea8570895f7e1219e16f26eb23 Mon Sep 17 00:00:00 2001 From: Yasu Flores Date: Thu, 24 Oct 2019 01:18:10 -0700 Subject: [PATCH 4/5] Test adding all browsers in travis --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 5525421d0d..4c316f540f 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -112,7 +112,7 @@ module.exports = function(config) { 'Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. ' + 'Running on Travis.' ); - browsers = ['Firefox']; + browsers = ['Firefox', 'Chrome', 'Safari', 'Opera']; } else { console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.'); browsers = ['Firefox', 'Chrome', 'Safari', 'Opera']; From 675fc7dcb7b7915d8601d8baa9a80a2c49b8aabf Mon Sep 17 00:00:00 2001 From: Yasu Flores Date: Thu, 24 Oct 2019 19:22:43 -0700 Subject: [PATCH 5/5] remove other browsers when running on travis --- karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 4c316f540f..5525421d0d 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -112,7 +112,7 @@ module.exports = function(config) { 'Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. ' + 'Running on Travis.' ); - browsers = ['Firefox', 'Chrome', 'Safari', 'Opera']; + browsers = ['Firefox']; } else { console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.'); browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];