diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 22:29:26 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-03 22:29:26 +0000 |
| commit | 737d8a62d54a2475fa0fc23a681a8d5293096754 (patch) | |
| tree | 06054c5370ec3531fb84225f883e49a0b508ba69 /chrome_frame | |
| parent | 3460228438564690022243511825894c9c600608 (diff) | |
| download | chromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.zip chromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.tar.gz chromium_src-737d8a62d54a2475fa0fc23a681a8d5293096754.tar.bz2 | |
Fix the three tests broken by gcf: change.
BUG=34461
TEST=Fixed and enabled tests CFProtocol, Persistent cookie and NavigateOut
Review URL: http://codereview.chromium.org/561057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_unittests.cc | 21 | ||||
| -rw-r--r-- | chrome_frame/test/data/navigate_out.html | 11 |
2 files changed, 19 insertions, 13 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc index 2d39100..2573434 100644 --- a/chrome_frame/test/chrome_frame_unittests.cc +++ b/chrome_frame/test/chrome_frame_unittests.cc @@ -56,6 +56,9 @@ void ChromeFrameTestWithWebServer::SetUp() { // Make sure our playground is clean before we start. CloseAllBrowsers(); + // Make sure that we are not accidently enabling gcf protocol. + SetConfigBool(kEnableGCFProtocol, false); + server_.SetUp(); results_dir_ = server_.GetDataDir(); file_util::AppendToPath(&results_dir_, L"dump"); @@ -1182,25 +1185,25 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_MetaTag) { SimpleBrowserTest(IE, kMetaTagPage, L"meta_tag"); } -// Since gcf: protocol is disabled by default we need a better test for -// this. Issue: http://code.google.com/p/chromium/issues/detail?id=34461 const wchar_t kCFProtocolPage[] = L"files/cf_protocol.html"; -TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_CFProtocol) { +TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_CFProtocol) { + // Temporarily enable gcf: protocol for this test. + SetConfigBool(kEnableGCFProtocol, true); SimpleBrowserTest(IE, kCFProtocolPage, L"chrome_frame_protocol"); + SetConfigBool(kEnableGCFProtocol, false); } const wchar_t kPersistentCookieTest[] = L"files/persistent_cookie_test_page.html"; -// Since gcf: protocol is disabled by default we need a better test for -// this. Issue: http://code.google.com/p/chromium/issues/detail?id=34461 -TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_PersistentCookieTest) { +TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_PersistentCookieTest) { + // Temporarily enable gcf: protocol for this test. + SetConfigBool(kEnableGCFProtocol, true); SimpleBrowserTest(IE, kPersistentCookieTest, L"PersistentCookieTest"); + SetConfigBool(kEnableGCFProtocol, false); } const wchar_t kNavigateOutPage[] = L"files/navigate_out.html"; -// Since gcf: protocol is disabled by default we need a better test for -// this. Issue: http://code.google.com/p/chromium/issues/detail?id=34461 -TEST_F(ChromeFrameTestWithWebServer, DISABLED_FullTabModeIE_NavigateOut) { +TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) { SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out"); } diff --git a/chrome_frame/test/data/navigate_out.html b/chrome_frame/test/data/navigate_out.html index 5f447c9..4166aaf 100644 --- a/chrome_frame/test/data/navigate_out.html +++ b/chrome_frame/test/data/navigate_out.html @@ -1,12 +1,13 @@ <html>
<head><title>Test to make sure that navigations sent back to IE</title>
+ <meta http-equiv="X-UA-Compatible" content="chrome=1" /> <script type="text/javascript"
src="chrome_frame_tester_helpers.js"></script>
-
<script type="text/javascript">
function test() {
+ var test_name = 'navigate_out';
if (isRunningInMSIE()) {
- reloadUsingCFProtocol();
+ onFailure(test_name, 1, 'Meta tag failed to load page in Chrome');
} else {
window.location = "back_to_ie.html";
}
@@ -14,7 +15,9 @@ </script>
</head>
<body onLoad="setTimeout(test, 100);">
- <h2>Prepare to be redirected!</h2>
- <p>Redirects the same page to its 'gcf:' version and </p>
+ <h2>Test navigations in and out of IE</h2>
+ <p>This page should be loaded in chrome and then we redirect to another
+ page that should get loaded in IE.
+ </p>
</body>
</html>
|