From 17214fdd5dadbc41a7dd2b74203efca8ffceaa5a Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Sun, 2 Sep 2012 14:03:31 +0100 Subject: [PATCH] Tweaks to get the cucumber tests passing. --- bin/gvm | 2 +- src/test/cucumber/gvm/command_line_interop.feature | 1 + src/test/resources/gvm/env.groovy | 4 ---- src/test/resources/gvm/installation_steps.groovy | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bin/gvm b/bin/gvm index 7946565c..65767c28 100755 --- a/bin/gvm +++ b/bin/gvm @@ -14,7 +14,7 @@ function help { } if [ -f "$HOME/.gvmtest" ]; then - GVM_SERVICE="http://localhost:8080/gvm-service" + GVM_SERVICE="http://localhost:8080" fi if [ ! -d "$GVM_DIR" ]; then diff --git a/src/test/cucumber/gvm/command_line_interop.feature b/src/test/cucumber/gvm/command_line_interop.feature index fe200b6e..d08555e0 100644 --- a/src/test/cucumber/gvm/command_line_interop.feature +++ b/src/test/cucumber/gvm/command_line_interop.feature @@ -3,6 +3,7 @@ Feature: Command Line Interop Background: Given an initialised system + @webservice Scenario: Enter gvm When I enter "gvm" Then I see "Usage: gvm [version]" diff --git a/src/test/resources/gvm/env.groovy b/src/test/resources/gvm/env.groovy index 351a20ca..7b761a0e 100644 --- a/src/test/resources/gvm/env.groovy +++ b/src/test/resources/gvm/env.groovy @@ -24,7 +24,3 @@ private cleanUp(){ Before("@webservice"){ def server = startServer() } - -//After("@webservice"){ -// stopServer(server) -//} \ No newline at end of file diff --git a/src/test/resources/gvm/installation_steps.groovy b/src/test/resources/gvm/installation_steps.groovy index 4b91c85a..0a851d58 100644 --- a/src/test/resources/gvm/installation_steps.groovy +++ b/src/test/resources/gvm/installation_steps.groovy @@ -6,7 +6,7 @@ home = System.getProperty('user.home') gvmDir = new File("${home}/.gvm") Given(~'^the default "([^"]*)" candidate is "([^"]*)"$') { String candidate, String version -> - def candidateVersion = new URL("http://localhost:8080/gvm-service/${candidate}/version").text + def candidateVersion = new URL("http://localhost:8080/${candidate}/version").text assert candidateVersion == version }