Boldly refuse to show rAc dialog if cc info is not requested.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 449 matching lines @@
         callback,
         mock_new_card_bubble_controller_.get()))->AsWeakPtr();
     controller_->Init(profile());
   }
 
   // Creates a new controller for |form_data| and sets up some initial wallet
   // data for it.
   void SetUpControllerWithFormData(const FormData& form_data) {
     ResetControllerWithFormData(form_data);
     controller()->Show();
-    if (!profile()->GetPrefs()->GetBoolean(
+    if (controller() &&
+        !profile()->GetPrefs()->GetBoolean(
             ::prefs::kAutofillDialogPayWithoutWallet)) {
       EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
       controller()->OnDidFetchWalletCookieValue(std::string());
       controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
     }
   }
 
   // Fills the inputs in SECTION_CC with data.
   void FillCreditCardInputs() {
     FieldValueMap cc_outputs;
@@ skipping 193 matching lines @@
 
   // Used to record when new card bubbles would show. Created in |Reset()|.
   scoped_ptr<MockNewCreditCardBubbleController>
       mock_new_card_bubble_controller_;
 
   scoped_ptr<ScopedTestingLocalState> scoped_local_state_;
 };
 
 }  // namespace
 
+TEST_F(AutofillDialogControllerTest, RefuseToShowWithNoAutocompleteAttributes) {
+  FormFieldData email_field;
+  email_field.name = ASCIIToUTF16("email");
+  FormFieldData cc_field;
+  cc_field.name = ASCIIToUTF16("cc");
+  FormFieldData billing_field;
+  billing_field.name = ASCIIToUTF16("billing name");
+
+  FormData form_data;
+  form_data.fields.push_back(email_field);
+  form_data.fields.push_back(cc_field);
+  form_data.fields.push_back(billing_field);
+
+  SetUpControllerWithFormData(form_data);
+  EXPECT_FALSE(controller());
+}
+
+TEST_F(AutofillDialogControllerTest, RefuseToShowWithNoCcField) {
+  FormFieldData shipping_tel;
+  shipping_tel.autocomplete_attribute = "shipping tel";
+
+  FormData form_data;
+  form_data.fields.push_back(shipping_tel);
+
+  SetUpControllerWithFormData(form_data);
+  EXPECT_FALSE(controller());
+
+  // Any cc- field will do.
+  FormFieldData cc_field;
+  cc_field.autocomplete_attribute = "cc-csc";
+  form_data.fields.push_back(cc_field);
+
+  SetUpControllerWithFormData(form_data);
+  EXPECT_TRUE(controller());
+}

[Dan Beam, 2014/04/10 17:54:43]

these tests are great, but i meant checking that "unsupported" was returned as
the result/reason.  can we check that end-to-end in the browser tests?

[Evan Stade, 2014/04/10 19:50:57]

We don't need end-to-end tests to check that, we could check it in this test,
however I'm not sure I see the value in adding that degree of specificity.

[Dan Beam, 2014/04/15 02:16:42]

taking an extra hour (if that) to verify a part of the public HTML API actually
works is worth it, imo.  if you still disagree, i'm sure others can review or i
can write this test for you.

[Evan Stade, 2014/04/15 02:33:16]

My preference for unit tests and regression-driven test development hasn't
changed over the weekend, so let me know which of the two options you gave is
preferable to you.

+
 // Ensure the default ValidityMessage has the expected values.
 TEST_F(AutofillDialogControllerTest, DefaultValidityMessage) {
   ValidityMessages messages;
   ValidityMessage message = messages.GetMessageOrDefault(UNKNOWN_TYPE);
   EXPECT_FALSE(message.sure);
   EXPECT_TRUE(message.text.empty());
 }
 
 // This test makes sure nothing falls over when fields are being validity-
 // checked.
@@ skipping 614 matching lines @@
   SubmitAndVerifyShippingAndBillingResults();
 }
 
 // Tests that shipping and billing telephone fields are supported, and filled
 // in by their respective profiles. http://crbug.com/244515
 TEST_F(AutofillDialogControllerTest, BillingVsShippingPhoneNumber) {
   FormFieldData shipping_tel;
   shipping_tel.autocomplete_attribute = "shipping tel";
   FormFieldData billing_tel;
   billing_tel.autocomplete_attribute = "billing tel";
+  FormFieldData cc_field;
+  cc_field.autocomplete_attribute = "cc-csc";
 
   FormData form_data;
   form_data.fields.push_back(shipping_tel);
   form_data.fields.push_back(billing_tel);
+  form_data.fields.push_back(cc_field);
   SetUpControllerWithFormData(form_data);
 
   SwitchToAutofill();
 
   // The profile that will be chosen for the shipping section.
   AutofillProfile shipping_profile(test::GetVerifiedProfile());
   // The profile that will be chosen for the billing section.
   AutofillProfile billing_profile(test::GetVerifiedProfile2());
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&shipping_profile);
   controller()->GetTestingManager()->AddTestingProfile(&billing_profile);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   ui::MenuModel* billing_model =
       controller()->MenuModelForSection(SECTION_BILLING);
   billing_model->ActivatedAt(1);
 
   controller()->OnAccept();
