summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.rst4
-rw-r--r--tests/acceptance/run.sh9
2 files changed, 12 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index 7acf920be..4f3912fce 100644
--- a/README.rst
+++ b/README.rst
@@ -160,6 +160,10 @@ Integration tests::
.. note:: For acceptance tests, a user with the name **test** and password **test** must exist!
+.. note:: To change the url under which ownCloud is installed, set the environment variable $OWNCLOUD_HOST::
+
+ export OWNCLOUD_HOST='localhost/core'
+
Acceptance tests::
make acceptance-tests
diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh
index 33d7b3cf9..8933c44cb 100644
--- a/tests/acceptance/run.sh
+++ b/tests/acceptance/run.sh
@@ -71,5 +71,12 @@ fi
rvm install 2.0.0
rvm use ruby-2.0.0@oc_acceptance --create
+# install dep libraries
bundle install
-cucumber -f json -o ./logs/owncloud.json -f pretty HOST=localhost/owncloud features \ No newline at end of file
+
+# if the OWNCLOUD_HOST variable is not set it will default to localhost/owncloud
+if [[ -z "$OWNCLOUD_HOST" ]]; then
+ export OWNCLOUD_HOST='localhost/owncloud'
+fi
+
+cucumber -f json -o ./logs/owncloud.json -f pretty HOST=$OWNCLOUD_HOST features \ No newline at end of file