commit 5a51d0a519cb6605280adb8719f0e050ea69bac6
author Carlos Sanchez <carlos@apache.org> Thu Apr 21 13:50:25 2016 +0200
committer Carlos Sanchez <carlos@apache.org> Thu Apr 21 13:50:25 2016 +0200
tree e600877e82a86bacb7f24a2768865de5fdadb688
parent 60a3616facf40687a80b934f9659ae0320cf60af

Make tests work in 2.0

tests/test_helpers.bash

diff --git a/tests/test_helpers.bash b/tests/test_helpers.bash
index d5a3794..f7d7c45 100644
--- a/tests/test_helpers.bash
+++ b/tests/test_helpers.bash
@@ -53,8 +53,12 @@
     echo "http://$DOCKER_IP:$(docker port "$SUT_CONTAINER" 8080 | cut -d: -f2)"
 }
 
+function get_jenkins_password {
+    docker logs "$SUT_CONTAINER" 2>&1 | grep -A 2 "Please use the following password to proceed to installation" | tail -n 1
+}
+
 function test_url {
-    run curl --output /dev/null --silent --head --fail --connect-timeout 30 --max-time 60 "$(get_jenkins_url)$1"
+    run curl --user "admin:$(get_jenkins_password)" --output /dev/null --silent --head --fail --connect-timeout 30 --max-time 60 "$(get_jenkins_url)$1"
     if [ "$status" -eq 0 ]; then
         true
     else

tests/tests.bats

diff --git a/tests/tests.bats b/tests/tests.bats
index 6b0860e..01f42fe 100644
--- a/tests/tests.bats
+++ b/tests/tests.bats
@@ -44,9 +44,9 @@
 @test "JAVA_OPTS are set" {
     local sed_expr='s/<wbr>//g;s/<td class="pane">.*<\/td><td class.*normal">//g;s/<t.>//g;s/<\/t.>//g'
     assert 'default-src &#039;self&#039;; script-src &#039;self&#039; &#039;unsafe-inline&#039; &#039;unsafe-eval&#039;; style-src &#039;self&#039; &#039;unsafe-inline&#039;;' \
-      bash -c "curl -fsSL $(get_jenkins_url)/systemInfo | sed 's/<\/tr>/<\/tr>\'$'\n/g' | grep '<td class=\"pane\">hudson.model.DirectoryBrowserSupport.CSP</td>' | sed -e '${sed_expr}'"
+      bash -c "curl -fsSL --user \"admin:$(get_jenkins_password)\" $(get_jenkins_url)/systemInfo | sed 's/<\/tr>/<\/tr>\'$'\n/g' | grep '<td class=\"pane\">hudson.model.DirectoryBrowserSupport.CSP</td>' | sed -e '${sed_expr}'"
     assert 'Europe/Madrid' \
-      bash -c "curl -fsSL $(get_jenkins_url)/systemInfo | sed 's/<\/tr>/<\/tr>\'$'\n/g' | grep '<td class=\"pane\">user.timezone</td>' | sed -e '${sed_expr}'"
+      bash -c "curl -fsSL --user \"admin:$(get_jenkins_password)\" $(get_jenkins_url)/systemInfo | sed 's/<\/tr>/<\/tr>\'$'\n/g' | grep '<td class=\"pane\">user.timezone</td>' | sed -e '${sed_expr}'"
 }
 
 @test "plugins are installed" {