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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/payments/PaymentRequestTest.cpp

Issue 2697123003: Use ExecutionContext instead of Document in PaymentRequest constructor. (Closed)
Patch Set: Use ScriptState Created 3 years, 10 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
« third_party/WebKit/Source/modules/payments/PaymentRequest.cpp ('K') | « third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp ('k') | third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEvent.h » ('j') | third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEvent.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..7d2aa270390d400d93a8a6fcf9dfa653570f3afe 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,7 +307,7 @@ 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());
@@ -322,7 +323,7 @@ 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());
@@ -338,7 +339,7 @@ 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());
@@ -352,7 +353,7 @@ 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());
@@ -369,7 +370,7 @@ 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());
@@ -390,7 +391,7 @@ 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());
@@ -410,7 +411,7 @@ 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());
@@ -429,7 +430,7 @@ 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())
@@ -446,7 +447,7 @@ 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());
@@ -462,7 +463,7 @@ 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());
@@ -484,9 +485,9 @@ 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())
@@ -525,7 +526,7 @@ 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())
@@ -554,7 +555,7 @@ 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())
@@ -581,7 +582,7 @@ 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());
@@ -615,9 +616,9 @@ 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())
« third_party/WebKit/Source/modules/payments/PaymentRequest.cpp ('K') | « third_party/WebKit/Source/modules/payments/PaymentRequestDetailsTest.cpp ('k') | third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEvent.h » ('j') | third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEvent.idl » ('J')

Powered by Google App Engine
This is Rietveld 408576698