Merge branch 'master' into feature/run_process

.github/workflows/patrol-prepare.yaml

@@ -20,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - version: 3.0.0
           - channel: stable
-          - channel: beta
+          #- version: 3.0.0
+          #- channel: beta
 
     defaults:
       run:
@@ -42,7 +42,7 @@ jobs:
         run: flutter pub get
 
       - name: flutter test
-        run: flutter test
+        run: flutter test --coverage
 
       - name: flutter analyze
         run: flutter analyze
@@ -65,3 +65,8 @@ jobs:
       - name: flutter test (example app)
         working-directory: ./packages/patrol/example
         run: flutter test
+
+      - name: Upload code coverage
+        uses: codecov/codecov-action@v3
+        with:
+          flags: patrol

.github/workflows/patrol_cli-prepare.yaml

@@ -38,20 +38,13 @@ jobs:
           channel: ${{ matrix.channel }}
           flutter-version: ${{ matrix.version }}
 
-      # - name: Install Java
-      #   uses: actions/setup-java@v3
-      #   with:
-      #     distribution: "temurin"
-      #     java-version: "11"
-
-      # - name: Setup Android SDK
-      #   uses: android-actions/setup-android@v2
-
       - name: dart pub get
         run: dart pub get
 
       - name: dart test
-        run: dart test
+        run: |
+          dart test --coverage coverage
+          dart run coverage:format_coverage --lcov --in coverage --out coverage/lcov.info --report-on lib
 
       - name: dart analyze
         run: dart analyze
@@ -77,3 +70,8 @@ jobs:
           cd example
           patrol bootstrap --template counter
           flutter analyze
+
+      - name: Upload code coverage
+        uses: codecov/codecov-action@v3
+        with:
+          flags: patrol_cli

codecov.yaml

@@ -0,0 +1,28 @@
+coverage:
+  status:
+    project:
+      default:
+        target: auto
+      patrol:
+        target: auto
+        flags:
+          - patrol
+      patrol_cli:
+        target: auto
+        flags:
+          - patrol_cli
+
+comment:
+  layout: "header, flags, files, footer"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: yes
+
+flags:
+  patrol:
+    paths: ["packages/patrol"]
+    carryforward: true
+  patrol_cli:
+    paths: ["packages/patrol_cli"]
+    carryforward: true

packages/patrol/.gitignore

@@ -10,4 +10,4 @@ build/
 pubspec.lock
 
 .vscode
-coverage
+/coverage

