diff --git a/.eslintrc.js b/.eslintrc.js index e3e6a37..e033996 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,31 +1,37 @@ module.exports = { - "parser": "typescript-eslint-parser", - "env": { - "browser": true, - "es6": true, - "node": true + 'parser': 'typescript-eslint-parser', + 'globals': { + 'Pretender': true, + 'sinon': true, // karma-sinon }, - "extends": "eslint:recommended", - "parserOptions": { - "ecmaVersion": 2015, - "sourceType": "module" + 'env': { + 'browser': true, + 'es6': true, + 'node': true, + 'jquery': true, + 'qunit': true, }, - "rules": { - "indent": [ - "error", + 'extends': 'eslint:recommended', + 'parserOptions': { + 'ecmaVersion': 2015, + 'sourceType': 'module' + }, + 'rules': { + 'indent': [ + 'error', 2 ], - "linebreak-style": [ - "error", - "unix" + 'linebreak-style': [ + 'error', + 'unix' ], - "quotes": [ - "error", - "single" + 'quotes': [ + 'error', + 'single' ], - "semi": [ - "error", - "always" + 'semi': [ + 'error', + 'always' ] } }; diff --git a/package.json b/package.json index bf06508..c7a2c47 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "tests-only": "karma start --single-run", "tests-only-ci": "karma start --single-run --browsers PhantomJS", "lint": "jshint pretender.js test", - "eslint": "eslint src/*.ts", + "eslint": "eslint src/*.ts test", "test:server": "karma start --no-single-run", "build": "rollup --config" }, diff --git a/test/calling_test.js b/test/calling_test.js index 7b1d3c9..c3f9a2f 100644 --- a/test/calling_test.js +++ b/test/calling_test.js @@ -136,9 +136,7 @@ describe('pretender invoking', function(config) { }); it('adds requests to the list of handled requests', function(assert) { - var params; - this.pretender.get('/some/path', function(request) { - params = request.queryParams; + this.pretender.get('/some/path', function(/*request*/) { }); $.ajax({ url: '/some/path' }); @@ -147,8 +145,8 @@ describe('pretender invoking', function(config) { assert.equal(req.url, '/some/path'); }); - it("increments the handler's request count", function(assert) { - var handler = function(req) {}; + it('increments the handler\'s request count', function(assert) { + var handler = function(/*req*/) {}; this.pretender.get('/some/path', handler); @@ -161,7 +159,7 @@ describe('pretender invoking', function(config) { var done = assert.async(); var json = '{foo: "bar"}'; - this.pretender.get('/some/path', function(req) { + this.pretender.get('/some/path', function(/*req*/) { return [200, {}, json]; }); @@ -182,7 +180,7 @@ describe('pretender invoking', function(config) { var obj = { foo: 'bar' }; this.pretender.prepareBody = JSON.stringify; - this.pretender.get('/some/path', function(req) { + this.pretender.get('/some/path', function(/*req*/) { return [200, {}, obj]; }); @@ -203,7 +201,7 @@ describe('pretender invoking', function(config) { return headers; }; - this.pretender.get('/some/path', function(req) { + this.pretender.get('/some/path', function(/*req*/) { return [200, {}, '']; }); @@ -220,10 +218,10 @@ describe('pretender invoking', function(config) { assert.expect(1); var latestHandlerWasCalled = false; - this.pretender.get('/some/path', function(request) { + this.pretender.get('/some/path', function(/*request*/) { assert.ok(false); }); - this.pretender.get('/some/path', function(request) { + this.pretender.get('/some/path', function(/*request*/) { latestHandlerWasCalled = true; }); $.ajax({ url: '/some/path' }); @@ -235,7 +233,7 @@ describe('pretender invoking', function(config) { ) { var pretender = this.pretender; - pretender.get('/some/path', function(request) { + pretender.get('/some/path', function(/*request*/) { return [200, {}, '']; }); @@ -248,7 +246,7 @@ describe('pretender invoking', function(config) { var done = assert.async(); var val = 'unset'; - this.pretender.get('/some/path', function(request) { + this.pretender.get('/some/path', function(/*request*/) { return [200, {}, '']; }); @@ -269,7 +267,7 @@ describe('pretender invoking', function(config) { this.pretender.get( '/some/path', - function(request) { + function(/*request*/) { return [200, {}, '']; }, false @@ -296,7 +294,7 @@ describe('pretender invoking', function(config) { this.pretender.get( '/some/path', - function(request) { + function(/*request*/) { return [200, {}, '']; }, function() { @@ -336,7 +334,7 @@ describe('pretender invoking', function(config) { this.pretender.get( '/some/path', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 100 @@ -362,7 +360,7 @@ describe('pretender invoking', function(config) { this.pretender.get( '/some/path', - function(request) { + function(/*request*/) { return [200, {}, '']; }, true @@ -391,7 +389,7 @@ describe('pretender invoking', function(config) { it('requiresManualResolution returns true for endpoints configured with `true` for async', function( assert ) { - this.pretender.get('/some/path', function(request) {}, true); + this.pretender.get('/some/path', function(/*request*/) {}, true); this.pretender.get('/some/other/path', function() {}); assert.ok(this.pretender.requiresManualResolution('get', '/some/path')); @@ -408,7 +406,7 @@ describe('pretender invoking', function(config) { var progressEventCount = 0; this.pretender.post( '/uploads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 300 @@ -416,7 +414,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('POST', '/uploads'); - xhr.upload.onprogress = function(e) { + xhr.upload.onprogress = function(/*e*/) { progressEventCount++; }; xhr.onload = function() { @@ -431,14 +429,14 @@ describe('pretender invoking', function(config) { } ); - it("`onprogress` upload events don't keep firing once the request has ended", function( + it('`onprogress` upload events don\'t keep firing once the request has ended', function( assert ) { clock = sinon.useFakeTimers(); var progressEventCount = 0; this.pretender.post( '/uploads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 210 @@ -446,7 +444,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('POST', '/uploads'); - xhr.upload.onprogress = function(e) { + xhr.upload.onprogress = function(/*e*/) { progressEventCount++; }; xhr.send('some data'); @@ -467,7 +465,7 @@ describe('pretender invoking', function(config) { this.pretender.post( '/uploads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 210 @@ -475,7 +473,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('POST', '/uploads'); - xhr.upload.onprogress = function(e) { + xhr.upload.onprogress = function(/*e*/) { progressEventCount++; }; xhr.send('some data'); @@ -497,7 +495,7 @@ describe('pretender invoking', function(config) { var progressEventCount = 0; this.pretender.get( '/downloads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 300 @@ -505,7 +503,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('GET', '/downloads'); - xhr.onprogress = function(e) { + xhr.onprogress = function(/*e*/) { progressEventCount++; }; xhr.onload = function() { @@ -519,14 +517,14 @@ describe('pretender invoking', function(config) { xhr.send('some data'); }); - it("`onprogress` download events don't keep firing once the request has ended", function( + it('`onprogress` download events don\'t keep firing once the request has ended', function( assert ) { clock = sinon.useFakeTimers(); var progressEventCount = 0; this.pretender.get( '/downloads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 210 @@ -534,7 +532,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('GET', '/downloads'); - xhr.onprogress = function(e) { + xhr.onprogress = function(/*e*/) { progressEventCount++; }; xhr.send('some data'); @@ -553,7 +551,7 @@ describe('pretender invoking', function(config) { clock = sinon.useFakeTimers(); this.pretender.get( '/downloads', - function(request) { + function(/*request*/) { return [200, {}, '']; }, 210 @@ -561,7 +559,7 @@ describe('pretender invoking', function(config) { var xhr = new window.XMLHttpRequest(); xhr.open('GET', '/downloads'); - xhr.onprogress = function(e) { + xhr.onprogress = function(/*e*/) { progressEventCount++; }; xhr.send('some data'); @@ -594,7 +592,7 @@ describe('pretender invoking', function(config) { var json = '{foo: "bar"}'; - this.pretender.get('/some/path', function(req) { + this.pretender.get('/some/path', function(/*req*/) { return new Promise(function(resolve) { resolve([200, {}, json]); }); diff --git a/test/creation_test.js b/test/creation_test.js index fcb67df..f6bf86b 100644 --- a/test/creation_test.js +++ b/test/creation_test.js @@ -11,12 +11,10 @@ describe('pretender creation', function(config) { }); it('a mapping function is optional', function(assert) { - var result = false; try { pretender = new Pretender(); - result = true; } catch (e) { - // fail + assert.ok(false); } assert.ok(true, 'does not raise'); diff --git a/test/force_passthrough_test.js b/test/force_passthrough_test.js index d1e46a7..6245f92 100644 --- a/test/force_passthrough_test.js +++ b/test/force_passthrough_test.js @@ -1,4 +1,3 @@ -var originalXMLHttpRequest; var describe = QUnit.module; var it = QUnit.test; @@ -12,11 +11,10 @@ describe('passthrough requests', function(config) { }); it('passthrough request when forcePassthrough is true', function(assert) { - var pretender = this.pretender; var done = assert.async(); var passthroughInvoked = false; - this.pretender.passthroughRequest = function(verb, path, request) { + this.pretender.passthroughRequest = function(verb, path/*, request*/) { passthroughInvoked = true; assert.equal(verb, 'GET'); assert.equal(path, '/some/path'); @@ -36,7 +34,7 @@ describe('passthrough requests', function(config) { var pretender = this.pretender; pretender.forcePassthrough = false; - this.pretender.unhandledRequest = function(verb, path, request) { + this.pretender.unhandledRequest = function(verb, path/*, request*/) { assert.equal(verb, 'GET'); assert.equal(path, '/some/path'); }; diff --git a/test/passthrough_test.js b/test/passthrough_test.js index 5a412d4..67e9541 100644 --- a/test/passthrough_test.js +++ b/test/passthrough_test.js @@ -56,8 +56,8 @@ describe('passthrough requests', function(config) { url: '/some/path', error: function(xhr) { assert.equal(xhr.status, 404); - jQuery = $ = jQuery2; - assert.ok(/^2/.test(jQuery.fn.jquery)); + var _jQuery = jQuery2; + assert.ok(/^2/.test(_jQuery.fn.jquery)); done(); }, }); @@ -77,7 +77,7 @@ describe('passthrough requests', function(config) { this.upload = {}; this.send = { pretender: pretender, - apply: function(xhr, argument) { + apply: function(xhr/*, argument*/) { assert.ok('timeout' in xhr); assert.ok('withCredentials' in xhr); assert.ok('onprogress' in xhr); @@ -113,7 +113,7 @@ describe('passthrough requests', function(config) { this.responseType = ''; this.send = { pretender: pretender, - apply: function(xhr, argument) { + apply: function(xhr/*, argument*/) { assert.equal(xhr.responseType, 'arraybuffer'); this.pretender.resolve(xhr); done(); @@ -143,7 +143,7 @@ describe('passthrough requests', function(config) { this.upload = {}; this.send = { pretender: pretender, - apply: function(xhr, argument) { + apply: function(xhr/*, argument*/) { assert.ok(!('timeout' in xhr)); assert.ok(!('withCredentials' in xhr)); assert.ok(!('onprogress' in xhr)); @@ -311,7 +311,7 @@ describe('passthrough requests', function(config) { this.onload = true; this.send = { pretender: pretender, - apply: function(xhr, argument) { + apply: function(xhr/*, argument*/) { xhr.onload({ target: xhr, type: 'load' }); }, };