Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Chore: enable eslint-plugin/test-case-shorthand-strings (#9067)
  • Loading branch information
aladdin-add authored and not-an-aardvark committed Aug 14, 2017
1 parent f8add8f commit 1d6a9c0
Show file tree
Hide file tree
Showing 68 changed files with 1,681 additions and 2,285 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yml
Expand Up @@ -14,3 +14,4 @@ rules:
eslint-plugin/prefer-placeholders: "error"
eslint-plugin/report-message-format: ["error", '[^a-z].*\.$']
eslint-plugin/test-case-property-ordering: "error"
eslint-plugin/test-case-shorthand-strings: "error"
6 changes: 3 additions & 3 deletions tests/lib/rules/accessor-pairs.js
Expand Up @@ -36,9 +36,9 @@ ruleTester.run("accessor-pairs", rule, {
},

// https://github.com/eslint/eslint/issues/3262
{ code: "var o = {set: function() {}}" },
{ code: "Object.defineProperties(obj, {set: {value: function() {}}});" },
{ code: "Object.create(null, {set: {value: function() {}}});" },
"var o = {set: function() {}}",
"Object.defineProperties(obj, {set: {value: function() {}}});",
"Object.create(null, {set: {value: function() {}}});",
{ code: "var o = {get: function() {}}", options: [{ getWithoutSet: true }] },
{ code: "var o = {[set]: function() {}}", parserOptions: { ecmaVersion: 6 } },
{ code: "var set = 'value'; Object.defineProperty(obj, 'foo', {[set]: function(value) {}});", parserOptions: { ecmaVersion: 6 } }
Expand Down
34 changes: 17 additions & 17 deletions tests/lib/rules/block-scoped-var.js
Expand Up @@ -83,33 +83,33 @@ ruleTester.run("block-scoped-var", rule, {
{ code: "function foo({x: y}) { return y; }", parserOptions: { ecmaVersion: 6 } },

// those are the same as `no-undef`.
{ code: "!function f(){}; f" },
{ code: "var f = function foo() { }; foo(); var exports = { f: foo };" },
"!function f(){}; f",
"var f = function foo() { }; foo(); var exports = { f: foo };",
{ code: "var f = () => { x; }", parserOptions: { ecmaVersion: 6 } },
{ code: "function f(){ x; }" },
{ code: "var eslint = require('eslint');" },
{ code: "function f(a) { return a[b]; }" },
{ code: "function f() { return b.a; }" },
{ code: "var a = { foo: bar };" },
{ code: "var a = { foo: foo };" },
{ code: "var a = { bar: 7, foo: bar };" },
{ code: "var a = arguments;" },
{ code: "function x(){}; var a = arguments;" },
{ code: "function z(b){}; var a = b;" },
{ code: "function z(){var b;}; var a = b;" },
{ code: "function f(){ try{}catch(e){} e }" },
{ code: "a:b;" },
"function f(){ x; }",
"var eslint = require('eslint');",
"function f(a) { return a[b]; }",
"function f() { return b.a; }",
"var a = { foo: bar };",
"var a = { foo: foo };",
"var a = { bar: 7, foo: bar };",
"var a = arguments;",
"function x(){}; var a = arguments;",
"function z(b){}; var a = b;",
"function z(){var b;}; var a = b;",
"function f(){ try{}catch(e){} e }",
"a:b;",

// https://github.com/eslint/eslint/issues/2253
{ code: "/*global React*/ let {PropTypes, addons: {PureRenderMixin}} = React; let Test = React.createClass({mixins: [PureRenderMixin]});", parserOptions: { ecmaVersion: 6 } },
{ code: "/*global prevState*/ const { virtualSize: prevVirtualSize = 0 } = prevState;", parserOptions: { ecmaVersion: 6 } },
{ code: "const { dummy: { data, isLoading }, auth: { isLoggedIn } } = this.props;", parserOptions: { ecmaVersion: 6 } },

// https://github.com/eslint/eslint/issues/2747
{ code: "function a(n) { return n > 0 ? b(n - 1) : \"a\"; } function b(n) { return n > 0 ? a(n - 1) : \"b\"; }" },
"function a(n) { return n > 0 ? b(n - 1) : \"a\"; } function b(n) { return n > 0 ? a(n - 1) : \"b\"; }",

// https://github.com/eslint/eslint/issues/2967
{ code: "(function () { foo(); })(); function foo() {}" },
"(function () { foo(); })(); function foo() {}",
{ code: "(function () { foo(); })(); function foo() {}", parserOptions: { sourceType: "module" } }
],
invalid: [
Expand Down
34 changes: 17 additions & 17 deletions tests/lib/rules/block-spacing.js
Expand Up @@ -23,25 +23,25 @@ ruleTester.run("block-spacing", rule, {

// default/always
{ code: "{ foo(); }", options: ["always"] },
{ code: "{ foo(); }" },
{ code: "{ foo();\n}" },
{ code: "{\nfoo(); }" },
{ code: "{\r\nfoo();\r\n}" },
{ code: "if (a) { foo(); }" },
{ code: "if (a) {} else { foo(); }" },
{ code: "switch (a) {}" },
{ code: "switch (a) { case 0: foo(); }" },
{ code: "while (a) { foo(); }" },
{ code: "do { foo(); } while (a);" },
{ code: "for (;;) { foo(); }" },
{ code: "for (var a in b) { foo(); }" },
"{ foo(); }",
"{ foo();\n}",
"{\nfoo(); }",
"{\r\nfoo();\r\n}",
"if (a) { foo(); }",
"if (a) {} else { foo(); }",
"switch (a) {}",
"switch (a) { case 0: foo(); }",
"while (a) { foo(); }",
"do { foo(); } while (a);",
"for (;;) { foo(); }",
"for (var a in b) { foo(); }",
{ code: "for (var a of b) { foo(); }", parserOptions: { ecmaVersion: 6 } },
{ code: "try { foo(); } catch (e) { foo(); }" },
{ code: "function foo() { bar(); }" },
{ code: "(function() { bar(); });" },
"try { foo(); } catch (e) { foo(); }",
"function foo() { bar(); }",
"(function() { bar(); });",
{ code: "(() => { bar(); });", parserOptions: { ecmaVersion: 6 } },
{ code: "if (a) { /* comment */ foo(); /* comment */ }" },
{ code: "if (a) { //comment\n foo(); }" },
"if (a) { /* comment */ foo(); /* comment */ }",
"if (a) { //comment\n foo(); }",

// never
{ code: "{foo();}", options: ["never"] },
Expand Down
20 changes: 10 additions & 10 deletions tests/lib/rules/comma-style.js
Expand Up @@ -33,24 +33,24 @@ ruleTester.run("comma-style", rule, {
"var foo = {'a': 1, \n 'b': 2, \n'c': 3};",
"var foo = {'a': 1, \n 'b': 2, 'c':\n 3};",
"var foo = {'a': 1, \n 'b': 2, 'c': [{'d': 1}, \n {'e': 2}, \n {'f': 3}]};",
{ code: "var foo = [1, \n2, \n3];" },
{ code: "function foo(){var a=[1,\n 2]}" },
{ code: "function foo(){return {'a': 1,\n'b': 2}}" },
{ code: "var foo = \n1, \nbar = \n2;" },
{ code: "var foo = [\n(bar),\nbaz\n];" },
{ code: "var foo = [\n(bar\n),\nbaz\n];" },
{ code: "var foo = [\n(\nbar\n),\nbaz\n];" },
"var foo = [1, \n2, \n3];",
"function foo(){var a=[1,\n 2]}",
"function foo(){return {'a': 1,\n'b': 2}}",
"var foo = \n1, \nbar = \n2;",
"var foo = [\n(bar),\nbaz\n];",
"var foo = [\n(bar\n),\nbaz\n];",
"var foo = [\n(\nbar\n),\nbaz\n];",
{ code: "var foo = [\n(bar\n)\n,baz\n];", options: ["first"] },
{ code: "var foo = \n1, \nbar = [1,\n2,\n3]" },
"var foo = \n1, \nbar = [1,\n2,\n3]",
{ code: "var foo = ['apples'\n,'oranges'];", options: ["first"] },
{ code: "var foo = 1, bar = 2;", options: ["first"] },
{ code: "var foo = 1 \n ,bar = 2;", options: ["first"] },
{ code: "var foo = {'a': 1 \n ,'b': 2 \n,'c': 3};", options: ["first"] },
{ code: "var foo = [1 \n ,2 \n, 3];", options: ["first"] },
{ code: "function foo(){return {'a': 1\n,'b': 2}}", options: ["first"] },
{ code: "function foo(){var a=[1\n, 2]}", options: ["first"] },
{ code: "f(1\n, 2);" },
{ code: "function foo(a\n, b) { return a + b; }" },
"f(1\n, 2);",
"function foo(a\n, b) { return a + b; }",
{
code: "var a = 'a',\no = 'o';",
options: ["first", { exceptions: { VariableDeclaration: true } }]
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/rules/complexity.js
Expand Up @@ -38,7 +38,7 @@ const ruleTester = new RuleTester();

ruleTester.run("complexity", rule, {
valid: [
{ code: "function a(x) {}" },
"function a(x) {}",
{ code: "function b(x) {}", options: [1] },
{ code: "function a(x) {if (true) {return x;}}", options: [2] },
{ code: "function a(x) {if (true) {return x;} else {return x+1;}}", options: [2] },
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/rules/computed-property-spacing.js
Expand Up @@ -22,8 +22,8 @@ ruleTester.run("computed-property-spacing", rule, {
valid: [

// default - never
{ code: "obj[foo]" },
{ code: "obj['foo']" },
"obj[foo]",
"obj['foo']",
{ code: "var x = {[b]: a}", parserOptions: { ecmaVersion: 6 } },

// always
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/rules/consistent-this.js
Expand Up @@ -38,7 +38,7 @@ const ruleTester = new RuleTester();

ruleTester.run("consistent-this", rule, {
valid: [
{ code: "var foo = 42, that = this" },
"var foo = 42, that = this",
{ code: "var foo = 42, self = this", options: ["self"] },
{ code: "var self = 42", options: ["that"] },
{ code: "var self", options: ["that"] },
Expand Down
44 changes: 22 additions & 22 deletions tests/lib/rules/for-direction.js
Expand Up @@ -22,32 +22,32 @@ ruleTester.run("for-direction", rule, {
valid: [

// test if '++', '--'
{ code: "for(var i = 0; i < 10; i++){}" },
{ code: "for(var i = 0; i <= 10; i++){}" },
{ code: "for(var i = 10; i > 0; i--){}" },
{ code: "for(var i = 10; i >= 0; i--){}" },
"for(var i = 0; i < 10; i++){}",
"for(var i = 0; i <= 10; i++){}",
"for(var i = 10; i > 0; i--){}",
"for(var i = 10; i >= 0; i--){}",

// test if '+=', '-=',
{ code: "for(var i = 0; i < 10; i+=1){}" },
{ code: "for(var i = 0; i <= 10; i+=1){}" },
{ code: "for(var i = 10; i > 0; i-=1){}" },
{ code: "for(var i = 10; i >= 0; i-=1){}" },
{ code: "for (var i = 0; i < MAX; i += STEP_SIZE);" },
{ code: "for (var i = MAX; i > MIN; i -= STEP_SIZE);" },
"for(var i = 0; i < 10; i+=1){}",
"for(var i = 0; i <= 10; i+=1){}",
"for(var i = 10; i > 0; i-=1){}",
"for(var i = 10; i >= 0; i-=1){}",
"for (var i = 0; i < MAX; i += STEP_SIZE);",
"for (var i = MAX; i > MIN; i -= STEP_SIZE);",

// test if no update.
{ code: "for(var i = 10; i > 0;){}" },
{ code: "for(var i = 10; i >= 0;){}" },
{ code: "for(var i = 10; i < 0;){}" },
{ code: "for(var i = 10; i <= 0;){}" },
{ code: "for(var i = 10; i <= 0; j++){}" },
{ code: "for(var i = 10; i <= 0; j--){}" },
{ code: "for(var i = 10; i >= 0; j++){}" },
{ code: "for(var i = 10; i >= 0; j--){}" },
{ code: "for(var i = 10; i >= 0; j += 2){}" },
{ code: "for(var i = 10; i >= 0; j -= 2){}" },
{ code: "for(var i = 10; i >= 0; i |= 2){}" },
{ code: "for(var i = 10; i >= 0; i %= 2){}" }
"for(var i = 10; i > 0;){}",
"for(var i = 10; i >= 0;){}",
"for(var i = 10; i < 0;){}",
"for(var i = 10; i <= 0;){}",
"for(var i = 10; i <= 0; j++){}",
"for(var i = 10; i <= 0; j--){}",
"for(var i = 10; i >= 0; j++){}",
"for(var i = 10; i >= 0; j--){}",
"for(var i = 10; i >= 0; j += 2){}",
"for(var i = 10; i >= 0; j -= 2){}",
"for(var i = 10; i >= 0; i |= 2){}",
"for(var i = 10; i >= 0; i %= 2){}"
],
invalid: [

Expand Down
34 changes: 17 additions & 17 deletions tests/lib/rules/func-name-matching.js
Expand Up @@ -20,52 +20,52 @@ const ruleTester = new RuleTester();

ruleTester.run("func-name-matching", rule, {
valid: [
{ code: "var foo;" },
{ code: "var foo = function foo() {};" },
"var foo;",
"var foo = function foo() {};",
{ code: "var foo = function foo() {};", options: ["always"] },
{ code: "var foo = function bar() {};", options: ["never"] },
{ code: "var foo = function() {}" },
"var foo = function() {}",
{ code: "var foo = () => {}", parserOptions: { ecmaVersion: 6 } },
{ code: "foo = function foo() {};" },
"foo = function foo() {};",
{ code: "foo = function foo() {};", options: ["always"] },
{ code: "foo = function bar() {};", options: ["never"] },
{ code: "obj.foo = function foo() {};" },
"obj.foo = function foo() {};",
{ code: "obj.foo = function foo() {};", options: ["always"] },
{ code: "obj.foo = function bar() {};", options: ["never"] },
{ code: "obj.foo = function() {};" },
"obj.foo = function() {};",
{ code: "obj.foo = function() {};", options: ["always"] },
{ code: "obj.foo = function() {};", options: ["never"] },
{ code: "obj.bar.foo = function foo() {};" },
"obj.bar.foo = function foo() {};",
{ code: "obj.bar.foo = function foo() {};", options: ["always"] },
{ code: "obj.bar.foo = function baz() {};", options: ["never"] },
{ code: "obj['foo'] = function foo() {};" },
"obj['foo'] = function foo() {};",
{ code: "obj['foo'] = function foo() {};", options: ["always"] },
{ code: "obj['foo'] = function bar() {};", options: ["never"] },
{ code: "obj['foo//bar'] = function foo() {};" },
"obj['foo//bar'] = function foo() {};",
{ code: "obj['foo//bar'] = function foo() {};", options: ["always"] },
{ code: "obj['foo//bar'] = function foo() {};", options: ["never"] },
{ code: "obj[foo] = function bar() {};" },
"obj[foo] = function bar() {};",
{ code: "obj[foo] = function bar() {};", options: ["always"] },
{ code: "obj[foo] = function bar() {};", options: ["never"] },
{ code: "var obj = {foo: function foo() {}};" },
"var obj = {foo: function foo() {}};",
{ code: "var obj = {foo: function foo() {}};", options: ["always"] },
{ code: "var obj = {foo: function bar() {}};", options: ["never"] },
{ code: "var obj = {'foo': function foo() {}};" },
"var obj = {'foo': function foo() {}};",
{ code: "var obj = {'foo': function foo() {}};", options: ["always"] },
{ code: "var obj = {'foo': function bar() {}};", options: ["never"] },
{ code: "var obj = {'foo//bar': function foo() {}};" },
"var obj = {'foo//bar': function foo() {}};",
{ code: "var obj = {'foo//bar': function foo() {}};", options: ["always"] },
{ code: "var obj = {'foo//bar': function foo() {}};", options: ["never"] },
{ code: "var obj = {foo: function() {}};" },
"var obj = {foo: function() {}};",
{ code: "var obj = {foo: function() {}};", options: ["always"] },
{ code: "var obj = {foo: function() {}};", options: ["never"] },
{ code: "var obj = {[foo]: function bar() {}} ", parserOptions: { ecmaVersion: 6 } },
{ code: "var obj = {['x' + 2]: function bar(){}};", parserOptions: { ecmaVersion: 6 } },
{ code: "obj['x' + 2] = function bar(){};" },
"obj['x' + 2] = function bar(){};",
{ code: "var [ bar ] = [ function bar(){} ];", parserOptions: { ecmaVersion: 6 } },
{ code: "function a(foo = function bar() {}) {}", parserOptions: { ecmaVersion: 6 } },
{ code: "module.exports = function foo(name) {};" },
{ code: "module['exports'] = function foo(name) {};" },
"module.exports = function foo(name) {};",
"module['exports'] = function foo(name) {};",
{
code: "module.exports = function foo(name) {};",
options: [{ includeCommonJSModuleExports: false }],
Expand Down
34 changes: 17 additions & 17 deletions tests/lib/rules/getter-return.js
Expand Up @@ -30,7 +30,7 @@ ruleTester.run("getter-return", rule, {

// test obj: get
// option: {allowImplicit: false}
{ code: "var foo = { get bar(){return true;} };" },
"var foo = { get bar(){return true;} };",

// option: {allowImplicit: true}
{ code: "var foo = { get bar() {return;} };", options },
Expand All @@ -39,20 +39,20 @@ ruleTester.run("getter-return", rule, {

// test class: get
// option: {allowImplicit: false}
{ code: "class foo { get bar(){return true;} }" },
{ code: "class foo { get bar(){if(baz){return true;} else {return false;} } }" },
{ code: "class foo { get(){return true;} }" },
"class foo { get bar(){return true;} }",
"class foo { get bar(){if(baz){return true;} else {return false;} } }",
"class foo { get(){return true;} }",

// option: {allowImplicit: true}
{ code: "class foo { get bar(){return true;} }", options },
{ code: "class foo { get bar(){return;} }", options },

// test object.defineProperty(s)
// option: {allowImplicit: false}
{ code: "Object.defineProperty(foo, \"bar\", { get: function () {return true;}});" },
{ code: "Object.defineProperty(foo, \"bar\", { get: function () { ~function (){ return true; }();return true;}});" },
{ code: "Object.defineProperties(foo, { bar: { get: function () {return true;}} });" },
{ code: "Object.defineProperties(foo, { bar: { get: function () { ~function (){ return true; }(); return true;}} });" },
"Object.defineProperty(foo, \"bar\", { get: function () {return true;}});",
"Object.defineProperty(foo, \"bar\", { get: function () { ~function (){ return true; }();return true;}});",
"Object.defineProperties(foo, { bar: { get: function () {return true;}} });",
"Object.defineProperties(foo, { bar: { get: function () { ~function (){ return true; }(); return true;}} });",

// option: {allowImplicit: true}
{ code: "Object.defineProperty(foo, \"bar\", { get: function () {return true;}});", options },
Expand All @@ -61,15 +61,15 @@ ruleTester.run("getter-return", rule, {
{ code: "Object.defineProperties(foo, { bar: { get: function () {return;}} });", options },

// not getter.
{ code: "var get = function(){};" },
{ code: "var get = function(){ return true; };" },
{ code: "var foo = { bar(){} };" },
{ code: "var foo = { bar(){ return true; } };" },
{ code: "var foo = { bar: function(){} };" },
{ code: "var foo = { bar: function(){return;} };" },
{ code: "var foo = { bar: function(){return true;} };" },
{ code: "var foo = { get: function () {} }" },
{ code: "var foo = { get: () => {}};" }
"var get = function(){};",
"var get = function(){ return true; };",
"var foo = { bar(){} };",
"var foo = { bar(){ return true; } };",
"var foo = { bar: function(){} };",
"var foo = { bar: function(){return;} };",
"var foo = { bar: function(){return true;} };",
"var foo = { get: function () {} }",
"var foo = { get: () => {}};"
],

invalid: [
Expand Down

0 comments on commit 1d6a9c0

Please sign in to comment.