Clean up tests for blocking mixed content
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2015 00:09:27 +0000 (00:09 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Jun 2015 00:09:27 +0000 (00:09 +0000)
commitb66caef60b0cbfa558eebf2cddb013d9b9fcdde4
tree2a97ec0dd2b17e17812542a859337d4ca2003bd4
parentcbf4c372c2ee2c3def7de0ee4d6cf7fe5f61d113
Clean up tests for blocking mixed content
https://bugs.webkit.org/show_bug.cgi?id=145718

Reviewed by Darin Adler.

Stop using timeouts, which were making the tests flaky.

* http/tests/xmlhttprequest/access-control-response-with-body.html: This wasn't even
a mixed content test, but the file was reused in one. I now made a separate helper
document, so this is just a regular test now, not another test's resource.

* http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html:
* http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html:
* http/tests/security/mixedContent/resources/frame-with-insecure-frame.html:
* http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html:
* http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html:
Refactored to not depend on timeouts.

* http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt:
* http/tests/security/mixedContent/insecure-xhr-in-main-frame.html:
* http/tests/security/mixedContent/resources/insecure-xhr-in-main-frame-window.html: Added.
This test still needs a timeout, because of a WebKit bug. I just made it much longer.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185296 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt
LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame.html
LayoutTests/http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
LayoutTests/http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html
LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-frame.html
LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-http-to-https-frame.html
LayoutTests/http/tests/security/mixedContent/resources/frame-with-redirect-https-to-http-frame.html
LayoutTests/http/tests/security/mixedContent/resources/insecure-xhr-in-main-frame-window.html [new file with mode: 0644]
LayoutTests/http/tests/xmlhttprequest/access-control-response-with-body.html