Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDT-495] Add npm step #31

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[SDT-495] Add npm step #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4937204
Add npm step
Jan 18, 2018
3aa4f30
Rename sbtCommands to npmCommands
Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/main/groovy/uk/gov/hmrc/jenkinsjobbuilders/domain/step/NpmStep.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package uk.gov.hmrc.jenkinsjobbuilders.domain.step

import static uk.gov.hmrc.jenkinsjobbuilders.domain.step.ShellStep.shellStep

class NpmStep implements Step {

private static final String EOL = System.getProperty("line.separator")
private final Step step

private NpmStep(String bashScript, List<String> npmCommands) {
this.step = shellStep(sbtCommands.inject(bashScript + EOL) {
string, item -> string + EOL + "npm run $item"
})
}

static Step npmStep(List<String> commands) {
npmStep("", commands)
}

static Step npmStep(String bashScript, List<String> commands) {
new NpmStep(bashScript, commands)
}

@Override
Closure toDsl() {
step.toDsl()
}
}
41 changes: 41 additions & 0 deletions src/test/groovy/uk/gov/hmrc/jenkinsjobbuilders/domain/step/NpmStepSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package uk.gov.hmrc.jenkinsjobbuilders.domain.step

import javaposse.jobdsl.dsl.Job
import spock.lang.Specification
import uk.gov.hmrc.jenkinsjobbuilders.domain.JobParents
import uk.gov.hmrc.jenkinsjobbuilders.domain.builder.JobBuilder

import static uk.gov.hmrc.jenkinsjobbuilders.domain.step.NpmStep.npmStep

@Mixin(JobParents)
class NpmStepSpec extends Specification {

void 'test XML output'() {
given:
JobBuilder jobBuilder = new JobBuilder('test-job', 'test-job-description').
withSteps(npmStep(["test"]))

when:
Job job = jobBuilder.build(jobParent())

then:
with(job.node) {
builders.'hudson.tasks.Shell' [0].command.text().contains("npm run test")
}
}

void 'test prepended bash script'() {
given:
JobBuilder jobBuilder = new JobBuilder('test-job', 'test-job-description').
withSteps(npmStep("nvm use 4.8.4", ["test"]))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will the first command always be something in the form of npm use x.y.x? If so I wonder if it makes sense to add the desired npm version as a parameter in npmStep method? so you could then call it like npmStep("4.8.4", ["test"]), which would then implicitly know to call npm use x.y.x as the first operation.


when:
Job job = jobBuilder.build(jobParent())

then:
with(job.node) {
builders.'hudson.tasks.Shell' [0].command.text().contains("nvm use 4.8.4")
builders.'hudson.tasks.Shell' [0].command.text().contains("npm run test")
}
}
}