Merge pull request #570 from bmish/test-simplify-parserOptions

Simplify some tests by setting `parserOptions` globally instead of in each individual test case
ember-cli · Nov 6, 2019 · 4416ac3 · 4416ac3
2 parents 3c8959e + 982c217
commit 4416ac3
Show file tree

Hide file tree

Showing 21 changed files with 247 additions and 937 deletions.
diff --git a/tests/lib/rules/alias-model-in-controller.js b/tests/lib/rules/alias-model-in-controller.js
@@ -9,122 +9,51 @@ const RuleTester = require('eslint').RuleTester;
 // Tests
 // ------------------------------------------------------------------------------
 
-const eslintTester = new RuleTester();
+const eslintTester = new RuleTester({
+  parserOptions: { ecmaVersion: 6, sourceType: 'module' },
+});
+
 eslintTester.run('alias-model-in-controller', rule, {
   valid: [
     // direct alias
 
-    {
-      code: 'export default Ember.Controller.extend({nail: alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: Ember.computed.alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: readOnly("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.readOnly("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: reads("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.reads("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: Ember.computed.reads("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code:
-        'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code:
-        'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
+    'export default Ember.Controller.extend({nail: alias("model")});',
+    'export default Ember.Controller.extend({nail: computed.alias("model")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.alias("model")});',
+    'export default Ember.Controller.extend({nail: readOnly("model")});',
+    'export default Ember.Controller.extend({nail: computed.readOnly("model")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model")});',
+    'export default Ember.Controller.extend({nail: reads("model")});',
+    'export default Ember.Controller.extend({nail: computed.reads("model")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.reads("model")});',
+    'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model")});',
+    'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model")});',
     {
       filename: 'example-app/controllers/path/to/some-feature.js',
       code: 'export default CustomController.extend({nail: alias("model")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
     },
 
     // nested alias
 
-    {
-      code: 'export default Ember.Controller.extend({nail: alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: Ember.computed.alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: readOnly("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.readOnly("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code:
-        'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: reads("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: computed.reads("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Ember.Controller.extend({nail: Ember.computed.reads("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code:
-        'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code:
-        'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
+    'export default Ember.Controller.extend({nail: alias("model.nail")});',
+    'export default Ember.Controller.extend({nail: computed.alias("model.nail")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.alias("model.nail")});',
+    'export default Ember.Controller.extend({nail: readOnly("model.nail")});',
+    'export default Ember.Controller.extend({nail: computed.readOnly("model.nail")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model.nail")});',
+    'export default Ember.Controller.extend({nail: reads("model.nail")});',
+    'export default Ember.Controller.extend({nail: computed.reads("model.nail")});',
+    'export default Ember.Controller.extend({nail: Ember.computed.reads("model.nail")});',
+    'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model.nail")});',
+    'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model.nail")});',
     {
       filename: 'example-app/controllers/path/to/some-feature.js',
       code: 'export default CustomController.extend({nail: alias("model.nail")});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
     },
   ],
   invalid: [
     {
       code: 'export default Ember.Controller.extend({});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -134,7 +63,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     },
     {
       code: 'export default Ember.Controller.extend({resetPassword: service()});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -144,7 +72,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     },
     {
       code: 'export default Ember.Controller.extend({resetPassword: inject.service()});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -154,7 +81,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     },
     {
       code: 'export default Ember.Controller.extend({resetPassword: Ember.inject.service()});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -164,7 +90,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     },
     {
       code: 'export default Ember.Controller.extend(TestMixin, {});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -174,7 +99,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     },
     {
       code: 'export default Ember.Controller.extend(TestMixin, TestMixin2, {});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -185,7 +109,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     {
       filename: 'example-app/controllers/path/to/some-feature.js',
       code: 'export default CustomController.extend({});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -196,7 +119,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     {
       filename: 'example-app/some-feature/controller.js',
       code: 'export default CustomController.extend({});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {
@@ -207,7 +129,6 @@ eslintTester.run('alias-model-in-controller', rule, {
     {
       filename: 'example-app/twisted-path/some-file.js',
       code: 'export default Controller.extend({});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {

diff --git a/tests/lib/rules/closure-actions.js b/tests/lib/rules/closure-actions.js
@@ -11,23 +11,19 @@ const { ERROR_MESSAGE } = rule;
 // Tests
 // ------------------------------------------------------------------------------
 
-const eslintTester = new RuleTester();
+const eslintTester = new RuleTester({
+  parserOptions: { ecmaVersion: 6, sourceType: 'module' },
+});
+
 eslintTester.run('closure-actions', rule, {
   valid: [
-    {
-      code: 'export default Component.extend();',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
-    {
-      code: 'export default Component.extend({actions: {pushLever() {this.attr.boom();}}});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
+    'export default Component.extend();',
+    'export default Component.extend({actions: {pushLever() {this.attr.boom();}}});',
   ],
   invalid: [
     {
       code:
         'export default Component.extend({actions: {pushLever() {this.sendAction("detonate");}}});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {

diff --git a/tests/lib/rules/jquery-ember-run.js b/tests/lib/rules/jquery-ember-run.js
@@ -9,20 +9,18 @@ const RuleTester = require('eslint').RuleTester;
 // Tests
 // ------------------------------------------------------------------------------
 
-const eslintTester = new RuleTester();
+const eslintTester = new RuleTester({
+  parserOptions: { ecmaVersion: 6, sourceType: 'module' },
+});
+
 eslintTester.run('jquery-ember-run', rule, {
   valid: [
-    {
-      code:
-        'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {Ember.run.bind(this, this._handlerActionFromController);});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
-    },
+    'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {Ember.run.bind(this, this._handlerActionFromController);});',
   ],
   invalid: [
     {
       code:
         'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {this._handlerActionFromController();});',
-      parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       output: null,
       errors: [
         {