Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5635)

Unified Diff: chrome/browser/ui/search/local_ntp_browsertest.cc

Issue 2691033004: [Local NTP] Add an integration test for the fakebox (Closed)
Patch Set: fix Mac Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.cc ('k') | chrome/test/data/local_ntp_browsertest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/local_ntp_browsertest.cc
diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
index 61fcae0550489c09558452814c90bca7d0c28d69..97cd8e9c6bf80cda4b7c0dddd7605129a65e9849 100644
--- a/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
@@ -4,17 +4,27 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/search/search.h"
#include "chrome/browser/ui/search/instant_test_utils.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/omnibox/browser/omnibox_edit_model.h"
+#include "components/omnibox/browser/omnibox_view.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "components/prefs/pref_service.h"
+#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/test_utils.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/vector2d.h"
class LocalNTPTest : public InProcessBrowserTest,
public InstantTestBase {
@@ -32,7 +42,9 @@ class LocalNTPTest : public InProcessBrowserTest,
}
};
-IN_PROC_BROWSER_TEST_F(LocalNTPTest, LocalNTPJavascriptTest) {
+// This runs a bunch of pure JS-side tests, i.e. those that don't require any
+// interaction from the native side.
+IN_PROC_BROWSER_TEST_F(LocalNTPTest, SimpleJavascriptTests) {
ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
FocusOmnibox();
@@ -43,11 +55,86 @@ IN_PROC_BROWSER_TEST_F(LocalNTPTest, LocalNTPJavascriptTest) {
content::WebContents* active_tab =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(search::IsInstantNTP(active_tab));
+
bool success = false;
- ASSERT_TRUE(GetBoolFromJS(active_tab, "!!runTests()", &success));
+ ASSERT_TRUE(GetBoolFromJS(active_tab, "!!runSimpleTests()", &success));
EXPECT_TRUE(success);
}
+IN_PROC_BROWSER_TEST_F(LocalNTPTest, FakeboxRedirectsToOmnibox) {
+ ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
+ FocusOmnibox();
+
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), ntp_url(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ content::WebContents* active_tab =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ ASSERT_TRUE(search::IsInstantNTP(active_tab));
+
+ // This is required to make the mouse events we send below arrive at the right
+ // place. It *should* be the default for all interactive_ui_tests anyway, but
+ // on Mac it isn't; see crbug.com/641969.
+ ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
+
+ bool result = false;
+ ASSERT_TRUE(GetBoolFromJS(active_tab, "!!setupAdvancedTest()", &result));
+ ASSERT_TRUE(result);
+
+ // Get the position of the fakebox on the page.
+ double fakebox_x = 0;
+ ASSERT_TRUE(GetDoubleFromJS(active_tab, "getFakeboxPositionX()", &fakebox_x));
+ double fakebox_y = 0;
+ ASSERT_TRUE(GetDoubleFromJS(active_tab, "getFakeboxPositionY()", &fakebox_y));
+
+ // Move the mouse over the fakebox.
+ gfx::Vector2d fakebox_pos(static_cast<int>(std::ceil(fakebox_x)),
+ static_cast<int>(std::ceil(fakebox_y)));
+ gfx::Point origin = active_tab->GetContainerBounds().origin();
+ ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(origin + fakebox_pos +
+ gfx::Vector2d(1, 1)));
+
+ // Click on the fakebox, and wait for the omnibox to receive invisible focus.
+ // Note that simply waiting for the first OMNIBOX_FOCUS_CHANGED notification
+ // is not sufficient: If the omnibox had focus before, it will first lose the
+ // focus before gaining invisible focus.
+ ASSERT_NE(OMNIBOX_FOCUS_INVISIBLE, omnibox()->model()->focus_state());
+ content::WindowedNotificationObserver focus_observer(
+ chrome::NOTIFICATION_OMNIBOX_FOCUS_CHANGED,
+ base::Bind(
+ [](const OmniboxEditModel* omnibox_model) {
+ return omnibox_model->focus_state() == OMNIBOX_FOCUS_INVISIBLE;
+ },
+ omnibox()->model()));
+
+ ASSERT_TRUE(
+ ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::DOWN));
+ ASSERT_TRUE(
+ ui_test_utils::SendMouseEventsSync(ui_controls::LEFT, ui_controls::UP));
+
+ focus_observer.Wait();
+ EXPECT_EQ(OMNIBOX_FOCUS_INVISIBLE, omnibox()->model()->focus_state());
+
+ // The fakebox should now also have focus.
+ ASSERT_TRUE(GetBoolFromJS(active_tab, "!!fakeboxIsFocused()", &result));
+ EXPECT_TRUE(result);
+
+ // Type "a".
+ ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
+ browser(), ui::KeyboardCode::VKEY_A,
+ /*control=*/false, /*shift=*/false, /*alt=*/false, /*command=*/false));
+
+ // The omnibox should have received visible focus.
+ EXPECT_EQ(OMNIBOX_FOCUS_VISIBLE, omnibox()->model()->focus_state());
+ // ...and the typed text should have arrived there.
+ EXPECT_EQ("a", GetOmniboxText());
+
+ // On the JS side, the fakebox should have been hidden.
+ ASSERT_TRUE(GetBoolFromJS(active_tab, "!!fakeboxIsVisible()", &result));
+ EXPECT_FALSE(result);
+}
+
IN_PROC_BROWSER_TEST_F(LocalNTPTest,
NTPRespectsBrowserLanguageSetting) {
// Make sure the default language is not French.
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.cc ('k') | chrome/test/data/local_ntp_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698