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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc

Issue 2734693002: [Payments] Convert interactive tests to browsertests (Closed)
Patch Set: Initial Created 3 years, 9 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/views/payments/payment_request_browsertest_base.cc ('k') | chrome/browser/ui/views/payments/payment_request_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc b/chrome/browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc
deleted file mode 100644
index 209437c312d0a605fe8add9885ea260b428ec7cf..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/payments/payment_request_credit_card_editor_interactive_uitest.cc
+++ /dev/null
@@ -1,439 +0,0 @@
-// Copyright 2017 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 <vector>
-
-#include "base/macros.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
-#include "chrome/browser/ui/views/payments/payment_request_interactive_uitest_base.h"
-#include "chrome/browser/ui/views/payments/validating_textfield.h"
-#include "components/autofill/core/browser/field_types.h"
-#include "components/autofill/core/browser/personal_data_manager.h"
-#include "components/autofill/core/browser/test_autofill_clock.h"
-#include "components/payments/content/payment_request.h"
-#include "components/strings/grit/components_strings.h"
-#include "content/public/test/browser_test_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util.h"
-
-namespace payments {
-
-namespace {
-
-const base::Time kJune2017 = base::Time::FromDoubleT(1497552271);
-
-} // namespace
-
-class PaymentRequestCreditCardEditorTest
- : public PaymentRequestInteractiveTestBase {
- protected:
- PaymentRequestCreditCardEditorTest()
- : PaymentRequestInteractiveTestBase(
- "/payment_request_no_shipping_test.html") {}
-
- PersonalDataLoadedObserverMock personal_data_observer_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PaymentRequestCreditCardEditorTest);
-};
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringValidData) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
- autofill::CREDIT_CARD_NAME_FULL);
- SetEditorTextfieldValue(base::ASCIIToUTF16("4111111111111111"),
- autofill::CREDIT_CARD_NUMBER);
- SetComboboxValue(base::ASCIIToUTF16("05"), autofill::CREDIT_CARD_EXP_MONTH);
- SetComboboxValue(base::ASCIIToUTF16("2026"),
- autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
-
- // Verifying the data is in the DB.
- autofill::PersonalDataManager* personal_data_manager = GetDataManager();
- personal_data_manager->AddObserver(&personal_data_observer_);
-
- ResetEventObserver(DialogEvent::BACK_NAVIGATION);
-
- // Wait until the web database has been updated and the notification sent.
- base::RunLoop data_loop;
- EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
- .WillOnce(QuitMessageLoop(&data_loop));
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
- data_loop.Run();
-
- EXPECT_EQ(1u, personal_data_manager->GetCreditCards().size());
- autofill::CreditCard* credit_card =
- personal_data_manager->GetCreditCards()[0];
- EXPECT_EQ(5, credit_card->expiration_month());
- EXPECT_EQ(2026, credit_card->expiration_year());
- EXPECT_EQ(base::ASCIIToUTF16("1111"), credit_card->LastFourDigits());
- EXPECT_EQ(base::ASCIIToUTF16("Bob Jones"),
- credit_card->GetRawInfo(autofill::CREDIT_CARD_NAME_FULL));
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
- EnteringExpiredCard) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
- autofill::CREDIT_CARD_NAME_FULL);
- SetEditorTextfieldValue(base::ASCIIToUTF16("4111111111111111"),
- autofill::CREDIT_CARD_NUMBER);
- // The card is expired.
- SetComboboxValue(base::ASCIIToUTF16("01"), autofill::CREDIT_CARD_EXP_MONTH);
- SetComboboxValue(base::ASCIIToUTF16("2017"),
- autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
-
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
-
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NAME_FULL));
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- // TODO(mathp): Both expiration fields should be marked as invalid when the
- // card is expired.
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
-
- autofill::PersonalDataManager* personal_data_manager = GetDataManager();
- EXPECT_EQ(0u, personal_data_manager->GetCreditCards().size());
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
- EnteringNothingInARequiredField) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- // This field is required. Entering nothing and blurring out will show
- // "Required field".
- SetEditorTextfieldValue(base::ASCIIToUTF16(""), autofill::CREDIT_CARD_NUMBER);
- EXPECT_TRUE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_EQ(
- l10n_util::GetStringUTF16(IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
-
- // Set the value to something which is not a valid card number. The "invalid
- // card number" string takes precedence over "required field"
- SetEditorTextfieldValue(base::ASCIIToUTF16("41111111invalidcard"),
- autofill::CREDIT_CARD_NUMBER);
- EXPECT_TRUE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
-
- // Set the value to a valid number now. No more errors!
- SetEditorTextfieldValue(base::ASCIIToUTF16("4111111111111111"),
- autofill::CREDIT_CARD_NUMBER);
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_EQ(base::ASCIIToUTF16(""),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
- EnteringInvalidCardNumber) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
- autofill::CREDIT_CARD_NAME_FULL);
- SetEditorTextfieldValue(base::ASCIIToUTF16("41111111invalidcard"),
- autofill::CREDIT_CARD_NUMBER);
- EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
- SetComboboxValue(base::ASCIIToUTF16("05"), autofill::CREDIT_CARD_EXP_MONTH);
- SetComboboxValue(base::ASCIIToUTF16("2026"),
- autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
-
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
-
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NAME_FULL));
- EXPECT_TRUE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
-
- autofill::PersonalDataManager* personal_data_manager = GetDataManager();
- EXPECT_EQ(0u, personal_data_manager->GetCreditCards().size());
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
- EnteringUnsupportedCardType) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
- autofill::CREDIT_CARD_NAME_FULL);
- // In this test case, only "visa" and "mastercard" are supported, so entering
- // a MIR card will fail.
- SetEditorTextfieldValue(base::ASCIIToUTF16("22222222invalidcard"),
- autofill::CREDIT_CARD_NUMBER);
- EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_PAYMENTS_VALIDATION_UNSUPPORTED_CREDIT_CARD_TYPE),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
- SetComboboxValue(base::ASCIIToUTF16("05"), autofill::CREDIT_CARD_EXP_MONTH);
- SetComboboxValue(base::ASCIIToUTF16("2026"),
- autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
-
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
-
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NAME_FULL));
- EXPECT_TRUE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
-
- autofill::PersonalDataManager* personal_data_manager = GetDataManager();
- EXPECT_EQ(0u, personal_data_manager->GetCreditCards().size());
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
- EnteringInvalidCardNumber_AndFixingIt) {
- autofill::TestAutofillClock test_clock;
- test_clock.SetNow(kJune2017);
-
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
- autofill::CREDIT_CARD_NAME_FULL);
- SetEditorTextfieldValue(base::ASCIIToUTF16("41111111invalidcard"),
- autofill::CREDIT_CARD_NUMBER);
- EXPECT_EQ(l10n_util::GetStringUTF16(
- IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
- SetComboboxValue(base::ASCIIToUTF16("05"), autofill::CREDIT_CARD_EXP_MONTH);
- SetComboboxValue(base::ASCIIToUTF16("2026"),
- autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
-
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
-
- EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NAME_FULL));
- EXPECT_TRUE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
- EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
-
- // Fixing the card number.
- SetEditorTextfieldValue(base::ASCIIToUTF16("4111111111111111"),
- autofill::CREDIT_CARD_NUMBER);
- // The error message has gone.
- EXPECT_EQ(base::ASCIIToUTF16(""),
- GetErrorLabelForType(autofill::CREDIT_CARD_NUMBER));
-
- // Verifying the data is in the DB.
- autofill::PersonalDataManager* personal_data_manager = GetDataManager();
- personal_data_manager->AddObserver(&personal_data_observer_);
-
- ResetEventObserver(DialogEvent::BACK_NAVIGATION);
-
- // Wait until the web database has been updated and the notification sent.
- base::RunLoop data_loop;
- EXPECT_CALL(personal_data_observer_, OnPersonalDataChanged())
- .WillOnce(QuitMessageLoop(&data_loop));
- ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
- data_loop.Run();
-
- EXPECT_EQ(1u, personal_data_manager->GetCreditCards().size());
- autofill::CreditCard* credit_card =
- personal_data_manager->GetCreditCards()[0];
- EXPECT_EQ(5, credit_card->expiration_month());
- EXPECT_EQ(2026, credit_card->expiration_year());
- EXPECT_EQ(base::ASCIIToUTF16("1111"), credit_card->LastFourDigits());
- EXPECT_EQ(base::ASCIIToUTF16("Bob Jones"),
- credit_card->GetRawInfo(autofill::CREDIT_CARD_NAME_FULL));
-}
-
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringEmptyData) {
- InvokePaymentRequestUI();
-
- OpenPaymentMethodScreen();
-
- OpenCreditCardEditorScreen();
-
- // Setting empty data and unfocusing a required textfield will make it
- // invalid.
- SetEditorTextfieldValue(base::ASCIIToUTF16(""),
- autofill::CREDIT_CARD_NAME_FULL);
-
- ValidatingTextfield* textfield =
- static_cast<ValidatingTextfield*>(dialog_view()->GetViewByID(
- static_cast<int>(autofill::CREDIT_CARD_NAME_FULL)));
- EXPECT_TRUE(textfield);
- EXPECT_TRUE(textfield->invalid());
-}
-
-class PaymentRequestCreditCardBasicCardTest
- : public PaymentRequestInteractiveTestBase {
- protected:
- PaymentRequestCreditCardBasicCardTest()
- : PaymentRequestInteractiveTestBase(
- "/payment_request_basic_card_test.html") {}
-
- void InvokePaymentRequestWithJs(const std::string& js) {
- ResetEventObserver(DialogEvent::DIALOG_OPENED);
-
- ASSERT_TRUE(content::ExecuteScript(GetActiveWebContents(), js));
-
- WaitForObservedEvent();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PaymentRequestCreditCardBasicCardTest);
-};
-
-// One network is specified in 'basic-card' data, one in supportedMethods.
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardBasicCardTest,
- BasicCard_NetworksSpecified) {
- InvokePaymentRequestWithJs("buy();");
-
- std::vector<PaymentRequest*> requests =
- GetPaymentRequests(GetActiveWebContents());
- EXPECT_EQ(1u, requests.size());
- std::vector<std::string> supported_card_networks =
- requests[0]->supported_card_networks();
- EXPECT_EQ(2u, supported_card_networks.size());
- // The networks appear in the order in which they were specified by the
- // merchant.
- EXPECT_EQ("mastercard", supported_card_networks[0]);
- EXPECT_EQ("visa", supported_card_networks[1]);
-}
-
-// Only specifying 'basic-card' with no supportedNetworks means all networks are
-// supported.
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardBasicCardTest,
- BasicCard_NoNetworksSpecified) {
- InvokePaymentRequestWithJs("buyBasicCard();");
-
- std::vector<PaymentRequest*> requests =
- GetPaymentRequests(GetActiveWebContents());
- EXPECT_EQ(1u, requests.size());
- std::vector<std::string> supported_card_networks =
- requests[0]->supported_card_networks();
- // The default ordering is alphabetical.
- EXPECT_EQ(8u, supported_card_networks.size());
- EXPECT_EQ("amex", supported_card_networks[0]);
- EXPECT_EQ("diners", supported_card_networks[1]);
- EXPECT_EQ("discover", supported_card_networks[2]);
- EXPECT_EQ("jcb", supported_card_networks[3]);
- EXPECT_EQ("mastercard", supported_card_networks[4]);
- EXPECT_EQ("mir", supported_card_networks[5]);
- EXPECT_EQ("unionpay", supported_card_networks[6]);
- EXPECT_EQ("visa", supported_card_networks[7]);
-}
-
-// Specifying 'basic-card' after having explicitely included a network yields
-// the expected order when in different supportedMethods lists.
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardBasicCardTest,
- BasicCard_NetworkThenBasicCard_DifferentList) {
- InvokePaymentRequestWithJs(
- "buyHelper([{"
- " supportedMethods: ['mastercard'],"
- "}, {"
- " supportedMethods: ['basic-card']"
- "}]);");
-
- std::vector<PaymentRequest*> requests =
- GetPaymentRequests(GetActiveWebContents());
- EXPECT_EQ(1u, requests.size());
- std::vector<std::string> supported_card_networks =
- requests[0]->supported_card_networks();
- // 'mastercard' is first because it was explicitely specified first. The rest
- // is alphabetical.
- EXPECT_EQ(8u, supported_card_networks.size());
- EXPECT_EQ("mastercard", supported_card_networks[0]);
- EXPECT_EQ("amex", supported_card_networks[1]);
- EXPECT_EQ("diners", supported_card_networks[2]);
- EXPECT_EQ("discover", supported_card_networks[3]);
- EXPECT_EQ("jcb", supported_card_networks[4]);
- EXPECT_EQ("mir", supported_card_networks[5]);
- EXPECT_EQ("unionpay", supported_card_networks[6]);
- EXPECT_EQ("visa", supported_card_networks[7]);
-}
-
-// Specifying 'basic-card' after having explicitely included a network yields
-// the expected order when in the same supportedMethods list.
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardBasicCardTest,
- BasicCard_NetworkThenBasicCard_SameList) {
- InvokePaymentRequestWithJs(
- "buyHelper([{"
- " supportedMethods: ['visa', 'basic-card']"
- "}]);");
-
- std::vector<PaymentRequest*> requests =
- GetPaymentRequests(GetActiveWebContents());
- EXPECT_EQ(1u, requests.size());
- std::vector<std::string> supported_card_networks =
- requests[0]->supported_card_networks();
- // 'visa' is first because it was explicitely specified first. The rest
- // is alphabetical.
- EXPECT_EQ(8u, supported_card_networks.size());
- EXPECT_EQ("visa", supported_card_networks[0]);
- EXPECT_EQ("amex", supported_card_networks[1]);
- EXPECT_EQ("diners", supported_card_networks[2]);
- EXPECT_EQ("discover", supported_card_networks[3]);
- EXPECT_EQ("jcb", supported_card_networks[4]);
- EXPECT_EQ("mastercard", supported_card_networks[5]);
- EXPECT_EQ("mir", supported_card_networks[6]);
- EXPECT_EQ("unionpay", supported_card_networks[7]);
-}
-
-// Specifying 'basic-card' with some networks after having explicitely included
-// the same networks does not yield duplicates and has the expected order.
-IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardBasicCardTest,
- BasicCard_NetworkThenBasicCardWithSameNetwork) {
- InvokePaymentRequestWithJs(
- "buyHelper([{"
- " supportedMethods: ['mastercard', 'visa']"
- "}, {"
- " supportedMethods: ['basic-card'],"
- " data: {"
- " supportedNetworks: ['visa', 'mastercard', 'jcb'],"
- " }"
- "}]);");
-
- std::vector<PaymentRequest*> requests =
- GetPaymentRequests(GetActiveWebContents());
- EXPECT_EQ(1u, requests.size());
- std::vector<std::string> supported_card_networks =
- requests[0]->supported_card_networks();
- EXPECT_EQ(3u, supported_card_networks.size());
- EXPECT_EQ("mastercard", supported_card_networks[0]);
- EXPECT_EQ("visa", supported_card_networks[1]);
- EXPECT_EQ("jcb", supported_card_networks[2]);
-}
-
-} // namespace payments
« no previous file with comments | « chrome/browser/ui/views/payments/payment_request_browsertest_base.cc ('k') | chrome/browser/ui/views/payments/payment_request_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698