Skip to content

Commit dabad57

Browse files
authored
fix HEAD test (#19)
* display logs * disable side tests * disable release test * enable test but keep release tag * reform test file * output logs * use "web" domain * improve function error handling * add "access" message * remove redundant health check * remove debugging lines --------- Co-authored-by: tyler36 <[email protected]>
1 parent 190d92a commit dabad57

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

Diff for: tests/test.bats

+27-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
setup() {
22
set -eu -o pipefail
3+
34
export DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" >/dev/null 2>&1 && pwd)/.."
45
export TESTDIR=~/tmp/test-laravel-queue
56
mkdir -p $TESTDIR
@@ -9,35 +10,39 @@ setup() {
910
cd "${TESTDIR}"
1011
}
1112

13+
teardown() {
14+
set -eu -o pipefail
15+
cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
16+
ddev delete -Oy ${PROJNAME}
17+
[ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
18+
}
19+
1220
health_checks() {
13-
ddev exec "curl -s https://localhost:443/"
21+
ddev exec "curl -s https://web/"
1422
}
1523

1624
queue_checks() {
25+
set -eu -o pipefail
26+
1727
# Add a route that dispatches a job when hit
1828
echo "Route::get('test-dispatch', function () {
29+
logger('accessing test-dispatch ...');
30+
1931
dispatch(function () {
2032
logger('hello from test-dispatch');
2133
});
2234
});" >> ./routes/web.php
2335

2436
# Visit the new route to trigger the dispatch
25-
ddev exec "curl -s https://localhost:443/test-dispatch"
37+
ddev exec "curl -s https://web/test-dispatch"
2638
# We'll wait a few seconds to allow the queue worker to pick and process the job.
27-
sleep 5
39+
sleep 10
2840

2941
if ! grep -q "hello from test-dispatch" ./storage/logs/laravel.log; then
3042
exit 1;
3143
fi
3244
}
3345

34-
teardown() {
35-
set -eu -o pipefail
36-
cd ${TESTDIR} || (printf "unable to cd to ${TESTDIR}\n" && exit 1)
37-
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1
38-
[ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
39-
}
40-
4146
@test "install from directory" {
4247
set -eu -o pipefail
4348
cd ${TESTDIR}
@@ -49,18 +54,6 @@ teardown() {
4954
health_checks
5055
}
5156

52-
# bats test_tags=release
53-
@test "install from release" {
54-
set -eu -o pipefail
55-
cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
56-
echo "# ddev add-on get tyler36/ddev-laravel-queue with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
57-
ddev config --project-name=${PROJNAME}
58-
ddev start -y >/dev/null
59-
ddev add-on get tyler36/ddev-laravel-queue
60-
ddev restart >/dev/null
61-
health_checks
62-
}
63-
6457
@test "it processes jobs in Lavarel 11" {
6558
set -eu -o pipefail
6659
cd ${TESTDIR}
@@ -73,7 +66,6 @@ teardown() {
7366
ddev add-on get ${DIR}
7467
ddev restart
7568

76-
health_checks
7769
queue_checks
7870
}
7971

@@ -110,3 +102,15 @@ teardown() {
110102
fi
111103
done
112104
}
105+
106+
# bats test_tags=release
107+
@test "install from release" {
108+
set -eu -o pipefail
109+
cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
110+
echo "# ddev add-on get tyler36/ddev-laravel-queue with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
111+
ddev config --project-name=${PROJNAME}
112+
ddev start -y >/dev/null
113+
ddev add-on get tyler36/ddev-laravel-queue
114+
ddev restart >/dev/null
115+
health_checks
116+
}

0 commit comments

Comments
 (0)