From 8dfdaa5482445b106448630ed7dc0bb39ce43837 Mon Sep 17 00:00:00 2001 From: "jnd@google.com" Date: Mon, 13 Sep 2010 12:23:23 +0000 Subject: Add a browser test for popup blocker to test blank-post blocked. For the details, please refer to https://bugs.webkit.org/show_bug.cgi?id=44969. BUG=34414 test=popup-blocked-to-post-blank Review URL: http://codereview.chromium.org/3291012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59215 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/popup_blocker_browsertest.cc | 44 ++++++++++++++++++++++ chrome/chrome_tests.gypi | 1 + .../popup_blocker/popup-blocked-to-post-blank.html | 18 +++++++++ 3 files changed, 63 insertions(+) create mode 100644 chrome/browser/popup_blocker_browsertest.cc create mode 100644 chrome/test/data/popup_blocker/popup-blocked-to-post-blank.html diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc new file mode 100644 index 0000000..2276f5f --- /dev/null +++ b/chrome/browser/popup_blocker_browsertest.cc @@ -0,0 +1,44 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/command_line.h" +#include "base/file_path.h" +#include "base/file_util.h" +#include "base/path_service.h" +#include "base/message_loop.h" +#include "chrome/browser/browser.h" +#include "chrome/browser/browser_list.h" +#include "chrome/browser/browser_window.h" +#include "chrome/browser/profile.h" +#include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/common/chrome_paths.h" +#include "chrome/common/chrome_switches.h" +#include "chrome/test/in_process_browser_test.h" +#include "chrome/test/ui_test_utils.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace { + +static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker"); + +typedef InProcessBrowserTest PopupBlockerBrowserTest; + +IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) { + FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")); + FilePath test_dir(kTestDir); + GURL url(ui_test_utils::GetTestUrl(test_dir, file_name)); + ui_test_utils::NavigateToURL(browser(), url); + + // If the popup blocker blocked the blank post, there should be only one + // tab in only one browser window and the URL of current tab must be equal + // to the original URL. + EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile())); + EXPECT_EQ(1, browser()->tab_count()); + TabContents* cur_tab = browser()->GetSelectedTabContents(); + ASSERT_TRUE(cur_tab); + EXPECT_EQ(url, cur_tab->GetURL()); +} + +} // namespace + diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index cde188b..e600596 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1766,6 +1766,7 @@ 'browser/in_process_webkit/indexed_db_browsertest.cc', 'browser/net/cookie_policy_browsertest.cc', 'browser/net/ftp_browsertest.cc', + 'browser/popup_blocker_browsertest.cc', 'browser/printing/print_dialog_cloud_uitest.cc', 'browser/renderer_host/test/render_process_host_browsertest.cc', 'browser/renderer_host/test/render_view_host_manager_browsertest.cc', diff --git a/chrome/test/data/popup_blocker/popup-blocked-to-post-blank.html b/chrome/test/data/popup_blocker/popup-blocked-to-post-blank.html new file mode 100644 index 0000000..08c190b --- /dev/null +++ b/chrome/test/data/popup_blocker/popup-blocked-to-post-blank.html @@ -0,0 +1,18 @@ + + +Popup Blocked Post Blank + + + +If the POST pop-up was not blocked then there will be an warning message displayed in a new tab. Otherwise, the test passes. +
+ +
+ + \ No newline at end of file -- cgit v1.1