Fix Gradle 8.0 tests

Author: deepy

src/test/groovy/com/github/gradle/node/npm/task/NpmInstall_integTest.groovy

@@ -165,12 +165,15 @@ class NpmInstall_integTest extends AbstractIntegTest {
                 npmInstallCommand = 'install'
             }
 
+            def lock = file('package-lock.json')
             task verifyIO {
+                def outputs = tasks.named("npmInstall").get().outputs.files
+                def inputs = tasks.named("npmInstall").get().inputs.files
                 doLast {
-                    if (!tasks.named("npmInstall").get().outputs.files.contains(file('package-lock.json'))) {
+                    if (!outputs.contains(lock)) {
                         throw new RuntimeException("package-lock.json is not in INSTALL'S outputs!")
                     }
-                    if (tasks.named("npmInstall").get().inputs.files.contains(file('package-lock.json'))) {
+                    if (inputs.contains(lock)) {
                         throw new RuntimeException("package-lock.json is in INSTALL'S inputs!")
                     }
                 }
@@ -202,12 +205,15 @@ class NpmInstall_integTest extends AbstractIntegTest {
                 npmInstallCommand = 'ci'
             }
 
+            def lock = file('package-lock.json')
             task verifyIO {
+                def outputs = tasks.named("npmInstall").get().outputs.files
+                def inputs = tasks.named("npmInstall").get().inputs.files
                 doLast {
-                    if (tasks.named("npmInstall").get().outputs.files.contains(file('package-lock.json'))) {
+                    if (outputs.contains(lock)) {
                         throw new RuntimeException("package-lock.json is in CI'S outputs!")
                     }
-                    if (!tasks.named("npmInstall").get().inputs.files.contains(file('package-lock.json'))) {
+                    if (!inputs.contains(lock)) {
                         throw new RuntimeException("package-lock.json is not in CI'S inputs!")
                     }
                 }

src/test/groovy/com/github/gradle/node/task/NodeTask_integTest.groovy

@@ -81,8 +81,13 @@ class NodeTask_integTest extends AbstractIntegTest {
 
         then:
         result8.task(":executeDirectoryScript").outcome == TaskOutcome.FAILED
-        // Gradle < 7 || Gradle >= 7
-        result8.output.contains("specified for property 'script' is not a file") || result8.output.contains("Reason: Expected an input to be a file but it was a directory.")
+        if (gv < GradleVersion.version("7.0")) {
+            assert result8.output.contains("specified for property 'script' is not a file")
+        } else if (gv < GradleVersion.version("8.0-milestone-1")) {
+            assert result8.output.contains("Reason: Expected an input to be a file but it was a directory.")
+        } else {
+            assert result8.output.contains("Accessing unreadable inputs or outputs is not supported.")
+        }
 
         when:
         def result9 = build(":version")

src/test/resources/fixtures/node-env/build.gradle

@@ -45,9 +45,11 @@ if (ignoreExitValue) {
     env.ignoreExitValue = true
 }
 
-if (outputFile) {
+if (isPropertyEnabled("outputFile")) {
+    def out = project.objects.fileProperty()
+    out.set(project.file("${buildDir}/standard-output.txt"))
     env.execOverrides {
-        standardOutput = new FileOutputStream("${buildDir}/standard-output.txt")
+        standardOutput = new FileOutputStream(out.get().asFile)
     }
 }
 

src/test/resources/fixtures/node-system-version/build.gradle

@@ -7,9 +7,10 @@ task hello(type: NodeTask) {
 }
 
 task countRepositories {
+    def size = repositories.size()
     dependsOn nodeSetup
     doLast {
-        println "Project repositories: ${repositories.size()}"
+        println "Project repositories: ${size}"
     }
 }
 

src/test/resources/fixtures/node/build.gradle

@@ -29,8 +29,10 @@ if (changeArgs) {
     hello.args = ["Bob", "Alice"]
 }
 
+def scriptFile = file(".")
+
 task executeDirectoryScript(type: NodeTask) {
-    script = file(".")
+    script = scriptFile
     outputs.upToDateWhen {
         true
     }

src/test/resources/fixtures/yarn-env/build.gradle

@@ -52,8 +52,10 @@ if (isPropertyEnabled("customWorkingDir")) {
 }
 
 if (isPropertyEnabled("outputFile")) {
+    def out = project.objects.fileProperty()
+    out.set(project.file("${buildDir}/standard-output.txt"))
     env.execOverrides {
-        standardOutput = new FileOutputStream("${buildDir}/standard-output.txt")
+        standardOutput = new FileOutputStream(out.get().asFile)
     }
 }