schematics: remove skipTest option (#2596)

Closes #2561 BREAKING CHANGE: The skipTest option has been renamed to skipTests BEFORE: ng generate container UsersPage --skipTest AFTER: ng generate container UsersPage --skipTests
ngrx · Jun 30, 2020 · 60cd5cc · 60cd5cc
1 parent 2706531
commit 60cd5cc
Show file tree

Hide file tree

Showing 29 changed files with 0 additions and 143 deletions.
diff --git a/modules/effects/schematics/ng-add/index.ts b/modules/effects/schematics/ng-add/index.ts
@@ -124,10 +124,6 @@ export default function (options: EffectOptions): Rule {
       options.module = findModuleFromOptions(host, options);
     }
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name || '');
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/effects/schematics/ng-add/schema.json b/modules/effects/schematics/ng-add/schema.json
@@ -25,12 +25,6 @@
       "default": true,
       "description": "Flag to indicate if a dir is created."
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "default": false,

diff --git a/modules/effects/schematics/ng-add/schema.ts b/modules/effects/schematics/ng-add/schema.ts
@@ -3,8 +3,6 @@ export interface Schema {
   skipPackageJson?: boolean;
   path?: string;
   flat?: boolean;
-  /** @deprecated renamed to skipTests, use skipTests instead */
-  skipTest?: boolean;
   skipTests?: boolean;
   project?: string;
   module?: string;

diff --git a/modules/schematics/src/action/index.ts b/modules/schematics/src/action/index.ts
@@ -25,10 +25,6 @@ export default function (options: ActionOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/schematics/src/action/schema.json b/modules/schematics/src/action/schema.json
@@ -24,12 +24,6 @@
       "description": "The name of the project.",
       "aliases": ["p"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files.",

diff --git a/modules/schematics/src/action/schema.ts b/modules/schematics/src/action/schema.ts
@@ -14,11 +14,6 @@ export interface Schema {
    */
   project?: string;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/container/index.ts b/modules/schematics/src/container/index.ts
@@ -122,10 +122,6 @@ export default function (options: ContainerOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/schematics/src/container/schema.json b/modules/schematics/src/container/schema.json
@@ -56,12 +56,6 @@
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string"
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files."

diff --git a/modules/schematics/src/container/schema.ts b/modules/schematics/src/container/schema.ts
@@ -35,11 +35,6 @@ export interface Schema {
    * The file extension or preprocessor to use for style files.
    */
   style?: string;
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/data/index.ts b/modules/schematics/src/data/index.ts
@@ -23,10 +23,6 @@ export default function (options: DataOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/schematics/src/data/schema.json b/modules/schematics/src/data/schema.json
@@ -23,12 +23,6 @@
       "description": "The name of the project.",
       "aliases": ["p"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files.",

diff --git a/modules/schematics/src/data/schema.ts b/modules/schematics/src/data/schema.ts
@@ -14,11 +14,6 @@ export interface Schema {
    */
   project?: string;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/effect/index.ts b/modules/schematics/src/effect/index.ts
@@ -121,10 +121,6 @@ export default function (options: EffectOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     if (options.module) {
       options.module = findModuleFromOptions(host, options);
     }

diff --git a/modules/schematics/src/effect/schema.json b/modules/schematics/src/effect/schema.json
@@ -29,12 +29,6 @@
       "default": true,
       "description": "Flag to indicate if a dir is created."
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "default": false,

diff --git a/modules/schematics/src/effect/schema.ts b/modules/schematics/src/effect/schema.ts
@@ -19,11 +19,6 @@ export interface Schema {
    */
   flat?: boolean;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/entity/index.ts b/modules/schematics/src/entity/index.ts
@@ -35,10 +35,6 @@ export default function (options: EntityOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     if (options.module) {
       options.module = findModuleFromOptions(host, options);
     }

diff --git a/modules/schematics/src/entity/schema.json b/modules/schematics/src/entity/schema.json
@@ -24,12 +24,6 @@
       "description": "The name of the project.",
       "aliases": ["p"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files.",

diff --git a/modules/schematics/src/entity/schema.ts b/modules/schematics/src/entity/schema.ts
@@ -17,11 +17,6 @@ export interface Schema {
    * Flag to indicate if a dir is created.
    */
   flat?: boolean;
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/feature/index.ts b/modules/schematics/src/feature/index.ts
@@ -8,10 +8,6 @@ import {
 import { Schema as FeatureOptions } from './schema';
 
 export default function (options: FeatureOptions): Rule {
-  if (!options.skipTests && options.skipTest) {
-    options.skipTests = options.skipTest;
-  }
-
   return (host: Tree, context: SchematicContext) => {
     return chain([
       schematic('action', {

diff --git a/modules/schematics/src/feature/schema.json b/modules/schematics/src/feature/schema.json
@@ -34,12 +34,6 @@
       "description": "Specifies the declaring module.",
       "aliases": ["m"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "default": false,

diff --git a/modules/schematics/src/feature/schema.ts b/modules/schematics/src/feature/schema.ts
@@ -19,11 +19,6 @@ export interface Schema {
    */
   flat?: boolean;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/reducer/index.ts b/modules/schematics/src/reducer/index.ts
@@ -36,10 +36,6 @@ export default function (options: ReducerOptions): Rule {
       options.module = findModuleFromOptions(host, options);
     }
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/schematics/src/reducer/schema.json b/modules/schematics/src/reducer/schema.json
@@ -24,12 +24,6 @@
       "description": "The name of the project.",
       "aliases": ["p"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files.",

diff --git a/modules/schematics/src/reducer/schema.ts b/modules/schematics/src/reducer/schema.ts
@@ -19,11 +19,6 @@ export interface Schema {
    */
   flat?: boolean;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/selector/index.ts b/modules/schematics/src/selector/index.ts
@@ -23,10 +23,6 @@ export default function (options: SelectorOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     options.path = getProjectPath(host, options);
 
-    if (!options.skipTests && options.skipTest) {
-      options.skipTests = options.skipTest;
-    }
-
     const parsedPath = parseName(options.path, options.name || '');
     options.name = parsedPath.name;
     options.path = parsedPath.path;

diff --git a/modules/schematics/src/selector/schema.json b/modules/schematics/src/selector/schema.json
@@ -23,12 +23,6 @@
       "description": "The name of the project.",
       "aliases": ["p"]
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create test files.",

diff --git a/modules/schematics/src/selector/schema.ts b/modules/schematics/src/selector/schema.ts
@@ -19,11 +19,6 @@ export interface Schema {
    */
   flat?: boolean;
 
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */

diff --git a/modules/schematics/src/store/schema.json b/modules/schematics/src/store/schema.json
@@ -29,12 +29,6 @@
       "default": true,
       "description": "Flag to indicate if a dir is created."
     },
-    "skipTest": {
-      "type": "boolean",
-      "description": "When true, does not create test files.",
-      "x-deprecated": "Use skipTests instead.",
-      "default": false
-    },
     "skipTests": {
       "type": "boolean",
       "default": false,

diff --git a/modules/schematics/src/store/schema.ts b/modules/schematics/src/store/schema.ts
@@ -17,11 +17,6 @@ export interface Schema {
    * Flag to indicate if a dir is created.
    */
   flat?: boolean;
-  /**
-   * When true, does not create test files.
-   * @deprecated Use skipTests instead
-   */
-  skipTest?: boolean;
   /**
    * When true, does not create test files.
    */