Enable proxy tests again, they should work

Author: nhoughto

.github/workflows/build.yml

@@ -6,9 +6,9 @@ jobs:
     strategy:
       matrix:
         config:
-          - {os: ubuntu-latest, params: "-PtestAllSupportedGradleVersions=true -PtestProxyIntegrationTests=false" }
-          - {os: windows-latest, params: "-PtestProxyIntegrationTests=false" }
-          - {os: macos-latest, params: "-PtestProxyIntegrationTests=false" }
+          - {os: ubuntu-latest, params: "-PtestAllSupportedGradleVersions=true" }
+          - {os: windows-latest, params: "" }
+          - {os: macos-latest, params: "" }
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v2

build.gradle.kts

@@ -74,7 +74,6 @@ tasks.test {
     )
     systemProperty("testMinimumCurrentGradleVersion", project.properties["testMinimumCurrentGradleVersion"] ?: "false")
     systemProperty("testCurrentGradleVersion", project.properties["testCurrentGradleVersion"] ?: "true")
-    systemProperty("testProxyIntegrationTests", project.properties["testProxyIntegrationTests"] ?: "true")
 
     val processorsCount = Runtime.getRuntime().availableProcessors()
     maxParallelForks = if (processorsCount > 2) processorsCount.div(2) else processorsCount

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

@@ -5,13 +5,11 @@ import com.github.gradle.node.ProxyTestHelper
 import org.gradle.testkit.runner.TaskOutcome
 import org.mockserver.integration.ClientAndServer
 import org.mockserver.socket.PortFactory
-import spock.lang.Requires
 
 import static org.mockserver.integration.ClientAndServer.startClientAndServer
 import static org.mockserver.model.HttpRequest.request
 import static org.mockserver.verify.VerificationTimes.exactly
 
-@Requires({ System.getProperty("testProxyIntegrationTests").equals("true") })
 class NpmProxy_integTest extends AbstractIntegTest {
     private ClientAndServer proxyMockServer
 

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

@@ -5,15 +5,13 @@ import com.github.gradle.node.ProxyTestHelper
 import org.gradle.testkit.runner.TaskOutcome
 import org.mockserver.integration.ClientAndServer
 import org.mockserver.socket.PortFactory
-import spock.lang.Requires
 
 import static java.nio.charset.StandardCharsets.UTF_8
 import static org.mockserver.integration.ClientAndServer.startClientAndServer
 import static org.mockserver.model.HttpRequest.request
 import static org.mockserver.model.SocketAddress.Scheme.HTTPS
 import static org.mockserver.verify.VerificationTimes.exactly
 
-@Requires({ System.getProperty("testProxyIntegrationTests").equals("true") })
 class YarnProxy_integTest extends AbstractIntegTest {
     private ClientAndServer proxyMockServer
     // We have to configure a second proxy otherwise Yarn does not want to use its own repository using HTTP,