fix: dart format

Author: ahmedAlaaInstabug

.circleci/config.yml

@@ -28,54 +28,11 @@ commands:
           name: Install Pods
           working_directory: example/ios
           command: pod install --repo-update
-  setup_captain:
-    parameters:
-      platform:
-        type: enum
-        enum:
-          - ios
-          - android
+  setup_patrol:
     steps:
       - run:
-          name: Install Appium
-          command: npm install -g appium
-      - when:
-          condition:
-            equal:
-              - <<parameters.platform>>
-              - ios
-          steps:
-            - run:
-                name: Install XCUITest Driver
-                command: appium driver install xcuitest@4.35.0
-      - when:
-          condition:
-            equal:
-              - <<parameters.platform>>
-              - android
-          steps:
-            - run:
-                name: Install UIAutomator2 Driver
-                command: appium driver install uiautomator2@3.1.0
-      - run:
-          name: Launch Appium
-          # Enable --relaxed-security for `mobile: shell` command that Captain uses internally.
-          command: appium --relaxed-security
-          background: true
-      - run:
-          name: Install .NET 6
-          command: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0.1xx
-      - run:
-          name: Add .NET to PATH
-          command: |
-            echo 'export DOTNET_ROOT=$HOME/.dotnet' >> $BASH_ENV
-            echo 'export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools' >> $BASH_ENV
-      - run:
-          name: Clone Captain
-          command: git clone git@github.com:Instabug/Captain.git ../Instabug.Captain
-      - run:
-          name: Configure Captain Platform
-          command: echo 'export CAPTAIN_PLATFORM=<<parameters.platform>>' >> $BASH_ENV
+          name: Install patrol
+          command: dart pub global activate patrol_cli 3.5.0
   # This runs `flutter pub get` and `dart pub get` if we pass parameter `generate_pigeons` to the job it also runs the following:
   #   - `sh ./scripts/pigeon.sh`
   #   - `dart run build_runner build --delete-conflicting-outputs`
@@ -150,22 +107,20 @@ jobs:
           working-directory: example/android
           test-command: ./gradlew test
 
-  e2e_android_captain:
+  e2e_android_patrol:
     executor:
       name: android/android-machine
       resource-class: xlarge
       tag: 2024.01.1
     steps:
       - advanced-checkout/shallow-checkout
-      - setup_captain:
-          platform: android
       - setup_flutter
+      - setup_patrol
       - android/start-emulator-and-run-tests:
-          run-tests-working-directory: e2e
           additional-avd-args: --device 3
           system-image: system-images;android-33;default;x86_64
-          post-emulator-launch-assemble-command: cd example && flutter build apk --debug
-          test-command: dotnet test
+          post-emulator-launch-assemble-command: cd example
+          test-command: patrol test -t integration_test/ --verbose
 
   test_ios:
     macos:
@@ -188,25 +143,19 @@ jobs:
                 -destination 'platform=iOS Simulator,name=iPhone 15 Pro Max,OS=17.2' \
                 test | xcpretty
 
-  e2e_ios_captain:
+  e2e_ios_patrol:
     macos:
       xcode: 15.2.0
     resource_class: macos.m1.medium.gen1
     steps:
       - advanced-checkout/shallow-checkout
-      - setup_captain:
-          platform: ios
       - setup_ios
-      - run:
-          name: Build Example App
-          working_directory: example
-          command: flutter build ios --simulator
+      - setup_patrol
       - run:
           name: Run E2E Tests
           no_output_timeout: 30m
-          working_directory: e2e
-          command: dotnet test
-
+          working_directory: example
+          command: patrol test -t integration_test/ --verbose
   format_flutter:
     docker:
       - image: cirrusci/flutter
@@ -292,9 +241,9 @@ workflows:
       - test_flutter:
           name: test_flutter-2.10.5
           version: 2.10.5
-      - e2e_android_captain
+      - e2e_android_patrol
       - test_ios
-      - e2e_ios_captain
+      - e2e_ios_patrol
       - format_flutter
       - lint_flutter:
           requires:
@@ -312,9 +261,9 @@ workflows:
             # TODO: Fix the flaky tests and add the following jobs to the dependencies for the release
             # The following jobs have been removed while releasing v13.2.0 to avoid delaying the release
             # as they were just flaky and the tests pass locally without issues.
-            # - e2e_android_captain
+            # - e2e_android_patrol
             # - test_ios
-            - e2e_ios_captain
+            - e2e_ios_patrol
             - verify_pub
           filters:
             branches:

analysis_options.yaml

@@ -2,7 +2,7 @@ include: package:lint/analysis_options_package.yaml
 
 analyzer:
   exclude:
-#    - "example/**"
+    - "example/**"
     - "**/*.g.dart"
 
 linter:

example/integration_test/bug_reporting_test.dart

