Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .travis.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,18 @@ language: node_js
node_js:
- "8"
dist: trusty
addons:
chrome: stable
cache:
directories:
- node_modules
addons:
chrome: stable
sauce_connect: true
before_install:
- npm i -g npm@5.3.0
script:
- npm test
- npm test:ci
env:
global:
- secure: iHuXK1dZnoxh7Jm15eRcAG7qxaMbkhxB7qJuvlYL6sucpYdDWYDmmQxWdbU7BxWFlqq05eyRjQqTK342Z2I7ScsZLGCjW7vUPsluYjx+LKuMN0kHY5ayqur4pX8pgOn+faTzSWfP44R1YO0DTM15idcgu7uMC1KvXdiC6ayrp+U=
- secure: DsLP1gfQVVs8ZGECQl8YcIqXU/ADRoQLEp3tVuKg3suOYcqsJSXmozQajO8ld/PXQZgWODNDfeK0AzaKNVWsVhdflaGbXpE6Gzdr6F+zTkU3Ma0HZ3HPTQP5o9qraGbG5JFKqtHPek/7BeZ4aC6ReY63d846+L2Ev7he5QvSCHE=
48 changes: 48 additions & 0 deletions Gruntfile.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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,
Expand DownExpand Up@@ -229,6 +255,12 @@ module.exports = function(grunt) {
},

connect: {
ci: {
options: {
port: 9999
}
},

test: {
options: {
port: 8000,
Expand DownExpand Up@@ -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');
Expand All@@ -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']);
Expand All@@ -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']);
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,9 @@
<h1>Raven.js - Sentry SDK for JavaScript</h1>
</p>

[![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

Expand Down
14 changes: 10 additions & 4 deletions package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,13 +21,18 @@
"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"
},
"engines": {
"node": "~8.0.0",
"npm": "~5.3.0"
},
"devDependencies": {
"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",
Expand All@@ -42,14 +47,15 @@
"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",
"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"
Expand Down
69 changes: 39 additions & 30 deletions test/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,56 +4,65 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../node_modules/sinon/pkg/sinon.js"></script>
<script>
window.__DEV__ = true;
beforeEach(function() {
window.__DEV__ = true;

beforeEach(function() {
this.sinon = sinon.sandbox.create();
});
});

afterEach(function() {
afterEach(function() {
this.sinon.restore();
});
});
</script>

<!-- Tests -->
<script src="../build/raven.test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function(runner){
var failed = [];

runner.on('fail', function(test, err){
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
});
});
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

runner.on('end', function(){
runner.stats.failed = failed;
if (typeof global !== "undefined") {
global.mochaResults = runner.stats;
}
var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
})(mocha.run());
});

runner.on('end', function () {
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
};
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion test/integration/frame.html
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8">
Expand Down
65 changes: 28 additions & 37 deletions test/integration/index.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,61 +4,52 @@
<title>Raven.js Test Suite</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../node_modules/mocha/mocha.css" />
</head>
<body>
<div id="mocha"></div>

<!-- Mocha -->
<script src="../../node_modules/mocha/mocha.js"></script>
<script src="../../node_modules/chai/chai.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Mocking -->
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script src="../../build/raven.js"></script>
<script>
beforeEach(function() {
this.sinon = sinon.sandbox.create();
var xhr = sinon.useFakeXMLHttpRequest();
window.requests = this.requests = [];

xhr.onCreate = function (xhr) {
requests.push(xhr);
};
});

afterEach(function() {
this.sinon.restore();
});
mocha.ui('bdd');
mocha.reporter('html');
var assert = chai.assert
</script>

<!-- Tests -->
<script src="../../build/raven.js"></script>
<script src="test.js"></script>
</head>
<body>
<div id="mocha"></div>

<script>
(function (runner) {
window.runner = runner;
var failed = [];
window.onload = function () {
var runner = mocha.run();
var failedTests = [];

var flattenTitles = function (test) {
var titles = [];
while (test.parent.title){
titles.push(test.parent.title);
test = test.parent;
}
return titles.reverse();
};

runner.on('fail', function (test, err) {
failed.push({
title: test.title,
fullTitle: test.fullTitle(),
error: {
message: err.message,
stack: err.stack
}
failedTests.push({
name: test.title,
result: false,
message: err.message,
stack: err.stack,
titles: flattenTitles(test)
});
});

runner.on('end', function () {
runner.stats.failed = failed;
window.mochaResults = runner.stats;
window.mochaResults.reports = failedTests;
});
})(mocha.run());
};
</script>
</body>
</html>
2 changes: 2 additions & 0 deletions test/integration/test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,8 @@ function parseUrl(url) {
}

describe('integration', function() {
this.timeout(10000);

beforeEach(function(done) {
this.iframe = createIframe(done);
});
Expand Down
9 changes: 6 additions & 3 deletions test/plugins/react-native.test.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -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://');
});

Expand DownExpand Up@@ -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
Expand All@@ -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
Expand Down
Loading