Rename doNotFailOnWarnings variables to allowWarningsInSuccessfulBuild.

iclanton · iclanton · commit d4dcc2eaeb3f · 2019-06-10T16:13:51.000-07:00
diff --git a/apps/rush-lib/src/cli/RushCommandLineParser.ts b/apps/rush-lib/src/cli/RushCommandLineParser.ts
@@ -194,7 +194,7 @@ export class RushCommandLineParser extends CommandLineParser {
         enableParallelism: true,
         ignoreMissingScript: false,
         ignoreDependencyOrder: false,
-        doNotFailOnWarnings: false
+        allowWarningsInSuccessfulBuild: false
       }));
     }
 
@@ -217,7 +217,7 @@ export class RushCommandLineParser extends CommandLineParser {
         enableParallelism: true,
         ignoreMissingScript: false,
         ignoreDependencyOrder: false,
-        doNotFailOnWarnings: false
+        allowWarningsInSuccessfulBuild: false
       }));
     }
   }
@@ -250,7 +250,7 @@ export class RushCommandLineParser extends CommandLineParser {
             enableParallelism: command.enableParallelism,
             ignoreMissingScript: command.ignoreMissingScript || false,
             ignoreDependencyOrder: command.ignoreDependencyOrder || false,
-            doNotFailOnWarnings: !!command.allowWarningsInSuccessfulBuild
+            allowWarningsInSuccessfulBuild: !!command.allowWarningsInSuccessfulBuild
           }));
           break;
         case 'global':