@@ -10,7 +10,7 @@ Future<void> assertOptionsPromptIsDisplayed(PatrolIntegrationTester $) async {
           identifier: 'IBGReportBugPromptOptionAccessibilityIdentifier'),
       android: AndroidSelector(
           resourceName:
-          'com.instabug.flutter.example:id/instabug_main_prompt_container')));
+              'com.instabug.flutter.example:id/instabug_main_prompt_container')));
 
   expect(
       isAndroid
@@ -91,18 +91,20 @@ void main() {
 
         await $("Two Fingers Swipe Left").scrollTo().tap();
         await wait(second: 1);
-        final gesture1 = await $.tester.startGesture(const Offset(300, 400)); // finger 1
-        final gesture2 = await $.tester.startGesture(const Offset(300, 600)); // finger 2
+        final gesture1 =
+            await $.tester.startGesture(const Offset(300, 400)); // finger 1
+        final gesture2 =
+            await $.tester.startGesture(const Offset(300, 600)); // finger 2
 
 // Swipe both fingers to the left (same direction)
-         await gesture1.moveBy(const Offset(-150, 0));
-        await   gesture2.moveBy(const Offset(-150, 0));
+        await gesture1.moveBy(const Offset(-150, 0));
+        await gesture2.moveBy(const Offset(-150, 0));
 
 // End gestures
         await gesture1.up();
         await gesture2.up();
 
-        await  wait(second: 1);
+        await wait(second: 1);
         assertOptionsPromptIsDisplayed($);
       },
       framePolicy: LiveTestWidgetsFlutterBindingFramePolicy.fullyLive,
@@ -114,10 +116,11 @@ void main() {
 
       await wait(second: 1);
       final floatingButton = await $.native2.getNativeViews(NativeSelector(
-        ios: IOSSelector(identifier: 'IBGFloatingButtonAccessibilityIdentifier'),
+        ios:
+            IOSSelector(identifier: 'IBGFloatingButtonAccessibilityIdentifier'),
         android: AndroidSelector(
             resourceName:
-            'com.instabug.flutter.example:id/instabug_floating_button'),
+                'com.instabug.flutter.example:id/instabug_floating_button'),
       ));
 
       expect(
@@ -151,7 +154,7 @@ void main() {
             identifier: 'IBGBugVCReproStepsDisclaimerAccessibilityIdentifier'),
         android: AndroidSelector(
             resourceName:
-            'com.instabug.flutter.example:id/instabug_text_view_repro_steps_disclaimer'),
+                'com.instabug.flutter.example:id/instabug_text_view_repro_steps_disclaimer'),
       ));
 
       await wait(miliSeconds: 1000);
@@ -161,10 +164,10 @@ void main() {
             identifier: 'IBGReproStepsTableCellViewAccessibilityIdentifier'),
         android: AndroidSelector(
             resourceName:
-            'com.instabug.flutter.example:id/ib_bug_repro_step_screenshot'),
+                'com.instabug.flutter.example:id/ib_bug_repro_step_screenshot'),
       ));
 
-      final count =isAndroid
+      final count = isAndroid
           ? screenshots.androidViews.length
           : screenshots.iosViews.length;
 
@@ -176,51 +179,39 @@ void main() {
 
       await $('Move Floating Button to Left').scrollTo().tap();
 
-
       await wait(second: 5);
 
       final floatingButton = await $.native2.getNativeViews(NativeSelector(
-        ios: IOSSelector(
-            identifier: 'IBGFloatingButtonAccessibilityIdentifier'),
+        ios:
+            IOSSelector(identifier: 'IBGFloatingButtonAccessibilityIdentifier'),
         android: AndroidSelector(
             resourceName:
-            'com.instabug.flutter.example:id/instabug_floating_button'),
+                'com.instabug.flutter.example:id/instabug_floating_button'),
       ));
 
-
       await wait(second: 2);
 
       final size = $.tester.view.physicalSize / $.tester.view.devicePixelRatio;
       final width = size.width;
       $.log(floatingButton.androidViews.length.toString());
 
-      $.log(floatingButton.androidViews.first.visibleBounds.minX.toString());
-      $.log(floatingButton.androidViews.first.visibleBounds.maxX.toString());
-      $.log((width / 2).toString());
-
-
       bool isLeft = false;
-      if (isAndroid &&
-          floatingButton.androidViews.isNotEmpty) {
-
-
+      if (isAndroid && floatingButton.androidViews.isNotEmpty) {
         $.log(floatingButton.androidViews.first.visibleBounds.minX.toString());
         $.log(floatingButton.androidViews.first.visibleBounds.maxX.toString());
         $.log((width / 2).toString());
 
-        isLeft = floatingButton.androidViews.first.visibleBounds.minX <
-            (width / 2);
-      } else if ((!isAndroid) &&
-          floatingButton.iosViews.isNotEmpty) {
-        isLeft = floatingButton.iosViews.first.frame.minX <
-            (width / 2);
+        isLeft =
+            floatingButton.androidViews.first.visibleBounds.minX < (width / 2);
+      } else if ((!isAndroid) && floatingButton.iosViews.isNotEmpty) {
+        isLeft = floatingButton.iosViews.first.frame.minX < (width / 2);
       }
 
       expect(isLeft, true);
     });
 
