Merge pull request #3616 from ActiveState/mitchell/dx-3193

Force prompt option should override non-interactive option.

Author: mitchell-as

cmd/state-installer/test/integration/installer_int_test.go

@@ -48,6 +48,9 @@ func (suite *InstallerIntegrationTestSuite) TestInstallFromLocalSource() {
 
 	// Assert output
 	cp.Expect("Installing State Tool")
+	if runtime.GOOS == "windows" {
+		cp.Expect("Continuing because State Tool is running in non-interactive mode") // admin prompt
+	}
 	cp.Expect("Done")
 	cp.Expect("successfully installed")
 	suite.NotContains(cp.Output(), "Downloading State Tool")

internal/prompt/prompt.go

@@ -129,9 +129,7 @@ func (p *Prompt) InputAndValidate(title, message string, defaultResponse *string
 		if nonInteractiveResponse == nil {
 			return "", ErrNoForceOption
 		}
-	}
-
-	if !p.isInteractive {
+	} else if !p.isInteractive {
 		nonInteractiveResponse = defaultResponse
 		if nonInteractiveResponse == nil {
 			return "", interactiveInputError(message)
@@ -194,9 +192,7 @@ func (p *Prompt) Select(title, message string, choices []string, defaultChoice *
 		if nonInteractiveChoice == nil {
 			return "", ErrNoForceOption
 		}
-	}
-
-	if !p.isInteractive {
+	} else if !p.isInteractive {
 		nonInteractiveChoice = defaultChoice
 		if nonInteractiveChoice == nil {
 			return "", interactiveInputError(message)
@@ -253,9 +249,7 @@ func (p *Prompt) Confirm(title, message string, defaultChoice *bool, forcedChoic
 		if nonInteractiveChoice == nil {
 			return false, ErrNoForceOption
 		}
-	}
-
-	if !p.isInteractive {
+	} else if !p.isInteractive {
 		nonInteractiveChoice = defaultChoice
 		if nonInteractiveChoice == nil {
 			return false, interactiveInputError(message)

test/integration/install_scripts_int_test.go

@@ -114,6 +114,9 @@ func (suite *InstallScriptsIntegrationTestSuite) TestInstall() {
 			}
 			cp := ts.SpawnCmdWithOpts(cmd, opts...)
 			cp.Expect("Preparing Installer for State Tool Package Manager")
+			if runtime.GOOS == "windows" {
+				cp.Expect("Continuing because the '--force' flag is set") // admin prompt
+			}
 			cp.Expect("Installation Complete", e2e.RuntimeSourcingTimeoutOpt)
 
 			if tt.Activate != "" || tt.ActivateByCommand != "" {