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

Unified Diff: chrome/browser/ui/webui/options/autofill_options_interactive_uitest.cc

Issue 819193003: Fix list focus after tab key in chrome://settings/autofillEditAddress page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address reviewer comments on patch set 4. Created 5 years, 11 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
Index: chrome/browser/ui/webui/options/autofill_options_interactive_uitest.cc
diff --git a/chrome/browser/ui/webui/options/autofill_options_interactive_uitest.cc b/chrome/browser/ui/webui/options/autofill_options_interactive_uitest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d75d3893f1835178d02170e24e6d049ce9519eab
--- /dev/null
+++ b/chrome/browser/ui/webui/options/autofill_options_interactive_uitest.cc
@@ -0,0 +1,263 @@
+// Copyright 2014 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/strings/stringprintf.h"
+#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.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 "content/public/test/browser_test_utils.h"
+
+namespace autofill_options_ui_test {
+
+namespace {
+
+// This class tests the autofill options settings.
+// This test is part of the interactive_ui_tests instead of browser_tests
+// because it is necessary to emulate pushing the tab key.
+class AutofillOptionsWebUITest : public InProcessBrowserTest {
+ public:
+ AutofillOptionsWebUITest() {}
+
+ // Navigate to the autofillEditAddress page.
+ void SetUpOnMainThread() override {
+ const GURL url = chrome::GetSettingsUrl(
+ chrome::kAutofillEditAddressSubPage);
+ ui_test_utils::NavigateToURL(browser(), url);
+ }
+
+ protected:
+ const std::string kEditAddressOverlaySelector =
+ "#autofill-edit-address-overlay";
+
+ content::RenderFrameHost* GetActiveFrame() {
+ return GetActiveWebContents()->GetFocusedFrame();
+ }
+
+ content::RenderViewHost* GetRenderViewHost() {
+ return GetActiveWebContents()->GetRenderViewHost();
+ }
+
+ content::WebContents* GetActiveWebContents() {
+ return browser()->tab_strip_model()->GetActiveWebContents();
+ }
+
+ // Returns true if element contains document.activeElement.
+ bool ContainsActiveElement(std::string element_selector) {
Dan Beam 2015/01/22 05:38:48 all these args should be const std::string&
bondd 2015/01/22 20:23:58 Done.
+ std::string script = base::StringPrintf(
+ "domAutomationController.send("
+ "document.querySelector('%s').contains(document.activeElement));",
+ element_selector.c_str());
+ bool result;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+ GetActiveFrame(),
+ script,
+ &result));
+ return result;
+ }
+
+ // Returns the number of items in the list.
+ int GetListSize(std::string list_selector) {
+ std::string script = base::StringPrintf(
+ "domAutomationController.send("
+ "document.querySelector('%s').items.length);",
+ list_selector.c_str());
+ int length = -1;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractInt(
+ GetActiveFrame(),
+ script,
+ &length));
+ return length;
+ }
+
+ // Focus the first input field of the first list item.
+ void FocusFirstListItemInput(std::string list_selector) {
+ std::string script = base::StringPrintf(
+ "document.querySelector('%s input').focus();",
+ list_selector.c_str());
+ EXPECT_TRUE(content::ExecuteScript(GetActiveFrame(), script));
+ }
+
+ // Returns the text of the first item in the list.
+ std::string GetFirstListItemText(std::string list_selector) {
+ // EXPECT_TRUE will fail if there is no first item or first item does not
+ // have 'input'.
+ std::string script = base::StringPrintf(
+ "domAutomationController.send("
+ "document.querySelector('%s input').value);",
+ list_selector.c_str());
+ std::string result;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractString(
+ GetActiveFrame(),
+ script,
+ &result));
+ return result;
+ }
+
+ // Returns true if the first item in the list has 'selected' attribute.
+ bool GetFirstListItemSelected(std::string list_selector) {
+ // EXPECT_TRUE will fail if there is no first item.
+ std::string script = base::StringPrintf(
+ "domAutomationController.send("
+ "document.querySelector('%s').items[0].hasAttribute('selected'));",
+ list_selector.c_str());
+ bool result = false;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+ GetActiveFrame(),
+ script,
+ &result));
+ return result;
+ }
+
+ // Returns true if a row delete button ('X' button) is focused.
+ bool GetDeleteButtonFocused() {
+ std::string script =
+ "domAutomationController.send("
+ "document.activeElement.classList.contains('row-delete-button'));";
+ bool result = false;
+ EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+ GetActiveFrame(),
+ script,
+ &result));
+ return result;
+ }
+
+ // Insert text into currently focused element.
+ void InsertText(std::string text) {
+ std::string script = base::StringPrintf(
+ "document.execCommand('insertText', false, '%s');",
+ text.c_str());
+ EXPECT_TRUE(content::ExecuteScript(GetActiveFrame(), script));
+ }
+
+ // Press and release a key in the browser. This will wait for the element on
+ // the page to change.
+ bool PressKey(ui::KeyboardCode key_code, bool shift) {
Dan Beam 2015/01/22 05:38:48 nit: PressTab() until you actually use key_code fo
bondd 2015/01/22 20:23:58 Done.
+ return ui_test_utils::SendKeyPressAndWait(
+ browser(),
+ key_code,
+ false,
+ shift,
+ false,
+ false,
+ content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
+ content::Source<content::RenderViewHost>(GetRenderViewHost()));
+ }
+
+ // Verifies that everything is the way it should be after list item is
+ // added or edited.
+ void VerifyEditAddressListPostConditions(std::string list_selector,
+ std::string input_text) {
Dan Beam 2015/01/22 05:38:48 nit: LineUpParamNames(const std::string& like_t
bondd 2015/01/22 20:23:58 Done.
+ // Verify that neither the list nor any of its children still have focus.
+ EXPECT_FALSE(ContainsActiveElement(list_selector));
+
+ // Verify that focus moved to a different element of the overlay.
+ EXPECT_TRUE(ContainsActiveElement(kEditAddressOverlaySelector));
+
+ // Verify that list has exactly two items. They will be the item that was
+ // just added/modified + the placeholder.
+ EXPECT_EQ(GetListSize(list_selector), 2);
Dan Beam 2015/01/22 05:38:48 EXPECT_*() 2 parameters should be in the order of
bondd 2015/01/22 20:23:58 Done.
+
+ // Verify that the first list item has the string that was inserted.
+ EXPECT_EQ(GetFirstListItemText(list_selector), input_text);
+
+ // Verify that the first list item is the selected item in the list.
+ EXPECT_TRUE(GetFirstListItemSelected(list_selector));
+ }
+
+ // Make sure that when text is entered in the placeholder of an empty list and
+ // the tab key is pressed:
+ // + Focus leaves the list and goes to a different element on the page.
+ // + The text stays added and a new placeholder is created.
+ // + The list item with the newly added text is the selected list item (not
+ // the placeholder).
+ //
+ // Added to prevent http://crbug.com/440760 from regressing again.
+ void TestEditAddressListTabKeyAddItem(std::string list_selector,
+ std::string input_text) {
+ // Focus the input field and insert test string.
+ FocusFirstListItemInput(list_selector);
+ InsertText(input_text);
+
+ // Press tab key to move to next element after the list.
+ PressKey(ui::VKEY_TAB, false);
+
+ // Make sure everything ended up the way it should be.
+ VerifyEditAddressListPostConditions(list_selector, input_text);
+ }
+
+ // Depends on state set up by TestEditAddressListTabKeyAddItem. Should be
+ // called immediately after that method.
+ //
+ // Make sure that when a list item's text is edited and the tab key is
+ // pressed twice:
+ // + After the first tab press the item's delete button is focused.
+ // + After the second tab press focus leaves the list and goes to a
+ // different element on the page.
+ // + The edited text persists.
+ // + The edited list item is the selected list item.
+ //
+ // Added to prevent http://crbug.com/443491 from regressing again.
+ void TestEditAddressListTabKeyEditItem(std::string list_selector,
+ std::string input_text) {
+ // Press shift+tab to move back to the first item in the list.
+ PressKey(ui::VKEY_TAB, true);
+ // Verify that the first item in the list is focused.
+ EXPECT_TRUE(ContainsActiveElement(list_selector + " input"));
+
+ // Insert modified text in the first list item.
+ input_text = "second" + input_text;
Dan Beam 2015/01/22 05:38:48 make a new var
bondd 2015/01/22 20:23:58 Done.
+ InsertText(input_text);
+
+ // Press tab key to focus the list item's delete button.
+ PressKey(ui::VKEY_TAB, false);
+ EXPECT_TRUE(GetDeleteButtonFocused());
+
+ // Press tab key again to move to next element after the list.
+ PressKey(ui::VKEY_TAB, false);
+
+ // Make sure everything ended up the way it should be.
+ VerifyEditAddressListPostConditions(list_selector, input_text);
+ }
+
+ void TestEditAddressListTabKey(std::string field_name,
+ std::string input_text) {
+ std::string list_selector = kEditAddressOverlaySelector + " [field=" +
+ field_name + "]";
+
+ TestEditAddressListTabKeyAddItem(list_selector, input_text);
+ TestEditAddressListTabKeyEditItem(list_selector, input_text);
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(AutofillOptionsWebUITest);
+};
+
+} // namespace
+
+// Test the 'fullName' InlineEditableItemList in autofillEditAddress overlay.
+IN_PROC_BROWSER_TEST_F(AutofillOptionsWebUITest,
+ TestEditAddressNameListTabKey) {
+ TestEditAddressListTabKey("fullName", "Test Name");
+}
+
+// TODO(bondd): After tab is pressed, phone list waits for a validation
+// callback before repopulating the list. It's not clear to me how to wait for
+// that here on the C++ testing side. Disabling phone list test for now.
+// Test the 'phone' InlineEditableItemList in autofillEditAddress overlay.
+IN_PROC_BROWSER_TEST_F(AutofillOptionsWebUITest,
+ DISABLED_TestEditAddressPhoneListTabKey) {
+ TestEditAddressListTabKey("phone", "123-456-7890");
+}
+
+// Test the 'email' InlineEditableItemList in autofillEditAddress overlay.
+IN_PROC_BROWSER_TEST_F(AutofillOptionsWebUITest,
+ TestEditAddressEmailListTabKey) {
+ TestEditAddressListTabKey("email", "test@example.com");
+}
+
+} // namespace autofill_options_ui_test

Powered by Google App Engine
This is Rietveld 408576698