packages/patrol/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.4
+
+- Fix minor bug with custom binding initialization (#636)
+
 ## 0.7.3
 
 - Add `patrolIntegrationDriver`, which extends the default `integrationDriver`

packages/patrol/lib/src/custom_finders/common.dart

@@ -61,12 +61,12 @@ void patrolTest(
   if (nativeAutomation) {
     if (binding is PatrolBinding) {
       hostAutomator = HostAutomator(binding: binding);
-    }
 
-    nativeAutomator = NativeAutomator(
-      packageName: config.packageName,
-      bundleId: config.bundleId,
-    );
+      nativeAutomator = NativeAutomator(
+        packageName: config.packageName,
+        bundleId: config.bundleId,
+      );
+    }
   }
 
   testWidgets(

packages/patrol/pubspec.yaml

@@ -2,7 +2,7 @@ name: patrol
 description: >
   Simple yet powerful Flutter-native UI testing framework eliminating
   limitations of flutter_test, integration_test, and flutter_driver.
-version: 0.7.3
+version: 0.7.4
 homepage: https://patrol.leancode.co
 repository: https://github.com/leancodepl/patrol
 issue_tracker: https://github.com/leancodepl/patrol/issues

packages/patrol_cli/.gitignore

@@ -6,3 +6,4 @@
 build/
 
 *.exe
+/coverage

packages/patrol_cli/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.7.11
+
+- Print status of test runs after `patrol drive` finishes (#624)
+
+## 0.7.10
+
+- Print error message when screenshot fails on host side (#625)
+- Perform internal refactoring to make testing the CLI easier (#626)
+
 ## 0.7.9
 
 - Fix running tests that failed to build (#615)

packages/patrol_cli/lib/src/command_runner.dart

@@ -28,7 +28,6 @@ import 'package:pub_updater/pub_updater.dart';
 
 Future<int> patrolCommandRunner(List<String> args) async {
   final logger = Logger();
-  await setUpLogger();
 
   final runner = PatrolCommandRunner(logger: logger);
   int exitCode;

packages/patrol_cli/lib/src/common/common.dart

@@ -1,3 +1,2 @@
 export 'constants.dart';
 export 'extensions/process.dart';
-export 'logging.dart';

packages/patrol_cli/lib/src/common/constants.dart

@@ -1,7 +1,7 @@
 import 'package:path/path.dart' as path;
 
 /// Version of Patrol CLI. Must be kept in sync with pubspec.yaml.
-const globalVersion = '0.7.9';
+const globalVersion = '0.7.11';
 
 const patrolPackage = 'patrol';
 const patrolCliPackage = 'patrol_cli';

packages/patrol_cli/lib/src/features/drive/drive_command.dart

@@ -1,3 +1,4 @@
+import 'package:ansi_styles/extension.dart';
 import 'package:dispose_scope/dispose_scope.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:mason_logger/mason_logger.dart';
@@ -32,6 +33,8 @@ class DriveCommandConfig with _$DriveCommandConfig {
   }) = _DriveCommandConfig;
 }
 
+const _defaultRepeats = 1;
+
 class DriveCommand extends StagedCommand<DriveCommandConfig> {
   DriveCommand({
     required DeviceFinder deviceFinder,
@@ -114,7 +117,7 @@ class DriveCommand extends StagedCommand<DriveCommandConfig> {
         'repeat',
         abbr: 'n',
         help: 'Repeat the test n times.',
-        defaultsTo: '1',
+        defaultsTo: '$_defaultRepeats',
       );
   }
 
@@ -175,9 +178,9 @@ class DriveCommand extends StagedCommand<DriveCommandConfig> {
       throw const FormatException('`wait` argument is not an int');
     }
 
-    var repeat = 1;
+    final int repeat;
     try {
-      final repeatStr = argResults?['repeat'] as String? ?? '1';
+      final repeatStr = argResults?['repeat'] as String? ?? '$_defaultRepeats';
       repeat = int.parse(repeatStr);
     } on FormatException {
       throw const FormatException('`repeat` argument is not an int');
@@ -222,15 +225,12 @@ class DriveCommand extends StagedCommand<DriveCommandConfig> {
       dartDefines: config.dartDefines,
     );
 
-    var exitCode = 0;
-
     _testRunner
       ..repeats = config.repeat
       ..builder = (target, device) async {
         try {
           await _flutterTool.build(target, device);
         } catch (err) {
-          exitCode = 1;
           _logger
             ..err('$err')
             ..err(
@@ -242,8 +242,7 @@ class DriveCommand extends StagedCommand<DriveCommandConfig> {
       ..executor = (target, device) async {
         try {
           await _flutterTool.drive(target, device);
-        } on FlutterDriverFailedException catch (err) {
-          exitCode = 1;
+        } catch (err) {
           _logger
             ..err('$err')
             ..err(
@@ -276,8 +275,29 @@ class DriveCommand extends StagedCommand<DriveCommandConfig> {
       }
     }
 
-    await _testRunner.run();
+    final results = await _testRunner.run();
+
+    for (final res in results.targetRunResults) {
+      if (res.allRunsPassed) {
+        _logger.write(
+          '${' PASS '.bgGreen.black.bold} ${res.targetName} on ${res.device.id}\n',
+        );
+      } else if (res.allRunsFailed) {
+        _logger.write(
+          '${' FAIL '.bgRed.white.bold} ${res.targetName} on ${res.device.id}\n',
+        );
+      } else if (res.canceled) {
+        _logger.write(
+          '${' CANC '.bgGray.white.bold} ${res.targetName} on ${res.device.id}\n',
+        );
+      } else {
+        _logger.write(
+          '${' FLAK '.bgYellow.black.bold} ${res.targetName} on ${res.device.id}\n',
+        );
+      }
+    }
 
+    final exitCode = results.allSuccessful ? 0 : 1;
     return exitCode;
   }
 }