Skip to content

Commit d3d7f21

Browse files
committed
Revert "Fixing HTTP tests to reflect the fact that application/xhtml+xml is now the preferred media type for XHTML output"
This reverts commit 5c4af3d.
1 parent d89e991 commit d3d7f21

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

http-tests/admin/GET-agent-mbox-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ purge_cache "$ADMIN_VARNISH_SERVICE"
99
# request agent's HTML description
1010

1111
html=$(curl -k -f -s -N \
12-
-H 'Accept: application/xhtml+xml' \
12+
-H 'Accept: text/html' \
1313
"$AGENT_URI")
1414

1515
# check that the description does *not* include foaf:mbox property

http-tests/admin/GET-request-access-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ purge_cache "$ADMIN_VARNISH_SERVICE"
1111
curl -k -w "%{http_code}\n" -o /dev/null -f -s \
1212
-G \
1313
-E "$AGENT_CERT_FILE":"$AGENT_CERT_PWD" \
14-
-H 'Accept: application/xhtml+xml' \
14+
-H 'Accept: text/html' \
1515
--data-urlencode "access-to=${END_USER_BASE_URL}" \
1616
"${ADMIN_BASE_URL}request%20access" \
1717
| grep -q "$STATUS_OK"

http-tests/document-hierarchy/GET-admin-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ content_type=$(curl --head -k -w "%{content_type}\n" -f -s -o /dev/null \
2222
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9' \
2323
"${ADMIN_BASE_URL}")
2424

25-
[ "$content_type" = 'application/xhtml+xml;charset=UTF-8' ] || exit 1
25+
[ "$content_type" = 'text/html;charset=UTF-8' ] || exit 1

http-tests/document-hierarchy/GET-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ content_type=$(curl --head -k -w "%{content_type}\n" -f -s -o /dev/null \
2222
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9' \
2323
"$END_USER_BASE_URL")
2424

25-
[ "$content_type" = 'application/xhtml+xml;charset=UTF-8' ] || exit 1
25+
[ "$content_type" = 'text/html;charset=UTF-8' ] || exit 1

0 commit comments

Comments
 (0)