Merge branch 'leancodepl:master' into master

.github/workflows/patrol_log-check-semver.yaml

@@ -26,7 +26,7 @@ jobs:
         - name: Get last released version
           id: get_last_released_version
           run: |
-            last_version=$(git tag --list 'patrol_log-v*' | grep -v '\-dev\.[0-9]\+$' | sort -V | tail -n 1 | sed 's/^patrol_finders-v//')
+            last_version=$(git tag --list 'patrol_log-v*' | grep -v '\-dev\.[0-9]\+$' | sort -V | tail -n 1 | sed 's/^patrol_log-v//')
             echo "last_version=$last_version" >> $GITHUB_ENV
             echo "::set-output name=last_version::$last_version"
 

docs/compatibility-table.mdx

@@ -13,7 +13,8 @@ the table below to assess which version you should use.
 
 |   patrol_cli   |     patrol     | Min Flutter Version |
 | -------------- | -------------- | ------------------- |
-| 3.3.0+         | 3.12.0+        | 3.24.0              |
+| 3.4.0+         | 3.13.0+        | 3.24.0              |
+| 3.3.0          | 3.12.0         | 3.24.0              |
 | 3.2.1          | 3.11.2         | 3.24.0              |
 | 3.2.0          | 3.11.0 - 3.11.1| 3.22.0              |
 | 3.1.0 - 3.1.1  | 3.10.0         | 3.22.0              |

packages/patrol/CHANGELOG.md

@@ -1,20 +1,11 @@
-## 3.13.0-dev.4
-
-- Bump `patrol_finders` and `patrol_log`
-
-## 3.13.0-dev.3
+## 3.13.0
 
