diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2023-04-20 14:24:46 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-08-09 15:34:11 +0200 |
commit | d0a2f511f3fd8a736ddff74f984585b8909d1d8d (patch) | |
tree | 3a9c4fb6afa0533af2500893134b1ae299a94974 /tests/auto/qml/qqmlxmlhttprequest/data | |
parent | 6a6b0af20946929ca01af28b8aefee3b6f6f96d8 (diff) |
Clear out some locale-dependencies from XHR unit test
None of these tests care about Accept-Language, which
QHttpNetworkConnection sets automatically based on the system locale,
so testing for it (by including a line for it in .expect files),
setting it and skipping tests due to its "locale-dependence" were all
unnecessary. Just tell the test-server to {{Ignore}} the value of the
header.
This failed on Android due to one of the data files being unavailable,
so make access to that a precondition of its test.
Pick-to: 6.5 6.6
Change-Id: I560ead8b3ace6a5df173d96aea10f8dac3ed1124
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlxmlhttprequest/data')
48 files changed, 20 insertions, 70 deletions
diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect index ef0f605750..e07e8a9947 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect @@ -4,7 +4,7 @@ Content-Length: 95 Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} -Accept-Language: en-US,* +Accept-Language: {{Ignore}} Content-type:i application/xml; charset="utf-8" User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect index dc7217d45c..dc0a211ef1 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect @@ -3,7 +3,7 @@ Content-Length: 192 Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} -Accept-Language: en-US,* +Accept-Language: {{Ignore}} Content-type: text/xml; charset="utf-8" User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect index 97c1661851..2df22df1e5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort.expect @@ -1,5 +1,5 @@ PUT /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Content-Type: text/plain;charset=UTF-8 Content-Length: 10 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml index 9efc63d3e3..f07ba2dbc6 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort.qml @@ -13,7 +13,6 @@ QtObject { var x = new XMLHttpRequest; x.open("GET", urlDummy); x.setRequestHeader("Test-header", "TestValue"); - x.setRequestHeader("Accept-Language", "en-US"); x.send(); x.onreadystatechange = function() { @@ -33,7 +32,6 @@ QtObject { dataOK = (x.responseText == "QML Rocks!\n"); } x.open("PUT", url); - x.setRequestHeader("Accept-Language", "en-US"); x.send("Test Data\n"); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml index 877a5a6bd9..4f8efb905e 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_opened.qml @@ -21,13 +21,9 @@ QtObject { readyState = true; x.open("PUT", url); - x.setRequestHeader("Accept-Language", "en-US"); - x.abort(); x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml index 33ddf40b44..f750b7093c 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/abort_unsent.qml @@ -21,8 +21,6 @@ QtObject { readyState = true; x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml index 9d64aa72bb..054da836e9 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getAllResponseHeaders.qml @@ -31,8 +31,6 @@ QtObject { readyState = true; x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect index 2270e7f3aa..c27e80af32 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.expect @@ -1,5 +1,5 @@ GET /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml index 0e594af650..99d4b47b50 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/getResponseHeader.qml @@ -37,8 +37,6 @@ QtObject { readyState = true; x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/noqmlcontext.js b/tests/auto/qml/qqmlxmlhttprequest/data/noqmlcontext.js index 77b1203d0d..4c592bc8de 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/noqmlcontext.js +++ b/tests/auto/qml/qqmlxmlhttprequest/data/noqmlcontext.js @@ -1,7 +1,6 @@ (function(url, resultCollector) { var x = new XMLHttpRequest; x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); x.onreadystatechange = function() { if (x.readyState == XMLHttpRequest.DONE) resultCollector.responseText = x.responseText diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open.qml index e2dd27d2b1..7762fae54b 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open.qml @@ -20,8 +20,6 @@ QtObject { readyState = true; x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect index 2270e7f3aa..c27e80af32 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_network.expect @@ -1,5 +1,5 @@ GET /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml index 3c73141954..24711de2b3 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml @@ -7,7 +7,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("GET", url, false); - x.setRequestHeader("Accept-Language", "en-US"); x.send(); responseText = x.responseText; } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_user.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_user.qml index 55d77a5bf0..409427ae00 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_user.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_user.qml @@ -20,8 +20,6 @@ QtObject { readyState = true; x.open("GET", url, true, "username", "password"); - x.setRequestHeader("Accept-Language","en-US"); - if (x.readyState == XMLHttpRequest.OPENED) openedState = true; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect index 35d28ec76d..51b8524941 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_binary_data.expect @@ -1,5 +1,5 @@ GET /gml_logo.png HTTP/1.1 -Accept-Language: en-US,* +Accept-Language: {{Ignore}} Content-Type: image/png Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect index 9784ba4a80..25836f74d7 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect @@ -1,5 +1,5 @@ GET /json.data HTTP/1.1 -Accept-Language: en-US,* +Accept-Language: {{Ignore}} Content-Type: application/jsonrequest Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/responseText.qml b/tests/auto/qml/qqmlxmlhttprequest/data/responseText.qml index 1c3efafa02..cf06b6fda6 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/responseText.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/responseText.qml @@ -22,8 +22,6 @@ QtObject { unsent = (x.responseText == ""); x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - opened = (x.responseText == ""); // Test to the end @@ -40,8 +38,6 @@ QtObject { dataOK = (x.responseText == expectedText); x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - reset = (x.responseText == ""); } } diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/responseURL.qml b/tests/auto/qml/qqmlxmlhttprequest/data/responseURL.qml index 22de52b1d1..3a35dcc882 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/responseURL.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/responseURL.qml @@ -8,9 +8,7 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml index 4464589d61..1a3a5285c0 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_alreadySent.qml @@ -7,7 +7,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("GET", "testdocument.html"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect index 64bd2b3818..5bdcbc89b5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.expect @@ -1,5 +1,5 @@ POST /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Content-Type: text/plain;charset=UTF-8 Content-Length: 13 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml index 570cdcf7e1..2f794650ba 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.1.qml @@ -7,7 +7,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("POST", url); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect index 2bf3b5a081..b935f35d0b 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.10.expect @@ -1,5 +1,5 @@ OPTIONS /testdocument.html HTTP/1.1 -Accept-Language: en-US,* +Accept-Language: {{Ignore}} Content-Type: text/plain;charset=UTF-8 Content-Length: 13 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect Binary files differindex 7132819c72..726b6b4c77 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.expect diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml index 7410ec0cca..136243bbb2 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.11.qml @@ -7,7 +7,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("POST", url); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml index b950bfd7c1..e3d55889d6 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.2.qml @@ -8,7 +8,6 @@ QtObject { var x = new XMLHttpRequest; x.open("POST", url); x.setRequestHeader("Content-Type", "text/plain;charset=UTF-8"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml index 812206bb8a..eaf5a057ae 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.3.qml @@ -8,7 +8,6 @@ QtObject { var x = new XMLHttpRequest; x.open("POST", url); x.setRequestHeader("Content-Type", "text/plain;charset=latin1"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect index 270ee838d9..079b446c5c 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.expect @@ -1,5 +1,5 @@ POST /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Content-Type: charset=UTF-8;text/plain Content-Length: 13 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml index 1498d12c1c..e65982e6cf 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.4.qml @@ -8,7 +8,6 @@ QtObject { var x = new XMLHttpRequest; x.open("POST", url); x.setRequestHeader("Content-Type", "charset=UTF-8;text/plain"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml index 621298b0fb..b3c24a5328 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.5.qml @@ -8,7 +8,6 @@ QtObject { var x = new XMLHttpRequest; x.open("POST", url); x.setRequestHeader("Content-Type", "charset=latin1;text/plain"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect index f6c8083875..b813f4924c 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.expect @@ -1,5 +1,5 @@ PUT /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Content-Type: text/plain;charset=UTF-8 Content-Length: 13 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml index 6ae94982dc..345d486669 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.6.qml @@ -7,7 +7,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("PUT", url); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml index b168f2a93e..a378624803 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.7.qml @@ -8,7 +8,6 @@ QtObject { var x = new XMLHttpRequest; x.open("POST", url); x.setRequestHeader("Content-Type", "text/plain"); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect index bcd7e79fc1..c4aec80859 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.8.expect @@ -3,6 +3,6 @@ Content-Length: 0 Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} -Accept-Language: en-US,* +Accept-Language: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect index 2d4f2c3146..377b9d6680 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_data.9.expect @@ -3,6 +3,6 @@ Content-Length: 0 Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} -Accept-Language: en-US,* +Accept-Language: {{Ignore}} User-Agent: Mozilla/5.0 Host: {{ServerHostUrl}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData.qml index b0021f743f..38fd3800d8 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData.qml @@ -9,7 +9,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open(reqType, url); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect index 7d96c00101..6b2ee3c713 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_DELETE.expect @@ -1,5 +1,5 @@ DELETE /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect index 2270e7f3aa..c27e80af32 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_GET.expect @@ -1,5 +1,5 @@ GET /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect index 064cf1b6b7..b984220a5e 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_ignoreData_HEAD.expect @@ -1,5 +1,5 @@ HEAD /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect index 5b9f9299e8..df321014a4 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.expect @@ -1,5 +1,5 @@ PATCH /qqmlxmlhttprequest.cpp HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} If-Match: "ETagNumber" Content-Type: application/example Content-Length: 247 diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml index 35a629fc92..232976c945 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/send_patch.qml @@ -12,7 +12,6 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; x.open("PATCH", url); - x.setRequestHeader("Accept-Language","en-US"); x.setRequestHeader("If-Match","\"ETagNumber\""); // Test to the end diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect index 003e54f33c..17209f209e 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.expect @@ -1,5 +1,5 @@ GET /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Test-header: value Test-header2: value,value2 Connection: Keep-Alive{{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.qml b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.qml index 1c1b5065d6..1490d0f108 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader.qml @@ -6,9 +6,7 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); x.setRequestHeader("Test-header", "value"); x.setRequestHeader("Test-header2", "value"); diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_caseInsensitive.qml b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_caseInsensitive.qml index e03f73431a..ebda3ba5e4 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_caseInsensitive.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_caseInsensitive.qml @@ -9,9 +9,8 @@ QtObject { var x = new XMLHttpRequest; x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); - x.setRequestHeader("Test-header", "value"); + //Setting headers with just different cases //will be treated as the same header, and accepted //as the last setting. diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_illegalName.qml b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_illegalName.qml index e501cea709..030926e8d1 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_illegalName.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_illegalName.qml @@ -21,8 +21,6 @@ QtObject { readyState = true; x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); - x.setRequestHeader(header, "Value"); if (x.readyState == XMLHttpRequest.OPENED) diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_sent.qml b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_sent.qml index 268105982d..2f37006de9 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_sent.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/setRequestHeader_sent.qml @@ -8,9 +8,7 @@ QtObject { Component.onCompleted: { var x = new XMLHttpRequest; - x.open("GET", url); - x.setRequestHeader("Accept-Language","en-US"); // Test to the end x.onreadystatechange = function() { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect index 2270e7f3aa..c27e80af32 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/status.expect +++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.expect @@ -1,5 +1,5 @@ GET /testdocument.html HTTP/1.1 -Accept-Language: en-US +Accept-Language: {{Ignore}} Connection: Keep-Alive{{Ignore}} HTTP2-Settings: {{Ignore}} Accept-Encoding: {{Ignore}} diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml index 94908f63c0..ed7268d6b3 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/status.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/status.qml @@ -30,8 +30,6 @@ QtObject { } x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - try { var a = x.status; } catch (e) { @@ -54,8 +52,6 @@ QtObject { dataOK = (x.responseText == "QML Rocks!\n"); x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - try { var a = x.status; } catch (e) { diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml index b47a0f1af0..cbc15b47f0 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/statusText.qml @@ -27,8 +27,6 @@ QtObject { } x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - try { var a = x.statusText; } catch (e) { @@ -51,8 +49,6 @@ QtObject { dataOK = (x.responseText == "QML Rocks!\n") && (x.response == "QML Rocks!\n"); x.open("GET", url); - x.setRequestHeader("Accept-Language", "en-US"); - try { var a = x.statusText; } catch (e) { |