Skip to content

Commit

Permalink
[lint] fix object key spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ljharb
ljharb committed Dec 26, 2019
1 parent 25bcbc6 commit d7c2fd3
Show file tree
Hide file tree
Showing 12 changed files with 89 additions and 88 deletions.
1 change: 1 addition & 0 deletions .eslintrc
View file
Expand Up @@ -2,6 +2,7 @@
"root": true,
"rules": {
"indent": ["error", 4],
"key-spacing": "error",
"semi": ["error", "always"],
"space-before-function-paren": ["error", {
"anonymous": "always",
Expand Down
148 changes: 74 additions & 74 deletions lib/test.js
View file
Expand Up @@ -169,8 +169,8 @@ Test.prototype._end = function (err) {
if (!this._planError && this._plan !== undefined && pendingAsserts) {
this._planError = true;
this.fail('plan != count', {
expected : this._plan,
actual : this.assertCount
expected: this._plan,
actual: this.assertCount
});
}
this.ended = true;
Expand All @@ -181,9 +181,9 @@ Test.prototype._exit = function () {
!this._planError && this.assertCount !== this._plan) {
this._planError = true;
this.fail('plan != count', {
expected : this._plan,
actual : this.assertCount,
exiting : true
expected: this._plan,
actual: this.assertCount,
exiting: true
});
} else if (!this.ended) {
this.fail('test exited without ending', {
Expand Down Expand Up @@ -310,44 +310,44 @@ Test.prototype._assert = function assert(ok, opts) {
if (!self._planError && pendingAsserts < 0) {
self._planError = true;
self.fail('plan != count', {
expected : self._plan,
actual : self._plan - pendingAsserts
expected: self._plan,
actual: self._plan - pendingAsserts
});
}
};

Test.prototype.fail = function (msg, extra) {
this._assert(false, {
message : msg,
operator : 'fail',
extra : extra
message: msg,
operator: 'fail',
extra: extra
});
};

Test.prototype.pass = function (msg, extra) {
this._assert(true, {
message : msg,
operator : 'pass',
extra : extra
message: msg,
operator: 'pass',
extra: extra
});
};

Test.prototype.skip = function (msg, extra) {
this._assert(true, {
message : msg,
operator : 'skip',
skip : true,
extra : extra
message: msg,
operator: 'skip',
skip: true,
extra: extra
});
};

function assert(value, msg, extra) {
this._assert(value, {
message : defined(msg, 'should be truthy'),
operator : 'ok',
expected : true,
actual : value,
extra : extra
message: defined(msg, 'should be truthy'),
operator: 'ok',
expected: true,
actual: value,
extra: extra
});
}
Test.prototype.ok
Expand All @@ -357,11 +357,11 @@ Test.prototype.ok

function notOK(value, msg, extra) {
this._assert(!value, {
message : defined(msg, 'should be falsy'),
operator : 'notOk',
expected : false,
actual : value,
extra : extra
message: defined(msg, 'should be falsy'),
operator: 'notOk',
expected: false,
actual: value,
extra: extra
});
}
Test.prototype.notOk
Expand All @@ -371,10 +371,10 @@ Test.prototype.notOk

function error(err, msg, extra) {
this._assert(!err, {
message : defined(msg, String(err)),
operator : 'error',
actual : err,
extra : extra
message: defined(msg, String(err)),
operator: 'error',
actual: err,
extra: extra
});
}
Test.prototype.error
Expand All @@ -385,11 +385,11 @@ Test.prototype.error

function equal(a, b, msg, extra) {
this._assert(a === b, {
message : defined(msg, 'should be equal'),
operator : 'equal',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should be equal'),
operator: 'equal',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.equal
Expand All @@ -402,11 +402,11 @@ Test.prototype.equal

function notEqual(a, b, msg, extra) {
this._assert(a !== b, {
message : defined(msg, 'should not be equal'),
operator : 'notEqual',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should not be equal'),
operator: 'notEqual',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.notEqual
Expand All @@ -422,11 +422,11 @@ Test.prototype.notEqual

function tapeDeepEqual(a, b, msg, extra) {
this._assert(deepEqual(a, b, { strict: true }), {
message : defined(msg, 'should be equivalent'),
operator : 'deepEqual',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should be equivalent'),
operator: 'deepEqual',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.deepEqual
Expand All @@ -437,11 +437,11 @@ Test.prototype.deepEqual

function deepLooseEqual(a, b, msg, extra) {
this._assert(deepEqual(a, b), {
message : defined(msg, 'should be equivalent'),
operator : 'deepLooseEqual',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should be equivalent'),
operator: 'deepLooseEqual',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.deepLooseEqual
Expand All @@ -451,11 +451,11 @@ Test.prototype.deepLooseEqual

function notDeepEqual(a, b, msg, extra) {
this._assert(!deepEqual(a, b, { strict: true }), {
message : defined(msg, 'should not be equivalent'),
operator : 'notDeepEqual',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should not be equivalent'),
operator: 'notDeepEqual',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.notDeepEqual
Expand All @@ -471,11 +471,11 @@ Test.prototype.notDeepEqual

function notDeepLooseEqual(a, b, msg, extra) {
this._assert(!deepEqual(a, b), {
message : defined(msg, 'should be equivalent'),
operator : 'notDeepLooseEqual',
actual : a,
expected : b,
extra : extra
message: defined(msg, 'should be equivalent'),
operator: 'notDeepLooseEqual',
actual: a,
expected: b,
extra: extra
});
}
Test.prototype.notDeepLooseEqual
Expand All @@ -494,7 +494,7 @@ Test.prototype['throws'] = function (fn, expected, msg, extra) {
try {
fn();
} catch (err) {
caught = { error : err };
caught = { error: err };
if ((err != null) && (!isEnumerable(err, 'message') || !has(err, 'message'))) {
var message = err.message;
delete err.message;
Expand All @@ -514,12 +514,12 @@ Test.prototype['throws'] = function (fn, expected, msg, extra) {
}

this._assert(typeof fn === 'function' && passed, {
message : defined(msg, 'should throw'),
operator : 'throws',
actual : caught && caught.error,
expected : expected,
message: defined(msg, 'should throw'),
operator: 'throws',
actual: caught && caught.error,
expected: expected,
error: !passed && caught && caught.error,
extra : extra
extra: extra
});
};

Expand All @@ -533,15 +533,15 @@ Test.prototype.doesNotThrow = function (fn, expected, msg, extra) {
fn();
}
catch (err) {
caught = { error : err };
caught = { error: err };
}
this._assert(!caught, {
message : defined(msg, 'should not throw'),
operator : 'throws',
actual : caught && caught.error,
expected : expected,
error : caught && caught.error,
extra : extra
message: defined(msg, 'should not throw'),
operator: 'throws',
actual: caught && caught.error,
expected: expected,
error: caught && caught.error,
extra: extra
});
};

Expand Down
2 changes: 1 addition & 1 deletion test/circular-things.js
View file
Expand Up @@ -5,7 +5,7 @@ var concat = require('concat-stream');
var stripFullStack = require('./common').stripFullStack;

tap.test('circular test', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
assert.plan(1);

test.createStream().pipe(concat(function (body) {
Expand Down
6 changes: 3 additions & 3 deletions test/deep-equal-failure.js
View file
Expand Up @@ -8,7 +8,7 @@ var getDiag = common.getDiag;
var stripFullStack = common.stripFullStack;

tap.test('deep equal failure', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down Expand Up @@ -69,7 +69,7 @@ tap.test('deep equal failure', function (assert) {
});

tap.test('deep equal failure, depth 6, with option', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down Expand Up @@ -130,7 +130,7 @@ tap.test('deep equal failure, depth 6, with option', function (assert) {
});

tap.test('deep equal failure, depth 6, without option', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down
2 changes: 1 addition & 1 deletion test/fail.js
View file
Expand Up @@ -8,7 +8,7 @@ var stripFullStack = require('./common').stripFullStack;
tap.test('array test', function (tt) {
tt.plan(1);

var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var tc = function (rows) {
tt.same(stripFullStack(rows.toString('utf8')), [
'TAP version 13',
Expand Down
2 changes: 1 addition & 1 deletion test/has spaces.js
View file
Expand Up @@ -7,7 +7,7 @@ var stripFullStack = require('./common').stripFullStack;
tap.test('array test', function (tt) {
tt.plan(1);

var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var tc = function (rows) {
tt.same(stripFullStack(rows.toString('utf8')), [
'TAP version 13',
Expand Down
2 changes: 1 addition & 1 deletion test/max_listeners.js
View file
Expand Up @@ -3,7 +3,7 @@ var path = require('path');

var ps = spawn(process.execPath, [path.join(__dirname, 'max_listeners', 'source.js')]);

ps.stdout.pipe(process.stdout, { end : false });
ps.stdout.pipe(process.stdout, { end: false });

ps.stderr.on('data', function (buf) {
console.log('not ok ' + buf);
Expand Down
6 changes: 3 additions & 3 deletions test/not-deep-equal-failure.js
View file
Expand Up @@ -8,7 +8,7 @@ var getDiag = common.getDiag;
var stripFullStack = common.stripFullStack;

tap.test('deep equal failure', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down Expand Up @@ -69,7 +69,7 @@ tap.test('deep equal failure', function (assert) {
});

tap.test('not deep equal failure, depth 6, with option', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down Expand Up @@ -130,7 +130,7 @@ tap.test('not deep equal failure, depth 6, with option', function (assert) {
});

tap.test('not deep equal failure, depth 6, without option', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down
2 changes: 1 addition & 1 deletion test/not-equal-failure.js
View file
Expand Up @@ -8,7 +8,7 @@ var getDiag = common.getDiag;
var stripFullStack = common.stripFullStack;

tap.test('not equal failure', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });
var stream = test.createStream();
var parser = tapParser();
assert.plan(3);
Expand Down
2 changes: 1 addition & 1 deletion test/onFailure.js
View file
Expand Up @@ -4,7 +4,7 @@ var tape = require("../").createHarness();
//Because this test passing depends on a failure,
//we must direct the failing output of the inner test
var noop = function () {};
var mockSink = {on:noop, removeListener:noop, emit:noop, end:noop};
var mockSink = {on: noop, removeListener: noop, emit: noop, end: noop};
tape.createStream().pipe(mockSink);

tap.test("on failure", { timeout: 1000 }, function (tt) {
Expand Down
2 changes: 1 addition & 1 deletion test/only-twice.js
View file
Expand Up @@ -2,7 +2,7 @@ var tape = require('../');
var tap = require('tap');

tap.test('only twice error', function (assert) {
var test = tape.createHarness({ exit : false });
var test = tape.createHarness({ exit: false });

test.only("first only", function (t) {
t.end();
Expand Down

0 comments on commit d7c2fd3

Please sign in to comment.