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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/password_manager/password_manager_browsertest.cc

Issue 1515553006: Change password bubble for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, clean-up Created 5 years 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/password_manager/chrome_password_manager_client.cc ('k') | chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h » ('j') | chrome/browser/ui/cocoa/passwords/credentials_selection_view.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e9b070deecda14b8b22fd46cc533e97791ed5023..b687d267863b2779d6978cda0bc846c8c0325829 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -129,6 +129,7 @@ class ObservingAutofillClient : public autofill::TestAutofillClient {
DISALLOW_COPY_AND_ASSIGN(ObservingAutofillClient);
};
+// For simplicity we assume that password store contains only 1 credentials.
void CheckThatCredentialsStored(
password_manager::TestPasswordStore* password_store,
const base::string16& username,
@@ -405,17 +406,9 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_FALSE(prompt_observer->IsShowingPrompt());
}
-// Disabled on Mac due to flakiness: crbug.com/493263
-#if defined(OS_MACOSX)
-#define MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage \
- DISABLED_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage
-#else
-#define MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage \
- NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage
-#endif
IN_PROC_BROWSER_TEST_F(
PasswordManagerBrowserTestBase,
- MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage) {
+ NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage) {
NavigateToFile("/password/multi_frames.html");
// Make sure that we don't prompt to save the password for a failed login
@@ -974,10 +967,8 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
run_loop.RunUntilIdle();
EXPECT_FALSE(password_store->IsEmpty());
-#if !defined(OS_MACOSX)
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
base::ASCIIToUTF16("random"));
-#endif
}
// Test for checking that no prompt is shown for URLs with file: scheme.
@@ -1645,6 +1636,16 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
ChangePwdFormBubbleShown) {
+// TODO(dvadym): Remove appending kEnablePasswordChangeSupport switch as soon as
+// it is removed on Mac. http://crbug.com/359315
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
NavigateToFile("/password/password_form.html");
NavigationObserver observer(WebContents());
@@ -1658,17 +1659,21 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
"document.getElementById('chg_submit_button').click()";
ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
observer.Wait();
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if defined(OS_MACOSX)
- EXPECT_FALSE(prompt_observer->IsShowingPrompt());
-#else
EXPECT_TRUE(prompt_observer->IsShowingPrompt());
-#endif
}
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
ChangePwdFormPushStateBubbleShown) {
+// TODO(dvadym): Remove appending kEnablePasswordChangeSupport switch as soon as
+// it is removed on Mac. http://crbug.com/359315
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
NavigateToFile("/password/password_push_state.html");
NavigationObserver observer(WebContents());
@@ -1683,13 +1688,7 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
"document.getElementById('chg_submit_button').click()";
ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
observer.Wait();
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if defined(OS_MACOSX)
- EXPECT_FALSE(prompt_observer->IsShowingPrompt());
-#else
EXPECT_TRUE(prompt_observer->IsShowingPrompt());
-#endif
}
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, NoPromptOnBack) {
@@ -2037,11 +2036,16 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
iframe_killed.Wait();
}
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
ChangePwdNoAccountStored) {
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
NavigateToFile("/password/password_form.html");
@@ -2077,13 +2081,17 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16(""),
base::ASCIIToUTF16("new_pw"));
}
-#endif
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
ChangePwd1AccountStored) {
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
// At first let us save credentials to the PasswordManager.
scoped_refptr<password_manager::TestPasswordStore> password_store =
@@ -2128,13 +2136,17 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
base::ASCIIToUTF16("new_pw"));
}
-#endif
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
PasswordOverridenUpdateBubbleShown) {
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
// At first let us save credentials to the PasswordManager.
scoped_refptr<password_manager::TestPasswordStore> password_store =
@@ -2173,13 +2185,17 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
base::ASCIIToUTF16("new_pw"));
}
-#endif
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
PasswordNotOverridenUpdateBubbleNotShown) {
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
// At first let us save credentials to the PasswordManager.
scoped_refptr<password_manager::TestPasswordStore> password_store =
@@ -2210,13 +2226,17 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
base::ASCIIToUTF16("pw"));
}
-#endif
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
ChangePwdWhenTheFormContainNotUsernameTextfield) {
+#if defined(OS_MACOSX)
+ // Add the enable-password-change-support feature.
+ base::FeatureList::ClearInstanceForTesting();
+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+ feature_list->InitializeFromCommandLine(
+ password_manager::features::kEnablePasswordChangeSupport.name, "");
+ base::FeatureList::SetInstance(std::move(feature_list));
+#endif
vasilii 2015/12/15 15:58:01 Shouldn't it go to the test's setup?
dvadym 2015/12/16 14:16:30 It will be removed with the flag in a couple of we
ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
// At first let us save credentials to the PasswordManager.
scoped_refptr<password_manager::TestPasswordStore> password_store =
@@ -2259,7 +2279,6 @@ IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
base::ASCIIToUTF16("new_pw"));
}
-#endif
// Test whether the password form with the username and password fields having
// ambiguity in id attribute gets autofilled correctly.
« no previous file with comments | « chrome/browser/password_manager/chrome_password_manager_client.cc ('k') | chrome/browser/ui/cocoa/passwords/base_passwords_controller_test.h » ('j') | chrome/browser/ui/cocoa/passwords/credentials_selection_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698