Skip to content

Commit 5112a06

Browse files
committed
Bump node version used in tests to support M1
1 parent 4eda1f3 commit 5112a06

File tree

7 files changed

+12
-9
lines changed

7 files changed

+12
-9
lines changed

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.github.gradle.node.npm.task
22

33
import com.github.gradle.AbstractIntegTest
4+
import com.github.gradle.node.NodeExtension
45
import org.gradle.testkit.runner.TaskOutcome
56

7+
import static com.github.gradle.node.NodeExtension.DEFAULT_NODE_VERSION
8+
69
class NpmInstall_integTest extends AbstractIntegTest {
710
def 'install packages with npm (#gv.version)'() {
811
given:
@@ -48,17 +51,17 @@ class NpmInstall_integTest extends AbstractIntegTest {
4851
given:
4952
gradleVersion = gv
5053
51-
writeBuild('''
54+
writeBuild("""
5255
plugins {
5356
id 'com.github.node-gradle.node'
5457
}
5558
5659
node {
5760
download = true
58-
version = '15.2.1'
61+
version = '$DEFAULT_NODE_VERSION'
5962
npmVersion = '7.0.1'
6063
}
61-
''')
64+
""")
6265
writeEmptyPackageJson()
6366
6467
when:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class NodeTask_integTest extends AbstractIntegTest {
8989
9090
then:
9191
result9.task(":version").outcome == TaskOutcome.SUCCESS
92-
result9.output.contains("Version: v12.13.0")
92+
result9.output.contains("Version: v16.14.2")
9393
9494
where:
9595
gv << GRADLE_VERSIONS_UNDER_TEST

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class YarnInstall_integTest extends AbstractIntegTest {
5353
node {
5454
download = true
5555
yarnWorkDir = file('build/yarn')
56-
version = '15.2.1'
56+
version = '16.14.2'
5757
npmVersion = '7.0.1'
5858
}
5959
''')

src/test/resources/fixtures/node-allow-insecure-protocol/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
node {
6-
version = "12.13.0"
6+
version = "16.14.2"
77
distBaseUrl = "http://nodejs.org/dist/"
88
download = true
99
allowInsecureProtocol = true

src/test/resources/fixtures/node-disallow-insecure-protocol/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
node {
6-
version = "12.13.0"
6+
version = "16.14.2"
77
distBaseUrl = "https://nodejs.org/dist/"
88
download = true
99
allowInsecureProtocol = false

src/test/resources/fixtures/node-fail-on-project-repos-download/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
node {
6-
version = "12.13.0"
6+
version = "16.14.2"
77
distBaseUrl = null
88
download = true
99
workDir = file("build/node")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
node {
8-
version = "12.13.0"
8+
version = "16.14.2"
99
download = true
1010
workDir = file("build/node")
1111
}

0 commit comments

Comments
 (0)