Title: [213956] branches/safari-603.1.30.0-branch/LayoutTests

Diff

Modified: branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog (213955 => 213956)


--- branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog	2017-03-14 23:34:58 UTC (rev 213955)
+++ branches/safari-603.1.30.0-branch/LayoutTests/ChangeLog	2017-03-14 23:35:02 UTC (rev 213956)
@@ -1,3 +1,16 @@
+2017-03-14  Matthew Hanson  <matthew_han...@apple.com>
+
+        Merge r213953. rdar://problem/31049771
+
+    2017-03-14  Andy Estes  <aes...@apple.com>
+
+            Update ApplePaySession.html after r213949
+
+            Rubber-stamped by Beth Dakin.
+
+            * http/tests/ssl/applepay/ApplePaySession-expected.txt:
+            * http/tests/ssl/applepay/ApplePaySession.html:
+
 2017-03-03  Matthew Hanson  <matthew_han...@apple.com>
 
         Merge r213253. rdar://problem/30773140

Modified: branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt (213955 => 213956)


--- branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-03-14 23:34:58 UTC (rev 213955)
+++ branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession-expected.txt	2017-03-14 23:35:02 UTC (rev 213956)
@@ -213,9 +213,6 @@
 SETUP: request = validRequest(); request.requiredBillingContactFields = { };
 PASS new ApplePaySession(2, request) threw exception TypeError: Type error.
 
-SETUP: request = validRequest(); request.requiredBillingContactFields = [];
-PASS new ApplePaySession(2, request) threw exception TypeError: At least one contact field must be provided..
-
 SETUP: request = validRequest(); request.requiredBillingContactFields = [''];
 PASS new ApplePaySession(2, request) threw exception TypeError: Type error.
 
@@ -237,6 +234,9 @@
 SETUP: request = validRequest(); request.requiredBillingContactFields = ['email', 'email'];
 PASS new ApplePaySession(2, request) did not throw exception.
 
+SETUP: request = validRequest(); request.requiredBillingContactFields = [];
+PASS new ApplePaySession(2, request) did not throw exception.
+
 Testing PaymentRequest.billingContact
 
 SETUP: request = validRequest(); request.billingContact = '';
@@ -271,9 +271,6 @@
 SETUP: request = validRequest(); request.requiredShippingContactFields = { };
 PASS new ApplePaySession(2, request) threw exception TypeError: Type error.
 
-SETUP: request = validRequest(); request.requiredShippingContactFields = [];
-PASS new ApplePaySession(2, request) threw exception TypeError: At least one contact field must be provided..
-
 SETUP: request = validRequest(); request.requiredShippingContactFields = [''];
 PASS new ApplePaySession(2, request) threw exception TypeError: Type error.
 
@@ -295,6 +292,9 @@
 SETUP: request = validRequest(); request.requiredShippingContactFields = ['email', 'email'];
 PASS new ApplePaySession(2, request) did not throw exception.
 
+SETUP: request = validRequest(); request.requiredShippingContactFields = [];
+PASS new ApplePaySession(2, request) did not throw exception.
+
 Testing PaymentRequest.shippingContact
 
 SETUP: request = validRequest(); request.shippingContact = '';

Modified: branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html (213955 => 213956)


--- branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-03-14 23:34:58 UTC (rev 213955)
+++ branches/safari-603.1.30.0-branch/LayoutTests/http/tests/ssl/applepay/ApplePaySession.html	2017-03-14 23:35:02 UTC (rev 213956)
@@ -129,7 +129,6 @@
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = null;", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = 7;", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = { };", "new ApplePaySession(2, request)")
-    logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = [];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = [''];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = [null];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredBillingContactFields = [undefined];", "new ApplePaySession(2, request)")
@@ -138,6 +137,7 @@
     logAndShouldNotThrow("request = validRequest(); request.requiredBillingContactFields = ['email', 'name', 'phone', 'postalAddress'];", "new ApplePaySession(2, request)")
     // FIXME: Should duplicate contactFields be allowed?
     logAndShouldNotThrow("request = validRequest(); request.requiredBillingContactFields = ['email', 'email'];", "new ApplePaySession(2, request)")
+    logAndShouldNotThrow("request = validRequest(); request.requiredBillingContactFields = [];", "new ApplePaySession(2, request)")
     
     debug("Testing PaymentRequest.billingContact")
     debug("");
@@ -154,7 +154,6 @@
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = null;", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = 7;", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = { };", "new ApplePaySession(2, request)")
-    logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = [];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = [''];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = [null];", "new ApplePaySession(2, request)")
     logAndShouldThrow("request = validRequest(); request.requiredShippingContactFields = [undefined];", "new ApplePaySession(2, request)")
@@ -163,6 +162,7 @@
     logAndShouldNotThrow("request = validRequest(); request.requiredShippingContactFields = ['email', 'name', 'phone', 'postalAddress'];", "new ApplePaySession(2, request)")
     // FIXME: Should duplicate contactFields be allowed?
     logAndShouldNotThrow("request = validRequest(); request.requiredShippingContactFields = ['email', 'email'];", "new ApplePaySession(2, request)")
+    logAndShouldNotThrow("request = validRequest(); request.requiredShippingContactFields = [];", "new ApplePaySession(2, request)")
     
     debug("Testing PaymentRequest.shippingContact")
     debug("");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to