| Index: third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
|
| index e7038c2be1a26afeaed916efc9bc5c8956180352..becd16ed9969227742d35c283ccde5c324e3e608 100644
|
| --- a/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp
|
| @@ -19,9 +19,9 @@ TEST(PaymentRequestTest, SecureContextRequired) {
|
| scope.document().setSecurityOrigin(
|
| SecurityOrigin::create(KURL(KURL(), "http://www.example.com/")));
|
|
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - buildPaymentDetailsForTest(),
|
| - scope.getExceptionState());
|
| + PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| + buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| EXPECT_TRUE(scope.getExceptionState().hadException());
|
| EXPECT_EQ(SecurityError, scope.getExceptionState().code());
|
| @@ -30,9 +30,9 @@ TEST(PaymentRequestTest, SecureContextRequired) {
|
| TEST(PaymentRequestTest, NoExceptionWithValidData) {
|
| V8TestingScope scope;
|
| makePaymentRequestOriginSecure(scope.document());
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - buildPaymentDetailsForTest(),
|
| - scope.getExceptionState());
|
| + PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| + buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| }
|
| @@ -40,9 +40,9 @@ TEST(PaymentRequestTest, NoExceptionWithValidData) {
|
| TEST(PaymentRequestTest, SupportedMethodListRequired) {
|
| V8TestingScope scope;
|
| makePaymentRequestOriginSecure(scope.document());
|
| - PaymentRequest::create(scope.document(), HeapVector<PaymentMethodData>(),
|
| - buildPaymentDetailsForTest(),
|
| - scope.getExceptionState());
|
| + PaymentRequest::create(
|
| + scope.getScriptState(), HeapVector<PaymentMethodData>(),
|
| + buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| EXPECT_TRUE(scope.getExceptionState().hadException());
|
| EXPECT_EQ(V8TypeError, scope.getExceptionState().code());
|
| @@ -51,8 +51,9 @@ TEST(PaymentRequestTest, SupportedMethodListRequired) {
|
| TEST(PaymentRequestTest, TotalRequired) {
|
| V8TestingScope scope;
|
| makePaymentRequestOriginSecure(scope.document());
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - PaymentDetails(), scope.getExceptionState());
|
| + PaymentRequest::create(scope.getScriptState(),
|
| + buildPaymentMethodDataForTest(), PaymentDetails(),
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(scope.getExceptionState().hadException());
|
| EXPECT_EQ(V8TypeError, scope.getExceptionState().code());
|
| @@ -62,7 +63,7 @@ TEST(PaymentRequestTest, ErrorMsgMustBeEmptyInConstrctor) {
|
| V8TestingScope scope;
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsErrorMsgForTest("This is an error message."),
|
| scope.getExceptionState());
|
|
|
| @@ -78,9 +79,9 @@ TEST(PaymentRequestTest, NullShippingOptionWhenNoOptionsAvailable) {
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| }
|
| @@ -95,9 +96,9 @@ TEST(PaymentRequestTest, NullShippingOptionWhenMultipleOptionsAvailable) {
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| }
|
| @@ -111,9 +112,9 @@ TEST(PaymentRequestTest, DontSelectSingleAvailableShippingOptionByDefault) {
|
| 1, buildShippingOptionForTest(PaymentTestDataId,
|
| PaymentTestOverwriteValue, "standard")));
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| }
|
| @@ -129,9 +130,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(false);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| }
|
| @@ -147,9 +148,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| }
|
| @@ -168,9 +169,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("standard", request->shippingOption());
|
| }
|
| @@ -191,9 +192,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("standard", request->shippingOption());
|
| }
|
| @@ -215,9 +216,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("express", request->shippingOption());
|
| }
|
| @@ -230,9 +231,9 @@ TEST(PaymentRequestTest, NullShippingTypeWhenRequestShippingIsFalse) {
|
| PaymentOptions options;
|
| options.setRequestShipping(false);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_TRUE(request->shippingType().isNull());
|
| }
|
| @@ -246,9 +247,9 @@ TEST(PaymentRequestTest,
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("shipping", request->shippingType());
|
| }
|
| @@ -262,9 +263,9 @@ TEST(PaymentRequestTest, DeliveryShippingTypeWhenShippingTypeIsDelivery) {
|
| options.setRequestShipping(true);
|
| options.setShippingType("delivery");
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("delivery", request->shippingType());
|
| }
|
| @@ -278,9 +279,9 @@ TEST(PaymentRequestTest, PickupShippingTypeWhenShippingTypeIsPickup) {
|
| options.setRequestShipping(true);
|
| options.setShippingType("pickup");
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("pickup", request->shippingType());
|
| }
|
| @@ -294,9 +295,9 @@ TEST(PaymentRequestTest, DefaultShippingTypeWhenShippingTypeIsInvalid) {
|
| options.setRequestShipping(true);
|
| options.setShippingType("invalid");
|
|
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
|
|
| EXPECT_EQ("shipping", request->shippingType());
|
| }
|
| @@ -306,12 +307,11 @@ TEST(PaymentRequestTest, RejectShowPromiseOnInvalidShippingAddress) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| ->OnShippingAddressChange(payments::mojom::blink::PaymentAddress::New());
|
| @@ -322,12 +322,11 @@ TEST(PaymentRequestTest, OnShippingOptionChange) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
|
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| ->OnShippingOptionChange("standardShipping");
|
| @@ -338,13 +337,12 @@ TEST(PaymentRequestTest, CannotCallShowTwice) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| - request->show(scope.getScriptState());
|
| + request->show();
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall());
|
| }
|
|
|
| TEST(PaymentRequestTest, CannotShowAfterAborted) {
|
| @@ -352,16 +350,15 @@ TEST(PaymentRequestTest, CannotShowAfterAborted) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| - request->show(scope.getScriptState());
|
| - request->abort(scope.getScriptState());
|
| + request->show();
|
| + request->abort();
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnAbort(
|
| true);
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall());
|
| }
|
|
|
| TEST(PaymentRequestTest, RejectShowPromiseOnErrorPaymentMethodNotSupported) {
|
| @@ -369,13 +366,12 @@ TEST(PaymentRequestTest, RejectShowPromiseOnErrorPaymentMethodNotSupported) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| String errorMessage;
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
|
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| payments::mojom::blink::PaymentErrorReason::NOT_SUPPORTED);
|
| @@ -390,13 +386,12 @@ TEST(PaymentRequestTest, RejectShowPromiseOnErrorCancelled) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| String errorMessage;
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
|
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| payments::mojom::blink::PaymentErrorReason::USER_CANCEL);
|
| @@ -410,13 +405,12 @@ TEST(PaymentRequestTest, RejectShowPromiseOnUpdateDetailsFailure) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| String errorMessage;
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
|
|
| request->onUpdatePaymentDetailsFailure("oops");
|
|
|
| @@ -429,11 +423,10 @@ TEST(PaymentRequestTest, IgnoreUpdatePaymentDetailsAfterShowPromiseResolved) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectCall(), funcs.expectNoCall());
|
| static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| ->OnPaymentResponse(buildPaymentResponseForTest());
|
|
|
| @@ -446,12 +439,11 @@ TEST(PaymentRequestTest, RejectShowPromiseOnNonPaymentDetailsUpdate) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| request->onUpdatePaymentDetails(
|
| ScriptValue::from(scope.getScriptState(), "NotPaymentDetails"));
|
| @@ -462,12 +454,11 @@ TEST(PaymentRequestTest, RejectShowPromiseOnInvalidPaymentDetailsUpdate) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| request->onUpdatePaymentDetails(ScriptValue::from(
|
| scope.getScriptState(), fromJSONString(scope.getScriptState()->isolate(),
|
| @@ -484,13 +475,12 @@ TEST(PaymentRequestTest,
|
| details.setTotal(buildPaymentItemForTest());
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
| String detailWithShippingOptions =
|
| "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
|
| "\"value\": \"5.00\"}},"
|
| @@ -525,11 +515,10 @@ TEST(
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), options, scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
| String detail =
|
| "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
|
| "\"value\": \"5.00\"}},"
|
| @@ -554,11 +543,10 @@ TEST(PaymentRequestTest, UseTheSelectedShippingOptionFromPaymentDetailsUpdate) {
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), options, scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
| String detail =
|
| "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
|
| "\"value\": \"5.00\"}},"
|
| @@ -581,12 +569,11 @@ TEST(PaymentRequestTest, NoExceptionWithErrorMessageInUpdate) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
|
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
| String detailWithErrorMsg =
|
| "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
|
| "\"value\": \"5.00\"}},"
|
| @@ -615,13 +602,12 @@ TEST(PaymentRequestTest,
|
| details.setShippingOptions(shippingOptions);
|
| PaymentOptions options;
|
| options.setRequestShipping(true);
|
| - PaymentRequest* request =
|
| - PaymentRequest::create(scope.document(), buildPaymentMethodDataForTest(),
|
| - details, options, scope.getExceptionState());
|
| + PaymentRequest* request = PaymentRequest::create(
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(), details, options,
|
| + scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| EXPECT_TRUE(request->shippingOption().isNull());
|
| - request->show(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectNoCall());
|
| + request->show().then(funcs.expectNoCall(), funcs.expectNoCall());
|
| String detailWithShippingOptions =
|
| "{\"total\": {\"label\": \"Total\", \"amount\": {\"currency\": \"USD\", "
|
| "\"value\": \"5.00\"}},"
|
|
|