Skip to content

Commit 7088e1c

Browse files
committed
Improve tests and fix the version in ./VERSION
1 parent bbc9f59 commit 7088e1c

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

docker/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ RUN curl -# -L -o phpldapadmin.tar.gz ${DIST_URL} && \
6262
rm phpldapadmin.tar.gz && \
6363
wget https://sources.debian.org/data/main/p/phpldapadmin/1.2.6.6-2/debian/patches/Fix-dynamic-property-PHP-8.2.patch && \
6464
patch -p 1 -f < ./Fix-dynamic-property-PHP-8.2.patch && \
65+
printf "RELEASE-${VERSION}" > ./VERSION && \
6566
rm -vr ./doc/ ./.gitignore ./*.md
6667

6768
COPY <<-EOT /usr/local/share/sbom/phpldapadmin.spdx.json

test.sh

+10
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,27 @@ checkUrl() {
3030

3131
echo "Running tests..."
3232

33+
echo "Checking /"
3334
checkUrl "http://${TEST_ADDR}/" -I
35+
echo "Checking nginx status"
3436
checkUrl "http://${TEST_ADDR}/.nginx/status" -I
37+
echo "Checking phpfpm status"
3538
checkUrl "http://${TEST_ADDR}/.phpfpm/status" -I
39+
echo "Checking index"
3640
checkUrl "http://${TEST_ADDR}/index.php" -I
41+
echo "Checking robots.txt"
3742
checkUrl "http://${TEST_ADDR}/robots.txt" -I
43+
echo "Checking logo small"
3844
checkUrl "http://${TEST_ADDR}/images/default/logo-small.png" -I | grep -F "Cache-Control: max-age=315360000"
3945

46+
echo "Checking version"
4047
checkUrl "http://${TEST_ADDR}/index.php" | grep -q -F "1.2.6.7"
48+
49+
echo "Checking login"
4150
checkUrl "http://${TEST_ADDR}/cmd.php" "form" "cmd=login&server_id=1&nodecode%5Blogin_pass%5D=1&login=cn%3Dadmin%2Cdc%3Dexample%2Cdc%3Dorg&login_pass=ldapadminpass&submit=Authenticate" | grep -q -F "Successfully logged into server."
4251

4352
if [ $DID_FAIL -gt 0 ]; then
4453
echo "Some URLs failed"
4554
exit 1
4655
fi
56+
echo "All tests PASS"

0 commit comments

Comments
 (0)