Backed out changeset 8b3b53341da2 (bug 1497514) for failures in browser/components/payments/test/mochitest/test_basic_card_form.html

--HG--
rename : browser/components/payments/test/browser/browser_onboarding_wizard.js => browser/components/payments/test/browser/browser_payments_onboarding_wizard.js

browser/components/payments/res/containers/basic-card-form.js

@@ -151,10 +151,6 @@ export default class BasicCardForm extends PaymentStateSubscriberMixin(PaymentRe
       return;
     }
 
-    if (!basicCardPage.selectedStateKey) {
-      throw new Error("A `selectedStateKey` is required");
-    }
-
     let editing = !!basicCardPage.guid;
     this.cancelButton.textContent = this.dataset.cancelButtonLabel;
     this.backButton.textContent = this.dataset.backButtonLabel;

browser/components/payments/res/mixins/PaymentStateSubscriberMixin.js

@@ -17,7 +17,7 @@ export let requestStore = new PaymentsStore({
   "basic-card-page": {
     guid: null,
     // preserveFieldValues: true,
-    selectedStateKey: "selectedPaymentCard",
+    selectedStateKey: null,
   },
   "address-page": {
     guid: null,

browser/components/payments/res/paymentRequest.js

@@ -167,9 +167,6 @@ var paymentRequest = {
         id: "basic-card-page",
         onboardingWizard: true,
       };
-      state["basic-card-page"] = {
-        selectedStateKey: "selectedPaymentCard",
-      };
     }
 
     paymentDialog.setStateFromParent(state);

browser/components/payments/test/browser/browser.ini

@@ -14,9 +14,9 @@ skip-if = os == 'linux' && debug # bug 1465673
 [browser_change_shipping.js]
 [browser_dropdowns.js]
 [browser_host_name.js]
-[browser_onboarding_wizard.js]
 [browser_openPreferences.js]
 [browser_payment_completion.js]
+[browser_payments_onboarding_wizard.js]
 [browser_profile_storage.js]
 [browser_request_serialization.js]
 [browser_request_shipping.js]