-  ASSERT_EQ(2U, form_structure()->field_count());
+  ASSERT_EQ(3U, form_structure()->field_count());
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
             form_structure()->field(0)->Type().GetStorableType());
   EXPECT_EQ(PHONE_HOME, form_structure()->field(0)->Type().group());
   EXPECT_EQ(PHONE_HOME_WHOLE_NUMBER,
             form_structure()->field(1)->Type().GetStorableType());
   EXPECT_EQ(PHONE_BILLING, form_structure()->field(1)->Type().group());
   EXPECT_EQ(shipping_profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
             form_structure()->field(0)->value);
   EXPECT_EQ(billing_profile.GetRawInfo(PHONE_HOME_WHOLE_NUMBER),
             form_structure()->field(1)->value);
   EXPECT_NE(form_structure()->field(1)->value,
             form_structure()->field(0)->value);
 }
 
 // Similar to the above, but tests that street-address (i.e. all lines of the
 // street address) is successfully filled for both shipping and billing
 // sections.
 TEST_F(AutofillDialogControllerTest, BillingVsShippingStreetAddress) {
   FormFieldData shipping_address;
   shipping_address.autocomplete_attribute = "shipping street-address";
   FormFieldData billing_address;
   billing_address.autocomplete_attribute = "billing street-address";
   FormFieldData shipping_address_textarea;
   shipping_address_textarea.autocomplete_attribute = "shipping street-address";
   shipping_address_textarea.form_control_type = "textarea";
   FormFieldData billing_address_textarea;
   billing_address_textarea.autocomplete_attribute = "billing street-address";
   billing_address_textarea.form_control_type = "textarea";
+  FormFieldData cc_field;
+  cc_field.autocomplete_attribute = "cc-csc";
 
   FormData form_data;
   form_data.fields.push_back(shipping_address);
   form_data.fields.push_back(billing_address);
   form_data.fields.push_back(shipping_address_textarea);
   form_data.fields.push_back(billing_address_textarea);
+  form_data.fields.push_back(cc_field);
   SetUpControllerWithFormData(form_data);
 
   SwitchToAutofill();
 
   // The profile that will be chosen for the shipping section.
   AutofillProfile shipping_profile(test::GetVerifiedProfile());
   // The profile that will be chosen for the billing section.
   AutofillProfile billing_profile(test::GetVerifiedProfile2());
   CreditCard credit_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingProfile(&shipping_profile);
   controller()->GetTestingManager()->AddTestingProfile(&billing_profile);
   controller()->GetTestingManager()->AddTestingCreditCard(&credit_card);
   ui::MenuModel* billing_model =
       controller()->MenuModelForSection(SECTION_BILLING);
   billing_model->ActivatedAt(1);
 
   controller()->OnAccept();
-  ASSERT_EQ(4U, form_structure()->field_count());
+  ASSERT_EQ(5U, form_structure()->field_count());
   EXPECT_EQ(ADDRESS_HOME_STREET_ADDRESS,
             form_structure()->field(0)->Type().GetStorableType());
   EXPECT_EQ(ADDRESS_HOME, form_structure()->field(0)->Type().group());
   EXPECT_EQ(ADDRESS_HOME_STREET_ADDRESS,
             form_structure()->field(1)->Type().GetStorableType());
   EXPECT_EQ(ADDRESS_BILLING, form_structure()->field(1)->Type().group());
   // Inexact matching; single-line inputs get the address data concatenated but
   // separated by commas.
   EXPECT_TRUE(StartsWith(form_structure()->field(0)->value,
                          shipping_profile.GetRawInfo(ADDRESS_HOME_LINE1),
@@ skipping 1877 matching lines @@
   // text content. Thus the first two options should be recognized.
   FormData form_data;
   FormFieldData field;
   field.autocomplete_attribute = "billing country";
   field.option_contents.push_back(ASCIIToUTF16("Down Under"));
   field.option_values.push_back(ASCIIToUTF16("AU"));
   field.option_contents.push_back(ASCIIToUTF16("Fr"));
   field.option_values.push_back(ASCIIToUTF16(""));
   field.option_contents.push_back(ASCIIToUTF16("Germany"));
   field.option_values.push_back(ASCIIToUTF16("GRMNY"));
+
+  FormFieldData cc_field;
+  cc_field.autocomplete_attribute = "cc-csc";
+
   form_data.fields.push_back(field);
+  form_data.fields.push_back(cc_field);
   ResetControllerWithFormData(form_data);
   controller()->Show();
 
   // Shipping model shouldn't have changed.
   shipping_country_model =
       controller()->ComboboxModelForAutofillType(ADDRESS_HOME_COUNTRY);
   EXPECT_EQ(default_number_of_countries,
             shipping_country_model->GetItemCount());
   // Billing model now only has two items.
   ui::ComboboxModel* billing_country_model =
@@ skipping 105 matching lines @@
       SECTION_SHIPPING,
       NAME_FULL,
       gfx::NativeView(),
       gfx::Rect(),
       profile.GetRawInfo(NAME_FULL).substr(0, 1),
       true);
   EXPECT_EQ(NAME_FULL, controller()->popup_input_type());
 }
 
 }  // namespace autofill