+- Add support for the `patrol_log` package. (#2387)
+- Fix tapping on notification on iOS 18. (#2394)
 - Fix macos functionality. (#2408)
 - Bump `patrol_finders` and enable logging.
 
-## 3.13.0-dev.2
-
-- Bump `patrol_log` version.
-
-## 3.13.0-dev.1
-
-- Add support for the patrol_log package. (#2387)
-- Fix tapping on notification on iOS 18. (#2394)
+This version requires version 3.4.0 of `patrol_cli` package.
 
 ## 3.12.0
 

packages/patrol/lib/src/common.dart

@@ -97,7 +97,7 @@ void patrolTest(
   LiveTestWidgetsFlutterBindingFramePolicy framePolicy =
       LiveTestWidgetsFlutterBindingFramePolicy.fadePointers,
 }) {
-  final patrolLog = PatrolLogWriter();
+  final patrolLog = PatrolLogWriter(config: {'printLogs': config.printLogs});
   final automator = NativeAutomator(config: nativeAutomatorConfig);
   final automator2 = NativeAutomator2(config: nativeAutomatorConfig);
   final patrolBinding = PatrolBinding.ensureInitialized(nativeAutomatorConfig)

packages/patrol/pubspec.yaml

@@ -2,7 +2,7 @@ name: patrol
 description: >
   Powerful Flutter-native UI testing framework overcoming limitations of
   existing Flutter testing tools. Ready for action!
-version: 3.13.0-dev.4
+version: 3.13.0
 homepage: https://patrol.leancode.co
 repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol
 issue_tracker: https://github.com/leancodepl/patrol/issues
@@ -26,8 +26,8 @@ dependencies:
   http: '^1.1.0'
   json_annotation: ^4.8.1
   meta: ^1.10.0
-  patrol_finders: ^2.4.0
-  patrol_log: ^0.1.0
+  patrol_finders: ^2.4.1
+  patrol_log: ^0.2.0
   shelf: ^1.4.1
   test_api: '^0.7.0'
 

packages/patrol_cli/CHANGELOG.md

@@ -1,14 +1,8 @@
-## 3.4.0-dev.3
+## 3.4.0
 
-- Add flag `clear-test-steps`. (#2421)
+- Add support for the `patrol_log` package. (#2387)
 
-## 3.4.0-dev.2
-
-- Bump `patrol_log` version. (#2402)
-
-## 3.4.0-dev.1
-
-- Add support for the patrol_log package. (#2387)
+This version requires version 3.13.0 of `patrol` package.
 
 ## 3.3.0
 

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

@@ -1,3 +1,3 @@
 /// Version of Patrol CLI. Must be kept in sync with pubspec.yaml.
 /// If you update this, make sure that compatibility-table.mdx is updated (if needed)
-const version = '3.4.0-dev.3';
+const version = '3.4.0';

packages/patrol_cli/lib/src/compatibility_checker/compatibility_checker.dart

@@ -211,6 +211,10 @@ final _patrolVersionRange = [
   ),
   VersionRange(
     min: Version.parse('3.12.0'),
+    max: Version.parse('3.12.0'),
+  ),
+  VersionRange(
+    min: Version.parse('3.13.0'),
   ),
 ];
 
@@ -257,5 +261,9 @@ final _patrolCliVersionRange = [
   ),
   VersionRange(
     min: Version.parse('3.3.0'),
+    max: Version.parse('3.3.0'),
+  ),
+  VersionRange(
+    min: Version.parse('3.4.0'),
   ),
 ];

packages/patrol_cli/lib/src/pubspec_reader.dart

@@ -1,3 +1,6 @@
+// TODO: manage immutable classes
+// ignore_for_file: must_be_immutable
+
 import 'package:equatable/equatable.dart';
 import 'package:file/file.dart';
 import 'package:yaml/yaml.dart';

packages/patrol_cli/pubspec.yaml

@@ -1,7 +1,7 @@
 name: patrol_cli
 description: >
   Command-line tool for Patrol, a powerful Flutter-native UI testing framework.
-version: 3.4.0-dev.3  # Must be kept in sync with constants.dart
+version: 3.4.0  # Must be kept in sync with constants.dart
 homepage: https://patrol.leancode.co
 repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol_cli
 issue_tracker: https://github.com/leancodepl/patrol/issues?q=is%3Aopen+is%3Aissue+label%3A%22package%3A+patrol_cli%22
@@ -30,7 +30,7 @@ dependencies:
   mason_logger: ^0.2.10
   meta: ^1.10.0
   path: ^1.8.3
-  patrol_log: ^0.1.0
+  patrol_log: ^0.2.0
   platform: ^3.1.3
   process: ^5.0.1
   pub_updater: ^0.4.0

packages/patrol_finders/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.0
+
+- Update `patrol_log`.
+
 ## 2.4.0
 
 - Wrap actions on finders with patrol logs.

packages/patrol_finders/pubspec.yaml

@@ -1,6 +1,6 @@
 name: patrol_finders
 description: Streamlined, high-level API on top of flutter_test.
-version: 2.4.0
+version: 2.5.0
 homepage: https://patrol.leancode.co
 repository: https://github.com/leancodepl/patrol/tree/master/packages/patrol_finders
 issue_tracker: https://github.com/leancodepl/patrol/issues?q=is%3Aopen+is%3Aissue+label%3Apackage%3Apatrol_finders
@@ -20,7 +20,7 @@ dependencies:
   flutter_test:
     sdk: flutter
   meta: ^1.10.0
-  patrol_log: ^0.1.0
+  patrol_log: ^0.2.0
 
 dev_dependencies:
   leancode_lint: ^14.2.0

packages/patrol_log/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+- Fix report path when path contain spaces.
+- Fix path to the test file on the failed test list in summary.
+- Add `ConfigEntry`.
+
 ## 0.1.0
 
 - Add option to not clear test steps.

packages/patrol_log/lib/src/ansi_codes.dart

@@ -8,17 +8,15 @@ class AnsiCodes {
   /// `[1m` - Set text to bold.
   static const String bold = '$escape[1m';
 
-  /// `[30m` - Set text color to gray.
-  static const String gray = '$escape[30m';
+  static String color(String color) => '$escape[${color}m';
 
-  /// `[38;5;87m` - Set text color to light blue. Used for native actions.
-  static const String lightBlue = '$escape[38;5;87m';
-
-  static String custom(String color) => '$escape[${color}m';
-
-  static String get green => custom('32');
-  static String get yellow => custom('33');
-  static String get blue => custom('34');
-  static String get magenta => custom('35');
-  static String get cyan => custom('36');
+  static String gray = color('30');
+  static String red = color('31');
+  static String green = color('32');
+  static String yellow = color('33');
+  static String blue = color('34');
+  static String lightBlue = color('38;5;87');
+  static String magenta = color('35');
+  static String cyan = color('36');
+  static String orange = color('38;5;208');
 }

packages/patrol_log/lib/src/entries/config_entry.dart

@@ -0,0 +1,30 @@
+part of 'entry.dart';
+
+@JsonSerializable()
+class ConfigEntry extends Entry {
+  ConfigEntry({
+    required this.config,
+    DateTime? timestamp,
+  }) : super(
+          timestamp: timestamp ?? DateTime.now(),
+          type: EntryType.config,
+        );
+
+  @override
+  factory ConfigEntry.fromJson(Map<String, dynamic> json) =>
+      _$ConfigEntryFromJson(json);
+
+  final Map<String, dynamic> config;
+
+  @override
+  Map<String, dynamic> toJson() => _$ConfigEntryToJson(this);
+
+  @override
+  String pretty() => config.toString();
+
+  @override
+  String toString() => 'ConfigEntry(${toJson()})';
+
+  @override
+  List<Object?> get props => [config, timestamp, type];
+}

packages/patrol_log/lib/src/entries/entry.dart

@@ -7,6 +7,8 @@ part 'error_entry.dart';
 part 'log_entry.dart';
 part 'step_entry.dart';
 part 'test_entry.dart';
+part 'warning_entry.dart';
+part 'config_entry.dart';
 
 part 'entry.g.dart';
 
@@ -39,14 +41,18 @@ enum EntryType {
   error,
   step,
   test,
-  log;
+  log,
+  warning,
+  config;
 
   static EntryType byName(String name) {
     return switch (name) {
       'error' => EntryType.error,
       'step' => EntryType.step,
       'test' => EntryType.test,
       'log' => EntryType.log,
+      'warning' => EntryType.warning,
+      'config' => EntryType.config,
       _ => throw ArgumentError('Unknown EntryType: $name')
     };
   }

packages/patrol_log/lib/src/entries/error_entry.dart

@@ -21,7 +21,7 @@ class ErrorEntry extends Entry {
 
   @override
   String pretty() {
-    return message;
+    return '${AnsiCodes.red}$message${AnsiCodes.reset}';
   }
 
   @override

packages/patrol_log/lib/src/entries/warning_entry.dart

@@ -0,0 +1,32 @@
+part of 'entry.dart';
+
+@JsonSerializable()
+class WarningEntry extends Entry {
+  WarningEntry({
+    required this.message,
+    DateTime? timestamp,
+  }) : super(
+          timestamp: timestamp ?? DateTime.now(),
+          type: EntryType.warning,
+        );
+
+  @override
+  factory WarningEntry.fromJson(Map<String, dynamic> json) =>
+      _$WarningEntryFromJson(json);
+
+  final String message;
+
+  @override
+  Map<String, dynamic> toJson() => _$WarningEntryToJson(this);
+
+  @override
+  String pretty() {
+    return '${AnsiCodes.yellow}$message${AnsiCodes.reset}';
+  }
+
+  @override
+  String toString() => 'WarningEntry(${toJson()})';
+
+  @override
+  List<Object?> get props => [message, timestamp, type];
+}