Sync (#835)

* sync Android with React Native 0.15.0 * sync iOS with React Native 0.15.0 * try to fix integration test * try to fix integration test * adjust integration tests * integration tests on iOS, do adjustments * update tests, cleanup * update tests, cleanup * add new google pay and apple pay payment params to paymentsheet * add new apple pay payment method items needed for iOS 15 support * add support for affirm payment * chore(release): publish packages - [email protected] * chore(release): publish packages - [email protected] * chore(release): publish packages - [email protected] * chore(release): publish packages - [email protected] * chore(release): publish packages - [email protected] * chore provide correct readmes Co-authored-by: Remon Helmond <[email protected]>
flutter-stripe · Jul 20, 2022 · 6e26f1c · 6e26f1c
1 parent 93a291f
commit 6e26f1c
Show file tree

Hide file tree

Showing 50 changed files with 9,629 additions and 797 deletions.
diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
 
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: subosito/flutter-action@v1
+    - uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
 
@@ -85,7 +85,7 @@ jobs:
       with:
         java-version: '11'
 
-    - uses: subosito/flutter-action@v1
+    - uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
 
@@ -124,3 +124,11 @@ jobs:
           sleep 15;
           flutter drive --driver test_driver/integration_test.dart --target=integration_test/run_all_tests.dart;
           cd android && ./gradlew :app:connectedDebugAndroidTest;
+
+    - name: "Start iOS Simulator"
+      run: |
+        xcrun simctl boot "iPhone 13 mini" 
+
+    - name: "Run Flutter Driver tests on iOS"
+      working-directory: example
+      run: "flutter drive --driver test_driver/integration_test.dart --target=integration_test/run_all_tests.dart"
diff --git a/.github/workflows/scripts/install-tools.sh b/.github/workflows/scripts/install-tools.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-flutter pub global activate melos
+flutter pub global activate melos
diff --git a/example/integration_test/app_test.dart b/example/integration_test/app_test.dart
@@ -24,11 +24,12 @@ void main() {
       // 2. initialize the payment sheet
       await Stripe.instance.initPaymentSheet(
         paymentSheetParameters: SetupPaymentSheetParameters(
-          applePay: true,
-          googlePay: true,
+          applePay: PaymentSheetApplePay(merchantCountryCode: 'DE'),
+          googlePay: PaymentSheetGooglePay(
+            merchantCountryCode: 'DE',
+            testEnv: true,
+          ),
           style: ThemeMode.dark,
-          testEnv: true,
-          merchantCountryCode: 'DE',
           merchantDisplayName: 'Flutter Stripe Store Demo',
           customerId: _paymentSheetData['customer'],
           paymentIntentClientSecret: _paymentSheetData['paymentIntent'],
@@ -77,7 +78,8 @@ void main() {
       );
 
       // 3. create intent on the server
-      final paymentIntentResult = await _createNoWebhookPayEndpointMethod(paymentMethod.id);
+      final paymentIntentResult =
+          await _createNoWebhookPayEndpointMethod(paymentMethod.id);
       expect(paymentIntentResult['status'], 'succeeded');
     });
   });
@@ -100,7 +102,8 @@ Future<Map<String, dynamic>> _createTestPaymentSheet() async {
   return json.decode(response.body);
 }
 
-Future<Map<String, dynamic>> _createNoWebhookPayEndpointMethod(String paymentMethodId) async {
+Future<Map<String, dynamic>> _createNoWebhookPayEndpointMethod(
+    String paymentMethodId) async {
   final ipAddress = kApiUrl.split('\n').last.trim();
   final url = Uri.parse('http://$ipAddress:4242/pay-without-webhooks');
   final response = await http.post(

diff --git a/example/integration_test/payment_method_test.dart b/example/integration_test/payment_method_test.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter_stripe/flutter_stripe.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
@@ -123,7 +125,12 @@ void main() {
         expect(paymentMethod.id, startsWith('pm_'));
         expect(paymentMethod.ideal, isNotNull);
         expect(paymentMethod.ideal.bank, isNull);
-        expect(paymentMethod.ideal.bankIdentifierCode, isNull);
+        // TODO instead create tickets for react native
+        if (Platform.isIOS) {
+          expect(paymentMethod.ideal.bankIdentifierCode, '');
+        } else {
+          expect(paymentMethod.ideal.bankIdentifierCode, isNull);
+        }
         //  expect(paymentMethod.billingDetails.isEmpty, isTrue);
       });
 
@@ -134,7 +141,7 @@ void main() {
         expect(paymentMethod.id, startsWith('pm_'));
         expect(paymentMethod.ideal, isNotNull);
         expect(paymentMethod.ideal.bank, isNull);
-        expect(paymentMethod.ideal.bankIdentifierCode, isNull);
+        expect(paymentMethod.ideal.bankIdentifierCode, 'REVOLT21');
         //  expect(paymentMethod.billingDetails.isEmpty, isTrue);
       });
     });
