Skip to content

Commit

Permalink
Merge 2f24b7a into fce1e12
Browse files Browse the repository at this point in the history
  • Loading branch information
@platinumazure
platinumazure committed Aug 25, 2021
2 parents fce1e12 + 2f24b7a commit cf6c739
Show file tree
Hide file tree
Showing 9 changed files with 2,969 additions and 3,160 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu, windows ]
node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
node-version: [12.x, 14.x, 16.x]

steps:
- uses: actions/checkout@v2
Expand All @@ -28,7 +28,6 @@ jobs:
- run: npm ci
- run: npm test
- run: npm run update && git diff --exit-code
- run: npm install --save-dev eslint@6 --save-dev eslint-plugin-unicorn@19 --save-dev eslint-plugin-mocha@6 && npm run unit-test

- name: Coveralls
uses: coverallsapp/github-action@master
Expand Down
6,024 changes: 2,917 additions & 3,107 deletions package-lock.json
View file

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@
"requireindex": "^1.2.0"
},
"devDependencies": {
"@typescript-eslint/parser": "^4.23.0",
"@typescript-eslint/parser": "^4.29.3",
"all-contributors-cli": "^6.20.0",
"chai": "^4.3.4",
"coveralls": "^3.1.0",
"eslint": "^7.26.0",
"coveralls": "^3.1.1",
"eslint": "^7.32.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-eslint-plugin": "^2.3.0",
"eslint-plugin-markdown": "^2.1.0",
"eslint-plugin-mocha": "^8.1.0",
"eslint-plugin-eslint-plugin": "^3.5.3",
"eslint-plugin-markdown": "^2.2.0",
"eslint-plugin-mocha": "^9.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-unicorn": "^30.0.0",
"markdownlint-cli": "^0.27.1",
"mocha": "^8.4.0",
"markdownlint-cli": "^0.28.1",
"mocha": "^9.1.0",
"mocha-lcov-reporter": "^1.3.0",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"outdent": "^0.8.0",
"semver": "^7.3.4",
"shelljs": "^0.8.4",
"typescript": "^4.2.3"
"typescript": "^4.3.5"
},
"peerDepencencies": {
"eslint": ">=6.0.0 <8.0.0"
"eslint": ">=7.0.0 <8.0.0"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -79,6 +79,6 @@
},
"homepage": "https://github.com/platinumazure/eslint-plugin-qunit",
"engines": {
"node": "10.x || 12.x || >=14.0.0"
"node": "12.x || 14.x || >=16.0.0"
}
}
8 changes: 4 additions & 4 deletions tests/lib/rules/no-assert-equal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ruleTester.run("no-assert-equal", rule, {
},
{
code: "QUnit.test('Name', function (assert) { equal(a, b); });",
globals: { equal: true },
errors: [{
messageId: "unexpectedGlobalEqual",
suggestions: [
Expand All @@ -103,11 +104,11 @@ ruleTester.run("no-assert-equal", rule, {
output: "QUnit.test('Name', function (assert) { strictEqual(a, b); });"
}
]
}],
globals: { equal: true }
}]
},
{
code: "QUnit.test('Name', function () { equal(a, b); });",
globals: { equal: true },
errors: [{
messageId: "unexpectedGlobalEqual",
suggestions: [
Expand All @@ -124,8 +125,7 @@ ruleTester.run("no-assert-equal", rule, {
output: "QUnit.test('Name', function () { strictEqual(a, b); });"
}
]
}],
globals: { equal: true }
}]
}
]
});
44 changes: 22 additions & 22 deletions tests/lib/rules/no-global-assertions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,58 +65,58 @@ ruleTester.run("no-global-assertions", rule, {
invalid: [
{
code: wrap("ok(true);"),
errors: [createError("ok")],
globals: { ok: true }
globals: { ok: true },
errors: [createError("ok")]
},
{
code: wrap("equal(a, b);"),
errors: [createError("equal")],
globals: { equal: true }
globals: { equal: true },
errors: [createError("equal")]
},
{
code: wrap("strictEqual(a, b);"),
errors: [createError("strictEqual")],
globals: { strictEqual: true }
globals: { strictEqual: true },
errors: [createError("strictEqual")]
},
{
code: wrap("deepEqual(a, b);"),
errors: [createError("deepEqual")],
globals: { deepEqual: true }
globals: { deepEqual: true },
errors: [createError("deepEqual")]
},
{
code: wrap("propEqual(a, b);"),
errors: [createError("propEqual")],
globals: { propEqual: true }
globals: { propEqual: true },
errors: [createError("propEqual")]
},
{
code: wrap("notEqual(a, b);"),
errors: [createError("notEqual")],
globals: { notEqual: true }
globals: { notEqual: true },
errors: [createError("notEqual")]
},
{
code: wrap("notStrictEqual(a, b);"),
errors: [createError("notStrictEqual")],
globals: { notStrictEqual: true }
globals: { notStrictEqual: true },
errors: [createError("notStrictEqual")]
},
{
code: wrap("notDeepEqual(a, b);"),
errors: [createError("notDeepEqual")],
globals: { notDeepEqual: true }
globals: { notDeepEqual: true },
errors: [createError("notDeepEqual")]
},
{
code: wrap("notPropEqual(a, b);"),
errors: [createError("notPropEqual")],
globals: { notPropEqual: true }
globals: { notPropEqual: true },
errors: [createError("notPropEqual")]
},
{
code: wrap("raises(function () {}, TypeError);"),
errors: [createError("raises")],
globals: { raises: true }
globals: { raises: true },
errors: [createError("raises")]
},
{
code: wrap("throws(function () {}, TypeError);"),
errors: [createError("throws")],
globals: { throws: true }
globals: { throws: true },
errors: [createError("throws")]
}
]
});
4 changes: 2 additions & 2 deletions tests/lib/rules/no-global-expect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ ruleTester.run("no-global-expect", rule, {
invalid: [
{
code: wrap("expect(1)"),
globals: { expect: true },
errors: [{
messageId: "unexpectedGlobalExpect",
type: "CallExpression"
}],
globals: { expect: true }
}]
}
]
});
12 changes: 6 additions & 6 deletions tests/lib/rules/no-global-module-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,36 @@ ruleTester.run("no-global-module-test", rule, {
invalid: [
{
code: "module();",
globals: { module: true },
errors: [{
messageId: "unexpectedGlobalModuleTest",
data: {
callee: "module"
},
type: "CallExpression"
}],
globals: { module: true }
}]
},
{
code: "test();",
globals: { test: true },
errors: [{
messageId: "unexpectedGlobalModuleTest",
data: {
callee: "test"
},
type: "CallExpression"
}],
globals: { test: true }
}]
},
{
code: "asyncTest();",
globals: { asyncTest: true },
errors: [{
messageId: "unexpectedGlobalModuleTest",
data: {
callee: "asyncTest"
},
type: "CallExpression"
}],
globals: { asyncTest: true }
}]
}
]
});
8 changes: 4 additions & 4 deletions tests/lib/rules/no-global-stop-start.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ ruleTester.run("no-global-stop-start", rule, {
invalid: [
{
code: "stop();",
globals: { stop: true },
errors: [{
messageId: "unexpectedGlobalStopStart",
data: {
callee: "stop"
},
type: "CallExpression"
}],
globals: { stop: true }
}]
},
{
code: "start();",
globals: { start: true },
errors: [{
messageId: "unexpectedGlobalStopStart",
data: {
callee: "start"
},
type: "CallExpression"
}],
globals: { start: true }
}]
}
]
});
4 changes: 2 additions & 2 deletions tests/lib/rules/no-hooks-from-ancestor-modules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ ruleTester.run("no-hooks-from-ancestor-modules", rule, {
});
});
`,
parser: require.resolve("@typescript-eslint/parser"),
errors: [
createError({
invokedMethodName: "afterEach",
usedHooksIdentifierName: "hooks"
})
],
parser: require.resolve("@typescript-eslint/parser")
]
}
]
});

0 comments on commit cf6c739

Please sign in to comment.