From f4159aff9cf488f9273a39bb62c760ee8df146d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Fri, 1 Sep 2017 15:17:05 +0200 Subject: [PATCH 1/4] ref: Update Mocha, Sinon, Chai and relevant tests --- package.json | 6 +++--- test/integration/test.js | 2 ++ test/plugins/react-native.test.js | 9 ++++++--- test/raven.test.js | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8918ca22de03..2b764c1b3b88 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "bluebird": "^3.4.1", "browserify-versionify": "^1.0.6", "bundle-collapser": "^1.2.1", - "chai": "2.3.0", + "chai": "^4.1.1", "derequire": "2.0.3", "es6-promise": "^4.0.5", "eslint": "^4.6.1", @@ -45,11 +45,11 @@ "grunt-sri": "mattrobenolt/grunt-sri#pretty", "husky": "^0.14.3", "lint-staged": "^4.0.4", - "mocha": "2.5.3", + "mocha": "^3.5.0", "mocha-chrome": "^0.2.1", "prettier": "^1.6.1", "proxyquireify": "^3.0.2", - "sinon": "1.7.3", + "sinon": "^3.2.1", "through2": "^2.0.0", "typescript": "^1.8.10", "whatwg-fetch": "^1.0.0" diff --git a/test/integration/test.js b/test/integration/test.js index 877ef222d214..fe0f88cb2c9b 100644 --- a/test/integration/test.js +++ b/test/integration/test.js @@ -36,6 +36,8 @@ function parseUrl(url) { } describe('integration', function() { + this.timeout(10000); + beforeEach(function(done) { this.iframe = createIframe(done); }); diff --git a/test/plugins/react-native.test.js b/test/plugins/react-native.test.js index 2090079582af..e1b3a0a9788e 100644 --- a/test/plugins/react-native.test.js +++ b/test/plugins/react-native.test.js @@ -172,7 +172,10 @@ describe('React Native plugin', function() { ); assert.equal(lastXhr.method, 'POST'); assert.equal(lastXhr.requestBody, '{"foo":"bar"}'); - assert.equal(lastXhr.requestHeaders['Content-type'], 'application/json'); + assert.equal( + lastXhr.requestHeaders['Content-type'], + 'application/json;charset=utf-8' + ); assert.equal(lastXhr.requestHeaders['Origin'], 'react-native://'); }); @@ -257,7 +260,7 @@ describe('React Native plugin', function() { it('clears persisted errors after they are reported', function() { var payload = {abc: 123}; var callback; - self.sinon.stub(Raven, '_sendProcessedPayload', function(p, cb) { + self.sinon.stub(Raven, '_sendProcessedPayload').callsFake(function(p, cb) { callback = cb; }); reactNativePlugin._restorePayload = self.sinon @@ -276,7 +279,7 @@ describe('React Native plugin', function() { it('does not clear persisted errors if there is an error reporting', function() { var payload = {abc: 123}; var callback; - self.sinon.stub(Raven, '_sendProcessedPayload', function(p, cb) { + self.sinon.stub(Raven, '_sendProcessedPayload').callsFake(function(p, cb) { callback = cb; }); reactNativePlugin._restorePayload = self.sinon diff --git a/test/raven.test.js b/test/raven.test.js index f29ffdaa79e7..46214a01c717 100644 --- a/test/raven.test.js +++ b/test/raven.test.js @@ -1609,6 +1609,8 @@ describe('globals', function() { it('should no-op if CORS is not supported', function() { delete XMLHttpRequest.prototype.withCredentials; + var oldSupportsCORS = sinon.xhr.supportsCORS; + sinon.xhr.supportsCORS = false; var oldXDR = window.XDomainRequest; window.XDomainRequest = undefined; @@ -1623,6 +1625,7 @@ describe('globals', function() { assert.equal(this.requests.length, 1); // the "test" xhr assert.equal(this.requests[0].readyState, 0); + sinon.xhr.supportsCORS = oldSupportsCORS; window.XDomainRequest = oldXDR; }); From e8319b74393e2b53be37adcd75673470bcccee4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Fri, 8 Sep 2017 10:57:08 +0200 Subject: [PATCH 2/4] build: Integrate SauceLabs for automated cross-browser testing - Use grunt-saucelabs to run all the tests - Add README badges for SauceLabs - Update Grunt tasks CI tests --- Gruntfile.js | 48 ++++++++++++++++++++++++++ README.md | 4 ++- package.json | 4 ++- test/index.html | 69 +++++++++++++++++++++---------------- test/integration/frame.html | 2 +- test/integration/index.html | 65 +++++++++++++++------------------- 6 files changed, 122 insertions(+), 70 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 9945fe2ff6ab..203bd1069e6b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -197,6 +197,32 @@ module.exports = function(grunt) { } }, + 'saucelabs-mocha': { + all: { + options: { + urls: [ + 'http://127.0.0.1:9999/test/index.html', + 'http://127.0.0.1:9999/test/integration/index.html' + ], + sauceConfig: { + 'record-video': false, + 'record-screenshots': false + }, + build: process.env.TRAVIS_BUILD_NUMBER, + testname: + 'Raven.js' + + (process.env.TRAVIS_JOB_NUMBER ? ' #' + process.env.TRAVIS_JOB_NUMBER : ''), + browsers: [ + ['macOS 10.12', 'chrome', 'latest'], + ['macOS 10.12', 'firefox', 'latest'], + ['macOS 10.12', 'safari', '10.0'] + ], + public: 'public', + tunnelArgs: ['--verbose'] + } + } + }, + release: { options: { npm: false, @@ -229,6 +255,12 @@ module.exports = function(grunt) { }, connect: { + ci: { + options: { + port: 9999 + } + }, + test: { options: { port: 8000, @@ -301,6 +333,14 @@ module.exports = function(grunt) { grunt.config.set('pkg', pkg); }); + grunt.registerTask('config:ci', 'Verify CI config', function() { + if (!process.env.SAUCE_USERNAME) + console.warn('No SAUCE_USERNAME env variable defined.'); + if (!process.env.SAUCE_ACCESS_KEY) + console.warn('No SAUCE_ACCESS_KEY env variable defined.'); + if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) process.exit(1); + }); + // Grunt contrib tasks grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-clean'); @@ -313,6 +353,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-s3'); grunt.loadNpmTasks('grunt-gitinfo'); grunt.loadNpmTasks('grunt-sri'); + grunt.loadNpmTasks('grunt-saucelabs'); // Build tasks grunt.registerTask('_prep', ['clean', 'gitinfo', 'version']); @@ -335,6 +376,13 @@ module.exports = function(grunt) { grunt.registerTask('build', ['build.plugins-combined']); grunt.registerTask('dist', ['build.core', 'copy:dist']); + grunt.registerTask('test:ci', [ + 'config:ci', + 'build.test', + 'connect:ci', + 'saucelabs-mocha' + ]); + // Webserver tasks grunt.registerTask('run:test', ['connect:test']); grunt.registerTask('run:docs', ['connect:docs']); diff --git a/README.md b/README.md index eb0f625844ab..a0e48d018b16 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,9 @@

Raven.js - Sentry SDK for JavaScript

-[![Build Status](https://travis-ci.org/getsentry/raven-js.svg?branch=master)](https://travis-ci.org/getsentry/raven-js) [![npm](https://img.shields.io/npm/v/raven-js.svg)](https://www.npmjs.com/package/raven-js) [![npm](https://img.shields.io/npm/dm/raven-js.svg)](https://www.npmjs.com/package/raven-js) +[![Sauce Test Status](https://saucelabs.com/buildstatus/kamilsentry)](https://saucelabs.com/u/kamilsentry)[![Build Status](https://travis-ci.org/getsentry/raven-js.svg?branch=master)](https://travis-ci.org/getsentry/raven-js) [![npm](https://img.shields.io/npm/v/raven-js.svg)](https://www.npmjs.com/package/raven-js) [![npm](https://img.shields.io/npm/dm/raven-js.svg)](https://www.npmjs.com/package/raven-js) + +[![Sauce Test Status](https://saucelabs.com/browser-matrix/kamilsentry.svg)](https://saucelabs.com/u/kamilsentry) ## Requirements diff --git a/package.json b/package.json index 2b764c1b3b88..24904327e55d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "test": "npm run lint && grunt build.test && npm run test:unit && npm run test:integration && npm run test:typescript", "test:unit": "mocha-chrome test/index.html", "test:integration": "mocha-chrome test/integration/index.html --chrome-flags '[\"--disable-web-security\"]' --ignore-resource-errors --ignore-exceptions", - "test:typescript": "tsc --noEmit --noImplicitAny typescript/raven-tests.ts" + "test:typescript": "tsc --noEmit --noImplicitAny typescript/raven-tests.ts", + "test:ci": "npm run lint && grunt test:ci" }, "devDependencies": { "bluebird": "^3.4.1", @@ -42,6 +43,7 @@ "grunt-gitinfo": "^0.1.7", "grunt-release": "^0.13.0", "grunt-s3": "0.2.0-alpha.3", + "grunt-saucelabs": "^9.0.0", "grunt-sri": "mattrobenolt/grunt-sri#pretty", "husky": "^0.14.3", "lint-staged": "^4.0.4", diff --git a/test/index.html b/test/index.html index 7f8b0464afe6..b10c158fb44d 100644 --- a/test/index.html +++ b/test/index.html @@ -4,56 +4,65 @@ Raven.js Test Suite - - -
+ + + +
diff --git a/test/integration/frame.html b/test/integration/frame.html index 672bd9b61e8e..99c56ea25c37 100644 --- a/test/integration/frame.html +++ b/test/integration/frame.html @@ -1,4 +1,4 @@ - + diff --git a/test/integration/index.html b/test/integration/index.html index 679ed89f907f..28bda890e572 100644 --- a/test/integration/index.html +++ b/test/integration/index.html @@ -4,61 +4,52 @@ Raven.js Test Suite - - -
+ - - - - - + + + +
From ef8c60f2f7a27b6fb9a170f856294ae6d099d975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Fri, 8 Sep 2017 10:58:53 +0200 Subject: [PATCH 3/4] ci: Integrate SauceLabs with TravisCI --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a678cd782dcb..07395b820bab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,16 @@ language: node_js node_js: - "8" dist: trusty -addons: - chrome: stable cache: directories: - node_modules +addons: + chrome: stable + sauce_connect: true script: - npm test + - npm test:ci +env: + global: + - secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U= + - secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE= From dafd02e77461a074be762b5f90c32d70ebeefbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= Date: Fri, 8 Sep 2017 12:15:12 +0200 Subject: [PATCH 4/4] ci: Lock npm version at 5.3.0 as 5.4.0 breaks SauceLabs --- .travis.yml | 2 ++ package.json | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 07395b820bab..beeee39c18b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ cache: addons: chrome: stable sauce_connect: true +before_install: + - npm i -g npm@5.3.0 script: - npm test - npm test:ci diff --git a/package.json b/package.json index 24904327e55d..3fdd1a1037cb 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,10 @@ "test:typescript": "tsc --noEmit --noImplicitAny typescript/raven-tests.ts", "test:ci": "npm run lint && grunt test:ci" }, + "engines": { + "node": "~8.0.0", + "npm": "~5.3.0" + }, "devDependencies": { "bluebird": "^3.4.1", "browserify-versionify": "^1.0.6",