Skip to content

Commit

Permalink
update to eslint-config-hapi@10.x.x (#619)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjihrig authored and geek committed Aug 14, 2016
1 parent 06b57f9 commit a1a7c27
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ module.exports = [

// Make sure to only transform your code or the dependencies you want
if (filename.indexOf('node_modules') === -1) {
const result = Babel.transform(content, { sourceMap: 'inline', filename: filename, sourceFileName: filename });
const result = Babel.transform(content, { sourceMap: 'inline', filename, sourceFileName: filename });
return result.code;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/coverage.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ internals.instrument = function (filename) {

const id = ++ids;
statements.push({
id: id,
id,
loc: node.loc,
line: line,
line,
bool: bool && node.type !== 'ConditionalExpression' && node.type !== 'LogicalExpression'
});
return id;
Expand Down
20 changes: 10 additions & 10 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ internals.experiment = function (title /*, options, fn */) {
const settings = Utils.mergeOptions(this._current.options, options, ['only']);

const child = {
title: title,
title,
parent: this._current,
experiments: [],
tests: [],
Expand Down Expand Up @@ -139,8 +139,8 @@ internals.before = function (/* options, */ fn) {

const before = {
title: 'Before ' + this._titles.join(' '),
fn: fn,
options: options
fn,
options
};

this._current.befores = this._current.befores || [];
Expand All @@ -157,8 +157,8 @@ internals.after = function (/* options, */ fn) {

const after = {
title: 'After ' + this._titles.join(' '),
fn: fn,
options: options
fn,
options
};

this._current.afters = this._current.afters || [];
Expand All @@ -175,8 +175,8 @@ internals.beforeEach = function (/* options, */ fn) {

const beforeEach = {
title: 'Before each ' + this._titles.join(' '),
fn: fn,
options: options
fn,
options
};

this._current.beforeEaches = this._current.beforeEaches || [];
Expand All @@ -193,8 +193,8 @@ internals.afterEach = function (/* options, */ fn) {

const afterEach = {
title: 'After each ' + this._titles.join(' '),
fn: fn,
options: options
fn,
options
};

this._current.afterEaches = this._current.afterEaches || [];
Expand All @@ -213,7 +213,7 @@ internals.test = function (title /*, options, fn */) {
path: this._path,
title: this._titles.concat(title).join(' '),
relativeTitle: title,
fn: fn,
fn,
options: settings
};

Expand Down
2 changes: 1 addition & 1 deletion lib/reporters/json.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internals.Reporter.prototype.end = function (notebook) {
});

const report = {
tests: tests,
tests,
duration: notebook.ms,
leaks: notebook.leaks
};
Expand Down
8 changes: 4 additions & 4 deletions lib/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ exports.execute = function (scripts, options, reporter, callback) {
grep: settings.grep ? new RegExp(settings.grep) : null
};

const count = internals.count(experiments, { filters: filters }); // Sets test.id
reporter.start({ count: count });
const count = internals.count(experiments, { filters }); // Sets test.id
reporter.start({ count });

const startTime = Date.now();
const state = {
Expand All @@ -181,8 +181,8 @@ exports.execute = function (scripts, options, reporter, callback) {
failures: 0,
errors: []
},
reporter: reporter,
filters: filters,
reporter,
filters,
options: settings,
only: onlyNode
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"bossy": "3.x.x",
"diff": "2.x.x",
"eslint": "3.0.x",
"eslint-config-hapi": "9.x.x",
"eslint-config-hapi": "10.x.x",
"eslint-plugin-hapi": "4.x.x",
"espree": "3.x.x",
"find-rc": "3.0.x",
Expand Down
4 changes: 2 additions & 2 deletions test/coverage.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('Coverage', () => {
if (line.miss) {
missedLines.push({
filename: line.originalFilename,
lineNumber: lineNumber,
lineNumber,
originalLineNumber: line.originalLine
});
}
Expand Down Expand Up @@ -113,7 +113,7 @@ describe('Coverage', () => {
if (line.miss) {
missedLines.push({
filename: line.originalFilename,
lineNumber: lineNumber,
lineNumber,
originalLineNumber: line.originalLine
});
}
Expand Down
4 changes: 2 additions & 2 deletions test/reporters.js
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@ describe('Reporter', () => {
});
});

Lab.report(script, { reporter: reporter, output: false }, (err, code, output) => {
Lab.report(script, { reporter, output: false }, (err, code, output) => {

expect(err).to.not.exist();
done();
Expand All @@ -2137,7 +2137,7 @@ describe('Reporter', () => {
});
});

Lab.report(script, { reporter: reporter, output: false }, (err, code, output) => {
Lab.report(script, { reporter, output: false }, (err, code, output) => {

expect(err).to.not.exist();
done();
Expand Down

0 comments on commit a1a7c27

Please sign in to comment.