Attachment 346868 Details for Bug 188454 – fix

[patch] fix

188454.diff (text/plain), 6.03 KB, created by Basuke Suzuki on 2018-08-09 16:02:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-08-09 16:02:00 PDT

Size: 6.03 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fee10630bc8..3209589010d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-09  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [LayoutTests] Test case which committed on r175053 was wrong.
>+        https://bugs.webkit.org/show_bug.cgi?id=188454
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        It was originally committed on https://bugs.webkit.org/show_bug.cgi?id=136938 and has kept unchanged,
>+        but the test case uses non-existing redirect.php scripts which was removed a few months before than
>+        this bug. Also result was compared to wrong values.
>+
>+        * http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt:
>+        * http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html:
>+
> 2018-08-09  Miguel Gomez  <magomez@igalia.com>
> 
>         Unreviewed GTK+ gardening after r234720.
>diff --git a/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt b/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt
>index f3923048c5a..92f769b4243 100644
>--- a/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt
>+++ b/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt
>@@ -9,30 +9,26 @@ req.readyState = 1: responseURL =
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
> PASS responseURL is ""
>-req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>-req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>-req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>-PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi"
>+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
>+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi"
> req.readyState = 0: responseURL = 
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
> PASS responseURL is ""
>-req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
>-req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
>-req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
>-PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/"
>+req.readyState = 4: responseURL = 
>+PASS responseURL is ""
> req.readyState = 0: responseURL = 
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
> PASS responseURL is ""
>-req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
>-req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
>-req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
>-PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/"
>+req.readyState = 4: responseURL = 
>+PASS responseURL is ""
> req.readyState = 0: responseURL = 
> PASS responseURL is ""
> req.readyState = 1: responseURL = 
>diff --git a/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html b/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html
>index cfb772c8d4c..6a82412082f 100644
>--- a/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html
>+++ b/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html
>@@ -34,19 +34,19 @@ function runTest(url, type) {
>     });
> }
> 
>-runTest('resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi', 'text').then(function(req) {
>+runTest('/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi', 'text').then(function(req) {
>     window.responseURL = req.responseURL;
>-    shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi');
>+    shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi');
> 
>-    return runTest('resources/redirect.php?url=http://localhost:7/', 'document');
>+    return runTest('/resources/redirect.php?url=http://localhost:7/', 'document');
> }).then(function(req) {
>     window.responseURL = req.responseURL;
>-    shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/');
>+    shouldBeEqualToString('responseURL', '');
> 
>-    return runTest('resources/redirect.php?url=http://localhost:22/', 'text');
>+    return runTest('/resources/redirect.php?url=http://localhost:22/', 'text');
> }).then(function(req) {
>     window.responseURL = req.responseURL;
>-    shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/');
>+    shouldBeEqualToString('responseURL', '');
> 
>     return runTest('resources/redirect-cors.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/get.txt', 'text');
> }).then(function(req) {

Actions: View | Formatted Diff | Diff

Attachments on bug 188454: 346868 | 346879