Use test platform helper in required tests

Author: nhoughto

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

@@ -16,6 +16,7 @@ class NpmInstallTaskTest extends AbstractTaskTest {
         GradleProxyHelper.setHttpsProxyPort(11235)
 
         def task = project.tasks.getByName("npmInstall")
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
 
         when:
@@ -36,6 +37,7 @@ class NpmInstallTaskTest extends AbstractTaskTest {
         nodeExtension.nodeProxySettings.set(ProxySettings.OFF)
 
         def task = project.tasks.getByName("npmInstall")
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
 
         when:

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

@@ -2,7 +2,6 @@ package com.github.gradle.node.npm.task
 
 import com.github.gradle.node.npm.proxy.GradleProxyHelper
 import com.github.gradle.node.task.AbstractTaskTest
-import org.gradle.process.ExecSpec
 
 class NpmSetupTaskTest extends AbstractTaskTest {
     def cleanup() {
@@ -14,6 +13,7 @@ class NpmSetupTaskTest extends AbstractTaskTest {
         props.setProperty('os.name', 'Linux')
 
         def task = project.tasks.create('simple', NpmSetupTask)
+        mockPlatformHelper(task)
 
         when:
         project.evaluate()
@@ -28,6 +28,7 @@ class NpmSetupTaskTest extends AbstractTaskTest {
         nodeExtension.npmVersion.set('6.4.1')
 
         def task = project.tasks.create('simple', NpmSetupTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
 
         when:
@@ -51,6 +52,7 @@ class NpmSetupTaskTest extends AbstractTaskTest {
         GradleProxyHelper.setHttpProxyPort(1234)
 
         def task = project.tasks.create('simple', NpmSetupTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
 
         when:

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

@@ -19,6 +19,7 @@ class NodeTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(false)
 
         def task = project.tasks.create('simple', NodeTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         task.args.set(['a', 'b'])
         task.options.set(['c', 'd'])
@@ -48,6 +49,7 @@ class NodeTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(false)
 
         def task = project.tasks.create('simple', NodeTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         task.ignoreExitValue.set(true)
 
@@ -73,6 +75,7 @@ class NodeTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(true)
 
         def task = project.tasks.create('simple', NodeTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         def script = new File(projectDir, 'script.js')
         task.script.set(script)
@@ -93,6 +96,7 @@ class NodeTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(false)
 
         def task = project.tasks.create('simple', NodeTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         def script = new File(projectDir, 'script.js')
 
@@ -117,6 +121,7 @@ class NodeTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(true)
 
         def task = project.tasks.create('simple', NodeTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         def script = new File(projectDir, 'script.js')
         task.script.set(script)

src/test/groovy/com/github/gradle/node/util/PlatformHelperTest.groovy

@@ -9,7 +9,7 @@ class PlatformHelperTest extends Specification {
 
     def setup() {
         this.props = new Properties()
-        PlatformHelper.INSTANCE = this.helper = new TestablePlatformHelper(this.props)
+        this.helper = new TestablePlatformHelper(this.props)
     }
 
     @Unroll

src/test/groovy/com/github/gradle/node/yarn/task/YarnTaskTest.groovy

@@ -35,6 +35,7 @@ class YarnTaskTest extends AbstractTaskTest {
         nodeExtension.download.set(true)
 
         def task = project.tasks.create('simple', YarnTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         task.args.set(["run", "command"])
 
@@ -61,6 +62,7 @@ class YarnTaskTest extends AbstractTaskTest {
         GradleProxyHelper.setHttpsProxyPassword("password")
 
         def task = project.tasks.create('simple', YarnTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         task.args.set(["run", "command"])
 
@@ -89,6 +91,7 @@ class YarnTaskTest extends AbstractTaskTest {
         nodeExtension.nodeProxySettings.set(ProxySettings.OFF)
 
         def task = project.tasks.create('simple', YarnTask)
+        mockPlatformHelper(task)
         mockProjectApiHelperExec(task)
         task.args.set(["run", "command"])