Make test fixtures more generic

eslint · Jun 5, 2017 · be7bd0d · be7bd0d
1 parent b008b83
commit be7bd0d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 25 deletions.
diff --git a/...n-declaration-type-annotation-no-space.js → ...n-declaration-type-annotation-no-space.js b/...n-declaration-type-annotation-no-space.js → ...n-declaration-type-annotation-no-space.js
@@ -1,6 +1,4 @@
-
 /**
- * Parser: typescript-eslint-parser v2.0.0 (TS 2.2.1)
  * Source code:
  * function foo(a: number=0): Foo { }
  */
@@ -110,7 +108,7 @@ exports.parse = () => ({
                                 22
                             ],
                             "typeAnnotation": {
-                                "type": "TSNumberKeyword",
+                                "type": "NumberKeyword",
                                 "range": [
                                     16,
                                     22
@@ -184,7 +182,7 @@ exports.parse = () => ({
                     30
                 ],
                 "typeAnnotation": {
-                    "type": "TSTypeReference",
+                    "type": "TypeReference",
                     "range": [
                         27,
                         30

diff --git a/...rs/function-expression-type-annotation.js → ...ns/function-expression-type-annotation.js b/...rs/function-expression-type-annotation.js → ...ns/function-expression-type-annotation.js
@@ -1,5 +1,4 @@
 /**
- * Parser: typescript-eslint-parser v2.0.0 (TS 2.2.1)
  * Source code:
  * const foo = function(a: number = 0): Bar { };
  */
@@ -141,7 +140,7 @@ exports.parse = () => ({
                                             30
                                         ],
                                         "typeAnnotation": {
-                                            "type": "TSNumberKeyword",
+                                            "type": "NumberKeyword",
                                             "range": [
                                                 24,
                                                 30
@@ -217,7 +216,7 @@ exports.parse = () => ({
                                 40
                             ],
                             "typeAnnotation": {
-                                "type": "TSTypeReference",
+                                "type": "TypeReference",
                                 "range": [
                                     37,
                                     40

diff --git a/tests/fixtures/parsers/flow-stub-parser.js → ...ons/function-parameter-type-annotation.js b/tests/fixtures/parsers/flow-stub-parser.js → ...ons/function-parameter-type-annotation.js
@@ -1,6 +1,9 @@
+/**
+ * Source code:
+ * function foo(a: number = 0) { }
+ */
 
-exports.parse = function() {
-    return {
+exports.parse = () => ({
       "type": "Program",
       "loc": {
         "source": null,
@@ -387,5 +390,4 @@ exports.parse = function() {
           ]
         }
       ]
-    };
-};
+});
diff --git a/...s/function-declaration-type-annotation.js → ...ations/function-return-type-annotation.js b/...s/function-declaration-type-annotation.js → ...ations/function-return-type-annotation.js
@@ -1,5 +1,4 @@
 /**
- * Parser: typescript-eslint-parser v2.0.0 (TS 2.2.1)
  * Source code:
  * function foo(): Bar { }
  */
@@ -94,7 +93,7 @@ exports.parse = () => ({
                     19
                 ],
                 "typeAnnotation": {
-                    "type": "TSTypeReference",
+                    "type": "TypeReference",
                     "range": [
                         16,
                         19

diff --git a/...laration-init-type-annotation-no-space.js → ...laration-init-type-annotation-no-space.js b/...laration-init-type-annotation-no-space.js → ...laration-init-type-annotation-no-space.js
@@ -1,5 +1,4 @@
 /**
- * Parser: typescript-eslint-parser v2.0.0 (TS 2.2.1)
  * Source code:
  * var a: Foo= b;
  */
@@ -88,7 +87,7 @@ exports.parse = () => ({
                                 10
                             ],
                             "typeAnnotation": {
-                                "type": "TSTypeReference",
+                                "type": "TypeReference",
                                 "range": [
                                     7,
                                     10

diff --git a/...iable-declaration-init-type-annotation.js → ...iable-declaration-init-type-annotation.js b/...iable-declaration-init-type-annotation.js → ...iable-declaration-init-type-annotation.js
@@ -1,7 +1,4 @@
-"use strict";
-
 /**
- * Parser: typescript-eslint-parser v2.0.0 (TS 2.2.1)
  * Source code:
  * var foo: Bar = '';
  */
@@ -90,7 +87,7 @@ exports.parse = () => ({
                                 12
                             ],
                             "typeAnnotation": {
-                                "type": "TSTypeReference",
+                                "type": "TypeReference",
                                 "range": [
                                     9,
                                     12

diff --git a/tests/lib/rules/space-infix-ops.js b/tests/lib/rules/space-infix-ops.js
@@ -35,10 +35,10 @@ ruleTester.run("space-infix-ops", rule, {
         { code: "a |0", options: [{ int32Hint: true }] },
 
         // Type Annotations
-        { code: "function foo(a: number = 0) { }", parser: parser("flow-stub-parser"), parserOptions: { ecmaVersion: 6 } },
-        { code: "function foo(): Bar { }", parser: parser("typescript-parsers/function-declaration-type-annotation"), parserOptions: { ecmaVersion: 6 } },
-        { code: "var foo: Bar = '';", parser: parser("typescript-parsers/variable-declaration-init-type-annotation"), parserOptions: { ecmaVersion: 6 } },
-        { code: "const foo = function(a: number = 0): Bar { };", parser: parser("typescript-parsers/function-expression-type-annotation"), parserOptions: { ecmaVersion: 6 } }
+        { code: "function foo(a: number = 0) { }", parser: parser("type-annotations/function-parameter-type-annotation"), parserOptions: { ecmaVersion: 6 } },
+        { code: "function foo(): Bar { }", parser: parser("type-annotations/function-return-type-annotation"), parserOptions: { ecmaVersion: 6 } },
+        { code: "var foo: Bar = '';", parser: parser("type-annotations/variable-declaration-init-type-annotation"), parserOptions: { ecmaVersion: 6 } },
+        { code: "const foo = function(a: number = 0): Bar { };", parser: parser("type-annotations/function-expression-type-annotation"), parserOptions: { ecmaVersion: 6 } }
     ],
     invalid: [
         {
@@ -359,7 +359,7 @@ ruleTester.run("space-infix-ops", rule, {
         {
             code: "var a: Foo= b;",
             output: "var a: Foo = b;",
-            parser: parser("typescript-parsers/variable-declaration-init-type-annotation-no-space"),
+            parser: parser("type-annotations/variable-declaration-init-type-annotation-no-space"),
             errors: [{
                 message: "Infix operators must be spaced.",
                 type: "VariableDeclarator",
@@ -370,7 +370,7 @@ ruleTester.run("space-infix-ops", rule, {
         {
             code: "function foo(a: number=0): Foo { }",
             output: "function foo(a: number = 0): Foo { }",
-            parser: parser("typescript-parsers/function-declaration-type-annotation-no-space"),
+            parser: parser("type-annotations/function-declaration-type-annotation-no-space"),
             parserOptions: { ecmaVersion: 6 },
             errors: [{
                 message: "Infix operators must be spaced.",