-    patrolTest(
-        'onDismiss callback triggers when prompt is cancelled', ($) async {
+    patrolTest('onDismiss callback triggers when prompt is cancelled',
+        ($) async {
       await init($);
 
       await $('Set On Dismiss Callback').scrollTo().tap();
@@ -236,10 +227,9 @@ void main() {
 
       await wait(second: 4);
 
-      final callbackWidget = $('onDismiss callback called with DismissType.cancel and ReportType.other');
+      final callbackWidget = $(
+          'onDismiss callback called with DismissType.cancel and ReportType.other');
       expect(callbackWidget, findsOneWidget);
     });
-
   });
-
-}
+}

example/integration_test/example_test.dart

@@ -8,20 +8,18 @@ void main() {
     patrolTest(
       'Show Feature Requests Screen',
       ($) async {
-       await init($);
+        await init($);
 
-        await  $('Show Feature Requests').scrollTo().tap();
+        await $('Show Feature Requests').scrollTo().tap();
 
-        final  title = await $.native2.getNativeViews(NativeSelector(
-            ios: IOSSelector(
-                identifier: 'IBGFeatureListTableView'),
+        final title = await $.native2.getNativeViews(NativeSelector(
+            ios: IOSSelector(identifier: 'IBGFeatureListTableView'),
             android: AndroidSelector(
                 resourceName:
                     'com.instabug.flutter.example:id/ib_fr_toolbar_main')));
 
-
-        expect(isAndroid?title.androidViews.length:title.iosViews.length, equals(1));
-
+        expect(isAndroid ? title.androidViews.length : title.iosViews.length,
+            equals(1));
       },
       framePolicy: LiveTestWidgetsFlutterBindingFramePolicy.fullyLive,
     );

example/integration_test/feature_requests_test.dart

@@ -9,11 +9,11 @@ void main() {
     patrolTest(
       'ChangePrimaryColor',
       ($) async {
-       await init($);
+        await init($);
 
         var color = "#FF0000";
-       await $(#enter_primary_color_input).scrollTo().enterText(color);
-        await  $('Change Primary Color').scrollTo().tap();
+        await $(#enter_primary_color_input).scrollTo().enterText(color);
+        await $('Change Primary Color').scrollTo().tap();
 
         await wait(second: 5);
         final floatingButton = await $.native2.getNativeViews(NativeSelector(

example/integration_test/instabug_test.dart

@@ -8,20 +8,18 @@ void main() {
     patrolTest(
       'Show Surveys Screen',
       ($) async {
-       await init($);
+        await init($);
 
-        await  $('Show Manual Survey').scrollTo().tap();
+        await $('Show Manual Survey').scrollTo().tap();
 
-        final  title = await $.native2.getNativeViews(NativeSelector(
-            ios: IOSSelector(
-                identifier: 'SurveyNavigationVC'),
+        final title = await $.native2.getNativeViews(NativeSelector(
+            ios: IOSSelector(identifier: 'SurveyNavigationVC'),
             android: AndroidSelector(
                 resourceName:
                     'com.instabug.flutter.example:id/instabug_survey_dialog_container')));
 
-
-        expect(isAndroid?title.androidViews.length:title.iosViews.length, equals(1));
-
+        expect(isAndroid ? title.androidViews.length : title.iosViews.length,
+            equals(1));
       },
       framePolicy: LiveTestWidgetsFlutterBindingFramePolicy.fullyLive,
     );

example/integration_test/surveys_test.dart

@@ -14,11 +14,13 @@ Future<void> init(PatrolIntegrationTester $) async {
 
   await $.pumpWidgetAndSettle(const MyApp());
   await $.native2.initialize();
-
 }
 
-Future<void> wait({int? second,int? miliSeconds}){
-  return Future.delayed(Duration(seconds: second??0,milliseconds: miliSeconds??0));
+Future<void> wait({int? second, int? miliSeconds}) {
+  return Future.delayed(
+      Duration(seconds: second ?? 0, milliseconds: miliSeconds ?? 0));
 }
 
-bool get  isAndroid { return defaultTargetPlatform == TargetPlatform.android;}
+bool get isAndroid {
+  return defaultTargetPlatform == TargetPlatform.android;
+}

example/integration_test/utils/utils.dart

@@ -30,7 +30,9 @@ target 'Runner' do
 
   use_frameworks!
   use_modular_headers!
-
+target 'RunnerUITests' do
+    inherit! :complete
+  end
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end