fix: adapt tests to work with newer prettier versions

Author: simschla

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest.java

@@ -40,7 +40,7 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 					"    npmWorkDir = file(\"${buildDir}/npm\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
 					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
@@ -59,7 +59,7 @@ void useNodeAndNpmFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -79,7 +79,7 @@ void useNodeAndNpmFromNodeGradlePlugin_example1() throws Exception {
 			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -93,7 +93,7 @@ void useNpmFromNodeGradlePlugin_example2() throws Exception {
 			setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -115,7 +115,7 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def npmExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/npm.cmd' : '/bin/npm'",
 					"spotless {",
@@ -132,7 +132,7 @@ void useNpmFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;
@@ -154,7 +154,7 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 					"    workDir = file(\"${buildDir}/nodejs\")",
 					"}",
 					"def prettierConfig = [:]",
-					"prettierConfig['printWidth'] = 50",
+					"prettierConfig['printWidth'] = 20",
 					"prettierConfig['parser'] = 'typescript'",
 					"def nodeExec = System.getProperty('os.name').toLowerCase().contains('windows') ? '/node.exe' : '/bin/node'",
 					"spotless {",
@@ -171,7 +171,7 @@ void useNpmNextToConfiguredNodePluginFromNodeGradlePlugin() throws Exception {
 			// then run spotless using that node installation
 			final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 			Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
-			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile.clean");
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
 		} catch (Exception e) {
 			printContents();
 			throw e;

plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_1.gradle

@@ -16,7 +16,7 @@ node {
     npmWorkDir = file("${buildDir}/npm")
 }
 def prettierConfig = [:]
-prettierConfig['printWidth'] = 50
+prettierConfig['printWidth'] = 20
 prettierConfig['parser'] = 'typescript'
 
 // the executable names

plugin-gradle/src/test/resources/com/diffplug/gradle/spotless/NpmTestsWithoutNpmInstallationTest_gradle_node_plugin_example_2.gradle

@@ -14,7 +14,7 @@ node {
     workDir = file("${buildDir}/nodejs")
 }
 def prettierConfig = [:]
-prettierConfig['printWidth'] = 50
+prettierConfig['printWidth'] = 20
 prettierConfig['parser'] = 'typescript'
 
 // the executable name