Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jest-community/eslint-plugin-jest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v23.13.0
Choose a base ref
...
head repository: jest-community/eslint-plugin-jest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v23.13.1
Choose a head ref
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on May 17, 2020

  1. chore: adjust test names

    @G-Rath
    G-Rath committed May 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f249ee7 View commit details

  2. fix(no-if): use correct syntax for placeholder substitution in message

    @G-Rath
    G-Rath committed May 17, 2020
    Copy the full SHA
    6d1eda8 View commit details

  3. chore(no-if): messageId noConditionalExpect -> conditionalInTest

    @G-Rath
    G-Rath committed May 17, 2020
    Copy the full SHA
    ed341a6 View commit details

  4. chore(release): 23.13.1 [skip ci] 

    ## [23.13.1](v23.13.0...v23.13.1) (2020-05-17)

### Bug Fixes

* **no-if:** use correct syntax for placeholder substitution in message ([6d1eda8](6d1eda8))
    @semantic-release-bot
    semantic-release-bot committed May 17, 2020
    Copy the full SHA
    325ec77 View commit details
Showing with 55 additions and 64 deletions.
  1. +7 −0 CHANGELOG.md
  2. +1 −1 package.json
  3. +43 −59 src/rules/__tests__/no-if.test.ts
  4. +1 −1 src/rules/__tests__/no-test-return-statement.test.ts
  5. +1 −1 src/rules/__tests__/require-top-level-describe.test.ts
  6. +2 −2 src/rules/no-if.ts
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [23.13.1](https://github.com/jest-community/eslint-plugin-jest/compare/v23.13.0...v23.13.1) (2020-05-17)


### Bug Fixes

* **no-if:** use correct syntax for placeholder substitution in message ([6d1eda8](https://github.com/jest-community/eslint-plugin-jest/commit/6d1eda89ac48c93c2675dcf24a92574a20b2edb9))

# [23.13.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.12.0...v23.13.0) (2020-05-16)


2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint-plugin-jest",
"version": "23.13.0",
"version": "23.13.1",
"description": "Eslint rules for Jest",
"keywords": [
"eslint",
102 changes: 43 additions & 59 deletions src/rules/__tests__/no-if.test.ts
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ ruleTester.run('conditional expressions', rule, {
errors: [
{
data: { condition: 'conditional' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -44,7 +44,7 @@ ruleTester.run('conditional expressions', rule, {
errors: [
{
data: { condition: 'conditional' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -57,11 +57,11 @@ ruleTester.run('conditional expressions', rule, {
errors: [
{
data: { condition: 'conditional' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
{
data: { condition: 'conditional' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -187,7 +187,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -198,7 +198,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -209,7 +209,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -220,7 +220,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -231,7 +231,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -242,7 +242,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -253,7 +253,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -264,7 +264,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -275,7 +275,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -286,7 +286,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -297,7 +297,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -308,7 +308,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -319,7 +319,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -332,7 +332,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -341,7 +341,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -358,15 +358,15 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -379,7 +379,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -408,7 +408,7 @@ ruleTester.run('switch statements', rule, {
errors: [
{
data: { condition: 'switch' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -552,30 +552,14 @@ ruleTester.run('if statements', rule, {
},
],
invalid: [
{
code: `
it('foo', () => {
switch (true) {
case true: {
}
}
})
`,
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
},
],
},
{
code: `it('foo', () => {
if('bar') {}
})`,
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -586,7 +570,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -597,7 +581,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -608,7 +592,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -619,7 +603,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -630,7 +614,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -641,7 +625,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -652,7 +636,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -663,7 +647,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -674,7 +658,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -685,7 +669,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -696,7 +680,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -709,7 +693,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -718,7 +702,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -735,15 +719,15 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -756,7 +740,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
@@ -783,7 +767,7 @@ ruleTester.run('if statements', rule, {
errors: [
{
data: { condition: 'if' },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
},
],
},
2 changes: 1 addition & 1 deletion src/rules/__tests__/no-test-return-statement.test.ts
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ const ruleTester = new TSESLint.RuleTester({
parserOptions: { ecmaVersion: 2015 },
});

ruleTester.run('no-test-prefixes', rule, {
ruleTester.run('no-test-return-statement', rule, {
valid: [
'it("noop", function () {});',
'test("noop", () => {});',
2 changes: 1 addition & 1 deletion src/rules/__tests__/require-top-level-describe.test.ts
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ const ruleTester = new TSESLint.RuleTester({
},
});

ruleTester.run('no-standalone-hook', rule, {
ruleTester.run('require-top-level-describe', rule, {
valid: [
'describe("test suite", () => { test("my test") });',
'describe("test suite", () => { it("my test") });',
4 changes: 2 additions & 2 deletions src/rules/no-if.ts
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ export default createRule({
recommended: false,
},
messages: {
noConditionalExpect: 'Test should not contain { condition } statements.',
conditionalInTest: 'Test should not contain {{ condition }} statements.',
},
schema: [],
type: 'suggestion',
@@ -66,7 +66,7 @@ export default createRule({

context.report({
data: { condition: conditionName[node.type] },
messageId: 'noConditionalExpect',
messageId: 'conditionalInTest',
node,
});
}