Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
chore: fix review comments
  • Loading branch information
SimenB committed May 27, 2018
commit a1caa2fcf4fd6fdde6a62aaf1b0df63832163344
2 changes: 1 addition & 1 deletion docs/rules/no-jasmine-globals.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following patterns would not be considered warnings:
jest.setTimeout(5000);

test('my test', () => {
spyOn(some, 'object');
jest.spyOn(some, 'object');
});

test('my test', () => {
Expand Down
42 changes: 23 additions & 19 deletions rules/__tests__/no-jasmine-globals.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'spyOn(some, "object")',
errors: [
{
message: 'Avoid using global `spyOn`, prefer `jest.spyOn`',
message: 'Illegal usage of global `spyOn`, prefer `jest.spyOn`',
column: 1,
line: 1,
},
Expand All @@ -30,7 +30,8 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'spyOnProperty(some, "object")',
errors: [
{
message: 'Avoid using global `spyOnProperty`, prefer `jest.spyOn`',
message:
'Illegal usage of global `spyOnProperty`, prefer `jest.spyOn`',
column: 1,
line: 1,
},
Expand All @@ -41,7 +42,7 @@ ruleTester.run('no-jasmine-globals', rule, {
errors: [
{
message:
'Avoid global `fail`, prefer throwing an error, or the `done` callback',
'Illegal usage of `fail`, prefer throwing an error, or the `done.fail` callback',
column: 1,
line: 1,
},
Expand All @@ -51,7 +52,8 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'pending()',
errors: [
{
message: 'Avoid global `pending`, prefer explicitly skipping a test',
message:
'Illegal usage of `pending`, prefer explicitly skipping a test using `test.skip`',
column: 1,
line: 1,
},
Expand All @@ -61,7 +63,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -72,7 +74,8 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.addMatchers(matchers)',
errors: [
{
message: 'Avoid using `jasmine.addMatchers`, prefer `expect.extend`',
message:
'Illegal usage of `jasmine.addMatchers`, prefer `expect.extend`',
column: 1,
line: 1,
},
Expand All @@ -82,7 +85,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.createSpy()',
errors: [
{
message: 'Avoid using `jasmine.createSpy`, prefer `jest.fn`',
message: 'Illegal usage of `jasmine.createSpy`, prefer `jest.fn`',
column: 1,
line: 1,
},
Expand All @@ -92,7 +95,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.any()',
errors: [
{
message: 'Avoid using `jasmine.any`, prefer `expect.any`',
message: 'Illegal usage of `jasmine.any`, prefer `expect.any`',
column: 1,
line: 1,
},
Expand All @@ -103,7 +106,8 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.anything()',
errors: [
{
message: 'Avoid using `jasmine.anything`, prefer `expect.anything`',
message:
'Illegal usage of `jasmine.anything`, prefer `expect.anything`',
column: 1,
line: 1,
},
Expand All @@ -115,7 +119,7 @@ ruleTester.run('no-jasmine-globals', rule, {
errors: [
{
message:
'Avoid using `jasmine.arrayContaining`, prefer `expect.arrayContaining`',
'Illegal usage of `jasmine.arrayContaining`, prefer `expect.arrayContaining`',
column: 1,
line: 1,
},
Expand All @@ -127,7 +131,7 @@ ruleTester.run('no-jasmine-globals', rule, {
errors: [
{
message:
'Avoid using `jasmine.objectContaining`, prefer `expect.objectContaining`',
'Illegal usage of `jasmine.objectContaining`, prefer `expect.objectContaining`',
column: 1,
line: 1,
},
Expand All @@ -139,7 +143,7 @@ ruleTester.run('no-jasmine-globals', rule, {
errors: [
{
message:
'Avoid using `jasmine.stringMatching`, prefer `expect.stringMatching`',
'Illegal usage of `jasmine.stringMatching`, prefer `expect.stringMatching`',
column: 1,
line: 1,
},
Expand All @@ -150,7 +154,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.getEnv()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -160,7 +164,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.empty()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -170,7 +174,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.falsy()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -180,7 +184,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.truthy()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -190,7 +194,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.arrayWithExactContents()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -200,7 +204,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.clock()',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand All @@ -210,7 +214,7 @@ ruleTester.run('no-jasmine-globals', rule, {
code: 'jasmine.MAX_PRETTY_PRINT_ARRAY_LENGTH = 42',
errors: [
{
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
column: 1,
line: 1,
},
Expand Down
18 changes: 9 additions & 9 deletions rules/no-jasmine-globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = {
if (calleeName === 'spyOn' || calleeName === 'spyOnProperty') {
context.report({
node,
message: `Avoid using global \`${calleeName}\`, prefer \`jest.spyOn\``,
message: `Illegal usage of global \`${calleeName}\`, prefer \`jest.spyOn\``,
});
return;
}
Expand All @@ -27,7 +27,7 @@ module.exports = {
context.report({
node,
message:
'Avoid global `fail`, prefer throwing an error, or the `done` callback',
'Illegal usage of `fail`, prefer throwing an error, or the `done.fail` callback',
});
return;
}
Expand All @@ -36,7 +36,7 @@ module.exports = {
context.report({
node,
message:
'Avoid global `pending`, prefer explicitly skipping a test',
'Illegal usage of `pending`, prefer explicitly skipping a test using `test.skip`',
});
return;
}
Expand All @@ -56,30 +56,30 @@ module.exports = {
return [fixer.replaceText(node.callee.object, 'expect')];
},
node,
message: `Avoid using \`${calleeName}\`, prefer \`expect.${functionName}\``,
message: `Illegal usage of \`${calleeName}\`, prefer \`expect.${functionName}\``,
});
return;
}

if (functionName === 'addMatchers') {
context.report({
node,
message: `Avoid using \`${calleeName}\`, prefer \`expect.extend\``,
message: `Illegal usage of \`${calleeName}\`, prefer \`expect.extend\``,
});
return;
}

if (functionName === 'createSpy') {
context.report({
node,
message: `Avoid using \`${calleeName}\`, prefer \`jest.fn\``,
message: `Illegal usage of \`${calleeName}\`, prefer \`jest.fn\``,
});
return;
}

context.report({
node,
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
});
}
},
Expand All @@ -97,14 +97,14 @@ module.exports = {
];
},
node,
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
});
return;
}

context.report({
node,
message: 'Avoid using jasmine global',
message: 'Illegal usage of jasmine global',
});
}
}
Expand Down