Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Move wrap/unwrap helpers to testUtils #216

Merged
merged 3 commits into from
Nov 4, 2021
Merged

Build: Move wrap/unwrap helpers to testUtils #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d094c9b
Build: Move wrap/unwrap helpers to testUtils
edg2s Nov 2, 2021
fb43a6c
Fix erroneously replaced comment
edg2s Nov 4, 2021
15d91e8
Rename wrap/wrapArrow -> wrapInTest/wrapInArrowTest
edg2s Nov 4, 2021
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
389 changes: 189 additions & 200 deletions tests/lib/rules/assert-args.js
View file
Open in desktop

Large diffs are not rendered by default.

215 changes: 102 additions & 113 deletions tests/lib/rules/literal-compare-order.js
View file
Open in desktop

Large diffs are not rendered by default.

97 changes: 43 additions & 54 deletions tests/lib/rules/no-assert-logical-expression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,8 @@
//------------------------------------------------------------------------------

const rule = require("../../../lib/rules/no-assert-logical-expression"),
RuleTester = require("eslint").RuleTester;

//------------------------------------------------------------------------------
// Helpers
//------------------------------------------------------------------------------

function wrap(code) {
return `QUnit.test('test', function (assert) { ${code} });`;
}

function wrapArrow(code) {
return `QUnit.test('test', (assert) => { ${code} });`;
}
RuleTester = require("eslint").RuleTester,
testUtils = require("../../testUtils");

//------------------------------------------------------------------------------
// Tests
Expand All @@ -32,36 +21,36 @@ ruleTester.run("no-assert-logical-expression", rule, {

valid: [
// Simple assertions
wrap("assert.ok(foo);"),
wrap("assert.equal(foo, bar);"),
wrap("assert.false(foo);"),
wrap("assert.strictEqual(foo, bar);"),
wrap("assert.deepEqual(foo, bar);"),
wrap("assert.propEqual(foo, bar);"),
wrap("assert.notOk(foo);"),
wrap("assert.notEqual(foo, bar);"),
wrap("assert.notStrictEqual(foo, bar);"),
wrap("assert.notDeepEqual(foo, bar);"),
wrap("assert.notPropEqual(foo, bar);"),
wrap("assert.raises(function () {}, /Message/);"),
wrap("assert.throws(function () {}, /Message/);"),
wrap("assert.true(foo);"),
testUtils.wrapInTest("assert.ok(foo);"),
testUtils.wrapInTest("assert.equal(foo, bar);"),
testUtils.wrapInTest("assert.false(foo);"),
testUtils.wrapInTest("assert.strictEqual(foo, bar);"),
testUtils.wrapInTest("assert.deepEqual(foo, bar);"),
testUtils.wrapInTest("assert.propEqual(foo, bar);"),
testUtils.wrapInTest("assert.notOk(foo);"),
testUtils.wrapInTest("assert.notEqual(foo, bar);"),
testUtils.wrapInTest("assert.notStrictEqual(foo, bar);"),
testUtils.wrapInTest("assert.notDeepEqual(foo, bar);"),
testUtils.wrapInTest("assert.notPropEqual(foo, bar);"),
testUtils.wrapInTest("assert.raises(function () {}, /Message/);"),
testUtils.wrapInTest("assert.throws(function () {}, /Message/);"),
testUtils.wrapInTest("assert.true(foo);"),

// Logical expressions inside raises/throw blocks are fine
wrap("assert.raises(function () { throw (foo || bar); });"),
wrap("assert.throws(function () { throw (foo || bar); });"),
testUtils.wrapInTest("assert.raises(function () { throw (foo || bar); });"),
testUtils.wrapInTest("assert.throws(function () { throw (foo || bar); });"),

// Messages can have logical expressions.
wrap("assert.ok(foo, message || 'alternative message');"),
wrap("assert.equal(foo, bar, message || 'alternative message');"),
testUtils.wrapInTest("assert.ok(foo, message || 'alternative message');"),
testUtils.wrapInTest("assert.equal(foo, bar, message || 'alternative message');"),

// Not an assertion, not in a test
"doSomething(foo && bar);"
],

invalid: [
{
code: wrap("assert.ok(foo && bar);"),
code: testUtils.wrapInTest("assert.ok(foo && bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -73,7 +62,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrapArrow("assert.ok(foo && bar);"),
code: testUtils.wrapInArrowTest("assert.ok(foo && bar);"),
parserOptions: { ecmaVersion: 6 },
errors: [{
messageId: "noLogicalOperator",
Expand All @@ -86,7 +75,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.ok(foo || bar);"),
code: testUtils.wrapInTest("assert.ok(foo || bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -98,7 +87,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notOk(foo && bar);"),
code: testUtils.wrapInTest("assert.notOk(foo && bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -110,7 +99,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notOk(foo || bar);"),
code: testUtils.wrapInTest("assert.notOk(foo || bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -122,7 +111,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.equal(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.equal(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -142,7 +131,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.equal(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.equal(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -162,7 +151,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.strictEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.strictEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -182,7 +171,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.strictEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.strictEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -202,7 +191,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.deepEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.deepEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -222,7 +211,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.deepEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.deepEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -242,7 +231,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.propEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.propEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -262,7 +251,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.propEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.propEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -282,7 +271,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.notEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -302,7 +291,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.notEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -322,7 +311,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notStrictEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.notStrictEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -342,7 +331,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notStrictEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.notStrictEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -362,7 +351,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notDeepEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.notDeepEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -382,7 +371,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notDeepEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.notDeepEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -402,7 +391,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notPropEqual(foo && bar, baz && lol);"),
code: testUtils.wrapInTest("assert.notPropEqual(foo && bar, baz && lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -422,7 +411,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.notPropEqual(foo || bar, baz || lol);"),
code: testUtils.wrapInTest("assert.notPropEqual(foo || bar, baz || lol);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -444,7 +433,7 @@ ruleTester.run("no-assert-logical-expression", rule, {

// Boolean assertions
{
code: wrap("assert.true(foo && bar);"),
code: testUtils.wrapInTest("assert.true(foo && bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand All @@ -456,7 +445,7 @@ ruleTester.run("no-assert-logical-expression", rule, {
}]
},
{
code: wrap("assert.false(foo && bar);"),
code: testUtils.wrapInTest("assert.false(foo && bar);"),
errors: [{
messageId: "noLogicalOperator",
data: {
Expand Down
Loading