Move underscores test first, so that no config exists yet.

pkg/ddevapp/config_test.go

@@ -257,6 +257,39 @@ func TestConfigCommand(t *testing.T) {
 		name := strings.ToLower(util.RandString(16))
 		invalidAppType := strings.ToLower(util.RandString(8))
 
+		// Create a docroot folder containing underscores.
+		err = os.Mkdir(filepath.Join(testDir, "docroot_with_underscores"), 0644)
+		if err != nil {
+			t.Errorf("Could not create docroot_with_underscores directory under %s", testDir)
+		}
+
+		// Create an example input buffer that uses the default projectname , then a
+		// valid document root, then a valid app type.
+		input = fmt.Sprintf("\n\ndocroot_with_underscores\n%s", testValues[apptypePos])
+		scanner = bufio.NewScanner(strings.NewReader(input))
+		util.SetInputScanner(scanner)
+
+		restoreOutput = util.CaptureUserOut()
+		err = app.PromptForConfig()
+		assert.NoError(err)
+		out = restoreOutput()
+
+		// Ensure we have expected vales in output.
+		assert.Contains(out, testDir)
+		assert.NotContains(out, "docroot_with_underscores is not a valid project name")
+
+		// Ensure values were properly set on the app struct.
+		assert.Equal("docroot-with-underscores", app.Name)
+		assert.Equal(testValues[apptypePos], app.Type)
+		assert.Equal("docroot_with_underscores", app.Docroot)
+		assert.EqualValues(testValues[phpVersionPos], app.PHPVersion, "PHP value incorrect for apptype %v (expected %s got %s) (%v)", app.Type, testValues[phpVersionPos], app.PHPVersion, app)
+		err = ddevapp.PrepDdevDirectory(app)
+		assert.NoError(err)
+
+		// Randomize some values to use for Stdin during testing.
+		name := strings.ToLower(util.RandString(16))
+		invalidAppType := strings.ToLower(util.RandString(8))
+
 		// Create an example input buffer that writes the sitename, a valid document root,
 		// an invalid app type, and finally a valid app type (from test matrix)
 		input := fmt.Sprintf("%s\ndocroot\n%s\n%s", name, invalidAppType, testValues[apptypePos])
@@ -294,35 +327,6 @@ func TestConfigCommand(t *testing.T) {
 		assert.EqualValues(testValues[phpVersionPos], app.PHPVersion, "PHP value incorrect for apptype %v (expected %s got %s) (%v)", app.Type, testValues[phpVersionPos], app.PHPVersion, app)
 		err = ddevapp.PrepDdevDirectory(app)
 		assert.NoError(err)
-
-		// Create a docroot folder containing underscores.
-		err = os.Mkdir(filepath.Join(testDir, "docroot_with_underscores"), 0644)
-		if err != nil {
-			t.Errorf("Could not create docroot_with_underscores directory under %s", testDir)
-		}
-
-		// Create an example input buffer that uses the default projectname, then a
-		// valid document root, then a valid app type.
-		input = fmt.Sprintf("\n\ndocroot_with_underscores\n%s", testValues[apptypePos])
-		scanner = bufio.NewScanner(strings.NewReader(input))
-		util.SetInputScanner(scanner)
-
-		restoreOutput = util.CaptureUserOut()
-		err = app.PromptForConfig()
-		assert.NoError(err)
-		out = restoreOutput()
-
-		// Ensure we have expected vales in output.
-		assert.Contains(out, testDir)
-		assert.NotContains(out, "docroot_with_underscores is not a valid project name")
-
-		// Ensure values were properly set on the app struct.
-		assert.Equal("docroot-with-underscores", app.Name)
-		assert.Equal(testValues[apptypePos], app.Type)
-		assert.Equal("docroot_with_underscores", app.Docroot)
-		assert.EqualValues(testValues[phpVersionPos], app.PHPVersion, "PHP value incorrect for apptype %v (expected %s got %s) (%v)", app.Type, testValues[phpVersionPos], app.PHPVersion, app)
-		err = ddevapp.PrepDdevDirectory(app)
-		assert.NoError(err)
 	}
 }