diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 22:07:03 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 22:07:03 +0000 |
| commit | 6448b3abcfa035eaf65b7c0c15bb728513f228fe (patch) | |
| tree | 3d8ee0bf2f528e93616a1d7721bc721ef6726189 /chrome_frame/test/data | |
| parent | bb2eb35a70fcbc47be253bf50c8648c65271a19e (diff) | |
| download | chromium_src-6448b3abcfa035eaf65b7c0c15bb728513f228fe.zip chromium_src-6448b3abcfa035eaf65b7c0c15bb728513f228fe.tar.gz chromium_src-6448b3abcfa035eaf65b7c0c15bb728513f228fe.tar.bz2 | |
[chrome_frame] Refactor/merge IE no interference tests with other mock event sink tests. Have the test mock contain, not inherit the IE event sink. Use the new test server to verify the right requests are being sent.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2822016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
| -rw-r--r-- | chrome_frame/test/data/anchor.html | 15 | ||||
| -rw-r--r-- | chrome_frame/test/data/javascript_redirect.html (renamed from chrome_frame/test/data/no_interference/javascript_redirect.html) | 2 | ||||
| -rw-r--r-- | chrome_frame/test/data/link.html | 5 | ||||
| -rw-r--r-- | chrome_frame/test/data/no_interference/empty.html | 0 | ||||
| -rw-r--r-- | chrome_frame/test/data/no_interference/link.html | 5 | ||||
| -rw-r--r-- | chrome_frame/test/data/no_interference/window_open.html | 13 | ||||
| -rw-r--r-- | chrome_frame/test/data/simple.html | 6 | ||||
| -rw-r--r-- | chrome_frame/test/data/window_open.html | 24 |
8 files changed, 43 insertions, 27 deletions
diff --git a/chrome_frame/test/data/anchor.html b/chrome_frame/test/data/anchor.html index 7fde037..fa0bfa3 100644 --- a/chrome_frame/test/data/anchor.html +++ b/chrome_frame/test/data/anchor.html @@ -1,9 +1,8 @@ -<HTML> - <HEAD> - <meta http-equiv="X-UA-Compatible" content="chrome=1" /> - <TITLE> Chrome Frame Test </TITLE> - </HEAD> - <BODY> +<html> + <head> + <title> Chrome Frame Test </title> + </head> + <body> Chrome frame in full tab mode Jump to different named sections here @@ -47,5 +46,5 @@ <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /> <a name="a4"> A4 </a> - </BODY> -</HTML> + </body> +</html>
\ No newline at end of file diff --git a/chrome_frame/test/data/no_interference/javascript_redirect.html b/chrome_frame/test/data/javascript_redirect.html index 5e29ab1..7712686 100644 --- a/chrome_frame/test/data/no_interference/javascript_redirect.html +++ b/chrome_frame/test/data/javascript_redirect.html @@ -4,7 +4,7 @@ window.onload = function() { var url = "" + window.location; window.location = url.substring(0, url.lastIndexOf("/") + 1) + - "empty.html"; + "simple.html"; } </script> </head> diff --git a/chrome_frame/test/data/link.html b/chrome_frame/test/data/link.html new file mode 100644 index 0000000..a2c3513 --- /dev/null +++ b/chrome_frame/test/data/link.html @@ -0,0 +1,5 @@ +<html> + <body> + <a href="simple.html">Simple page</a> + </body> +</html>
\ No newline at end of file diff --git a/chrome_frame/test/data/no_interference/empty.html b/chrome_frame/test/data/no_interference/empty.html deleted file mode 100644 index e69de29..0000000 --- a/chrome_frame/test/data/no_interference/empty.html +++ /dev/null diff --git a/chrome_frame/test/data/no_interference/link.html b/chrome_frame/test/data/no_interference/link.html deleted file mode 100644 index d84da5b..0000000 --- a/chrome_frame/test/data/no_interference/link.html +++ /dev/null @@ -1,5 +0,0 @@ -<html> - <body> - <a href="empty.html">Empty page</a> - </body> -</html>
\ No newline at end of file diff --git a/chrome_frame/test/data/no_interference/window_open.html b/chrome_frame/test/data/no_interference/window_open.html deleted file mode 100644 index a8b1c37..0000000 --- a/chrome_frame/test/data/no_interference/window_open.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - function popup() { - window.open("empty.html", "test"); - } - </script> - </head> - - <body ondblclick="popup();"> - Calling window.open... - </body> -</html>
\ No newline at end of file diff --git a/chrome_frame/test/data/simple.html b/chrome_frame/test/data/simple.html new file mode 100644 index 0000000..5e5ed37 --- /dev/null +++ b/chrome_frame/test/data/simple.html @@ -0,0 +1,6 @@ +<html> + <head> + <title>simple web page</title> + </head> + <body>simple web page</body> +</html>
\ No newline at end of file diff --git a/chrome_frame/test/data/window_open.html b/chrome_frame/test/data/window_open.html new file mode 100644 index 0000000..eb8599f --- /dev/null +++ b/chrome_frame/test/data/window_open.html @@ -0,0 +1,24 @@ +<html> + <head> + <script type="text/javascript"> + var new_window; + + function OnDblClick() { + // Open popup to the url from the given query string. + var url = window.location.search.substring(1); + new_window = window.open(url, "_blank", + "left=10, top=10, height=250, width=250"); + } + + function OnKeyPress() { + var char_code = String.fromCharCode(event.keyCode); + if (char_code == 'C') { + new_window.close(); + } + } + </script> + </head> + <body onkeypress="OnKeyPress();" ondblclick="OnDblClick();"> + ChromeFrame full tab mode window open popup test + </body> +</html> |