@@ -145,8 +152,13 @@ void main() {
       );
       expect(paymentMethod.id, startsWith('pm_'));
       expect(paymentMethod.fpx, isNotNull);
-      expect(paymentMethod.fpx.bank, isNull);
-      expect(paymentMethod.fpx.accountHolderType, isNull);
+      expect(paymentMethod.fpx.bank, 'affin_bank');
+      // TODO instead create tickets for react native
+      if (Platform.isIOS) {
+        expect(paymentMethod.fpx.accountHolderType, isNull);
+      } else {
+        expect(paymentMethod.fpx.accountHolderType, 'individual');
+      }
       //  expect(paymentMethod.billingDetails.isEmpty, isTrue);
     });
   });

diff --git a/example/lib/screens/payment_sheet/payment_sheet_screen.dart b/example/lib/screens/payment_sheet/payment_sheet_screen.dart
@@ -94,8 +94,13 @@ class _PaymentSheetScreenState extends State<PaymentSheetScreen> {
           customerId: data['customer'],
           customerEphemeralKeySecret: data['ephemeralKey'],
           // Extra params
-          applePay: true,
-          googlePay: true,
+          applePay: PaymentSheetApplePay(
+            merchantCountryCode: 'DE',
+          ),
+          googlePay: PaymentSheetGooglePay(
+            merchantCountryCode: 'DE',
+            testEnv: true,
+          ),
           style: ThemeMode.dark,
           appearance: PaymentSheetAppearance(
             colors: PaymentSheetAppearanceColors(
@@ -119,8 +124,6 @@ class _PaymentSheetScreenState extends State<PaymentSheetScreen> {
             ),
           ),
           billingDetails: billingDetails,
-          testEnv: true,
-          merchantCountryCode: 'DE',
         ),
       );
       setState(() {

diff --git a/example/lib/screens/payment_sheet/payment_sheet_screen_custom_flow.dart b/example/lib/screens/payment_sheet/payment_sheet_screen_custom_flow.dart
@@ -70,11 +70,11 @@ class _PaymentSheetScreenState extends State<PaymentSheetScreenWithCustomFlow> {
           customerEphemeralKeySecret: data['ephemeralKey'],
           customerId: data['customer'],
           // Extra options
-          testEnv: true,
-          applePay: true,
-          googlePay: true,
+          applePay: PaymentSheetApplePay(
+            merchantCountryCode: 'DE',
+          ),
+          googlePay: PaymentSheetGooglePay(merchantCountryCode: 'DE'),
           style: ThemeMode.dark,
-          merchantCountryCode: 'DE',
         ),
       );
       setState(() {

diff --git a/example/lib/screens/wallets/apple_pay_screen.dart b/example/lib/screens/wallets/apple_pay_screen.dart
@@ -52,7 +52,7 @@ class _ApplePayScreenState extends State<ApplePayScreen> {
       await Stripe.instance.presentApplePay(
         ApplePayPresentParams(
           cartItems: [
-            ApplePayCartSummaryItem(
+            ApplePayCartSummaryItem.immediate(
               label: 'Product Test',
               amount: '0.01',
             ),

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -10,8 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_stripe: ^3.2.0
-  flutter_stripe_web: ^1.1.0
+  flutter_stripe: ^4.0.0
+  flutter_stripe_web: ^1.2.0
   stripe_checkout: ^1.0.0
   pay: ^1.0.10
   http: ^0.13.1