diff --git a/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts b/apps/rush-lib/src/cli/scriptActions/BulkScriptAction.ts
@@ -29,7 +29,7 @@ export interface IBulkScriptActionOptions extends IBaseScriptActionOptions {
   enableParallelism: boolean;
   ignoreMissingScript: boolean;
   ignoreDependencyOrder: boolean;
-  doNotFailOnWarnings: boolean;
+  allowWarningsInSuccessfulBuild: boolean;
 
   /**
    * Optional command to run. Otherwise, use the `actionName` as the command to run.
@@ -58,15 +58,15 @@ export class BulkScriptAction extends BaseScriptAction {
   private _verboseParameter: CommandLineFlagParameter;
   private _parallelismParameter: CommandLineStringParameter | undefined;
   private _ignoreDependencyOrder: boolean;
-  private _doNotFailOnWarnings: boolean;
+  private _allowWarningsInSuccessfulBuild: boolean;
 
   constructor(options: IBulkScriptActionOptions) {
     super(options);
     this._enableParallelism = options.enableParallelism;
     this._ignoreMissingScript = options.ignoreMissingScript;
     this._commandToRun = options.commandToRun || options.actionName;
     this._ignoreDependencyOrder = options.ignoreDependencyOrder;
-    this._doNotFailOnWarnings = options.doNotFailOnWarnings;
+    this._allowWarningsInSuccessfulBuild = options.allowWarningsInSuccessfulBuild;
   }
 
   public run(): Promise<void> {
@@ -103,7 +103,7 @@ export class BulkScriptAction extends BaseScriptAction {
       changedProjectsOnly,
       ignoreMissingScript: this._ignoreMissingScript,
       ignoreDependencyOrder: this._ignoreDependencyOrder,
-      doNotFailOnWarnings: this._doNotFailOnWarnings
+      allowWarningsInSuccessfulBuild: this._allowWarningsInSuccessfulBuild
     });
 
     return tasks.execute().then(() => {
diff --git a/apps/rush-lib/src/logic/TaskSelector.ts b/apps/rush-lib/src/logic/TaskSelector.ts
@@ -21,7 +21,7 @@ export interface ITaskSelectorConstructor {
   changedProjectsOnly: boolean;
   ignoreMissingScript: boolean;
   ignoreDependencyOrder: boolean;
-  doNotFailOnWarnings: boolean;
+  allowWarningsInSuccessfulBuild: boolean;
 }
 
 /**
@@ -47,7 +47,7 @@ export class TaskSelector {
       quietMode: this._options.isQuietMode,
       parallelism: this._options.parallelism,
       changedProjectsOnly: this._options.changedProjectsOnly,
-      doNotFailOnWarnings: this._options.doNotFailOnWarnings
+      allowWarningsInSuccessfulBuild: this._options.allowWarningsInSuccessfulBuild
     });
 
     try {
diff --git a/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts b/apps/rush-lib/src/logic/taskRunner/TaskRunner.ts
@@ -20,7 +20,7 @@ export interface ITaskRunnerOptions {
   quietMode: boolean;
   parallelism: string | undefined;
   changedProjectsOnly: boolean;
-  doNotFailOnWarnings: boolean;
+  allowWarningsInSuccessfulBuild: boolean;
   terminal?: Terminal;
 }
 
@@ -34,7 +34,7 @@ export interface ITaskRunnerOptions {
 export class TaskRunner {
   private _tasks: Map<string, ITask>;
   private _changedProjectsOnly: boolean;
-  private _doNotFailOnWarnings: boolean;
+  private _allowWarningsInSuccessfulBuild: boolean;
   private _buildQueue: ITask[];
   private _quietMode: boolean;
   private _hasAnyFailures: boolean;
@@ -50,7 +50,7 @@ export class TaskRunner {
       quietMode,
       parallelism,
       changedProjectsOnly,
-      doNotFailOnWarnings,
+      allowWarningsInSuccessfulBuild,
       terminal = new Terminal(new ConsoleTerminalProvider())
     } = options;
     this._tasks = new Map<string, ITask>();
@@ -59,7 +59,7 @@ export class TaskRunner {
     this._hasAnyFailures = false;
     this._hasAnyWarnings = false;
     this._changedProjectsOnly = changedProjectsOnly;
-    this._doNotFailOnWarnings = doNotFailOnWarnings;
+    this._allowWarningsInSuccessfulBuild = allowWarningsInSuccessfulBuild;
     this._terminal = terminal;
 
     const numberOfCores: number = os.cpus().length;
@@ -176,7 +176,7 @@ export class TaskRunner {
 
       if (this._hasAnyFailures) {
         return Promise.reject(new Error('Project(s) failed to build'));
-      } else if (this._hasAnyWarnings && !this._doNotFailOnWarnings) {
+      } else if (this._hasAnyWarnings && !this._allowWarningsInSuccessfulBuild) {
         this._terminal.writeWarningLine('Project(s) succeeded with warnings');
         return Promise.reject(new AlreadyReportedError());
       } else {
diff --git a/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts b/apps/rush-lib/src/logic/taskRunner/test/TaskRunner.test.ts
@@ -43,7 +43,7 @@ describe('TaskRunner', () => {
         parallelism: 'tequila',
         changedProjectsOnly: false,
         terminal,
-        doNotFailOnWarnings: false
+        allowWarningsInSuccessfulBuild: false
       })).toThrowErrorMatchingSnapshot();
     });
   });
@@ -55,7 +55,7 @@ describe('TaskRunner', () => {
           parallelism: '1',
           changedProjectsOnly: false,
           terminal,
-          doNotFailOnWarnings: false
+          allowWarningsInSuccessfulBuild: false
       });
     });
 
@@ -100,7 +100,7 @@ describe('TaskRunner', () => {
         parallelism: '1',
         changedProjectsOnly: false,
         terminal,
-        doNotFailOnWarnings: false
+        allowWarningsInSuccessfulBuild: false
       });
     });
 
@@ -207,7 +207,7 @@ describe('TaskRunner', () => {
           parallelism: '1',
           changedProjectsOnly: false,
           terminal,
-          doNotFailOnWarnings: false
+          allowWarningsInSuccessfulBuild: false
         });
       });
 
@@ -243,7 +243,7 @@ describe('TaskRunner', () => {
           parallelism: '1',
           changedProjectsOnly: false,
           terminal,
-          doNotFailOnWarnings: true
+          allowWarningsInSuccessfulBuild: true
         });
       });
 
