Update Confirmation UI for saved password change

chrome/browser/password_manager/password_manager_browsertest.cc

Index: chrome/browser/password_manager/password_manager_browsertest.cc
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index cee06e8e68d9f15ddf227e50ffb08e0a0c25ea34..f31483f9e5ec0eef03beab759aefea7bf51caa49 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/login/login_prompt_test_utils.h"
+#include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -2020,5 +2021,86 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
   iframe_killed.Wait();
 }
 
+IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
+                       ChangePwdNoAccountStored) {
+  ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
+  NavigateToFile("/password/password_form.html");
+
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      password_manager::switches::kEnablePasswordChangeSupport);
+
+  // Fill a form and submit through a <input type="submit"> button.
+  NavigationObserver observer(WebContents());
+  scoped_ptr<PromptObserver> prompt_observer(
+      PromptObserver::Create(WebContents()));
+  ManagePasswordsUIController* ui_controller =
+      ManagePasswordsUIController::FromWebContents(WebContents());
+
+  std::string fill_and_submit =
+      "document.getElementById('chg_password_wo_username_field').value = "
+      "'old_pw';"
+      "document.getElementById('chg_new_password_wo_username_1').value = "
+      "'new_pw';"
+      "document.getElementById('chg_new_password_wo_username_2').value = "
+      "'new_pw';"
+      "document.getElementById('chg_submit_wo_username_button').click()";
+  ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
+  observer.Wait();
+  // No credentials stored, so save bubble is shown.
+  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
+            ui_controller->state());

[vasilii, 2015/07/31 14:38:53]

Shouldn't the test work with the infobar as well? You just check that the prompt
is shown.

[dvadym, 2015/08/03 15:44:08]

I think it should be test only for testing change password form, for info bar
it's not implemented yet. For checking when to show or not to show
bubble/infobar w/o change password support flag we have another browser tests,
namely ChangePwdCorrect and ChangePwdIncorrect

+}
+
+IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
+                       ChangePwd1AccountStored) {
+  ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());

[vasilii, 2015/07/31 14:38:53]

How is this enforced on Mac?

[dvadym, 2015/08/03 15:44:08]

I'm in progress of figuring out how it should work on Mac

+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      password_manager::switches::kEnablePasswordChangeSupport);
+  // At first let us save credentials to the PasswordManager.
+  NavigateToFile("/password/password_form.html");
+  NavigationObserver observer1(WebContents());
+  scoped_ptr<PromptObserver> prompt_observer(
+      PromptObserver::Create(WebContents()));
+  ManagePasswordsUIController* ui_controller =
+      ManagePasswordsUIController::FromWebContents(WebContents());
+  std::string fill_and_submit_signin =
+      "document.getElementById('username_field').value = 'temp';"
+      "document.getElementById('password_field').value = 'random';"
+      "document.getElementById('input_submit_button').click()";
+  ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit_signin));
+  observer1.Wait();
+  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_STATE,
+            ui_controller->state());
+  prompt_observer->Accept();
+  // Check that credentials are stored.
+  password_manager::TestPasswordStore* password_store =
+      static_cast<password_manager::TestPasswordStore*>(
+          PasswordStoreFactory::GetForProfile(
+              browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
+              .get());

[vasilii, 2015/07/31 14:38:53]

What about pushing the password to the store directly. Everything above looks
like a test setup and not a test logic.

[dvadym, 2015/08/03 15:44:08]

Done

+  // Spin the message loop to make sure the password store had a chance to save
+  // the password.
+  base::RunLoop run_loop;
+  run_loop.RunUntilIdle();
+  EXPECT_FALSE(password_store->IsEmpty());
+
+  // Check that password update bubble is shown.
+  NavigateToFile("/password/password_form.html");
+  NavigationObserver observer2(WebContents());
+  std::string fill_and_submit_change_password =
+      "document.getElementById('chg_password_wo_username_field').value = "
+      "'random';"
+      "document.getElementById('chg_new_password_wo_username_1').value = "
+      "'new_pw';"
+      "document.getElementById('chg_new_password_wo_username_2').value = "
+      "'new_pw';"
+      "document.getElementById('chg_submit_wo_username_button').click()";
+  ASSERT_TRUE(content::ExecuteScript(RenderViewHost(),
+                                     fill_and_submit_change_password));
+  observer2.Wait();
+  EXPECT_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE,
+            ui_controller->state());
+}
+
 }  // namespace password_manager