Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
e2e-test: Rename 'default' after GerritSimulation core change Id33ada17
e2e-test: Rename 'unique' after GerritSimulation core change I229976f5
e2e-test: Rename 'name' after GerritSimulation core change I3527fb39
Change-Id: I2c9d4b82e5c4ba7eba16daee3ae5793a913d7a43
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/renameproject/scenarios/RenameProject.scala b/src/test/scala/com/googlesource/gerrit/plugins/renameproject/scenarios/RenameProject.scala
index 744f245..36665ee 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/renameproject/scenarios/RenameProject.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/renameproject/scenarios/RenameProject.scala
@@ -23,18 +23,18 @@
class RenameProject extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
- private val default = name
- private val renamedTo = unique
+ private val projectName = className
+ private val renamedTo = uniqueName
override def replaceOverride(in: String): String = {
- val next = replaceKeyWith("_project", default, in)
+ val next = replaceKeyWith("_project", projectName, in)
replaceKeyWith("_renamed", renamedTo, next)
}
- private val createProject = new CreateProject(default)
+ private val createProject = new CreateProject(projectName)
private val deleteProject = new DeleteProject(renamedTo)
- private val test: ScenarioBuilder = scenario(unique)
+ private val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(httpRequest.body(ElFileBody(body)).asJson)
