From 00408fc5118dee3b1e5cbf69890a8c3a1b80891a Mon Sep 17 00:00:00 2001
From: jantunesmessias <jantunesmessias@gmail.com>
Date: Thu, 30 Jan 2025 08:37:16 -0300
Subject: [PATCH] fir conflicts

---
 integration_test/app_test.dart    | 6 +++---
 integration_test/common.dart      | 2 +-
 integration_test/locals_test.dart | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
index 80e69132..4e83ab87 100644
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@@ -25,15 +25,15 @@ import 'package:hub/flutter_flow/index.dart';
 import 'package:hub/initialization.dart';
 import 'package:hub/main.dart';
 import 'package:hub/pages/forgot_password_page/forgot_password_screen.dart';
-import 'package:integration_test/integration_test.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:patrol/patrol.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
-import 'package:patrol_finders/patrol_finders.dart';
+import 'package:patrol/patrol.dart';
 
 import 'app_test.dart';
 import 'fuzzer/fuzzer.dart';
 
+import 'package:patrol_finders/patrol_finders.dart';
+import 'package:integration_test/integration_test.dart';
 export 'package:flutter_test/flutter_test.dart';
 export 'package:patrol/patrol.dart';
 
diff --git a/integration_test/common.dart b/integration_test/common.dart
index 2bf4e9b7..958a328e 100644
--- a/integration_test/common.dart
+++ b/integration_test/common.dart
@@ -12,7 +12,7 @@ final _nativeAutomatorConfig = NativeAutomatorConfig(
 
 void patrol(
   String description,
-  Future<void> Function(PatrolTester) callback, {
+  Future<void> Function(PatrolIntegrationTester) callback, {
   bool? skip,
   List<String> tags = const [],
   NativeAutomatorConfig? nativeAutomatorConfig,
diff --git a/integration_test/locals_test.dart b/integration_test/locals_test.dart
index e9278c7d..4faba845 100644
--- a/integration_test/locals_test.dart
+++ b/integration_test/locals_test.dart
@@ -308,7 +308,7 @@ class LocalsTest {
         $ = tester;
         $.tester.printToConsole('Locals Test - Vincular um local desvinculado');
 
-        await _loggedWithMultiLocalsAccount($, false);
+        await _loggedWithMultiLocalsAccount(false);
         await $.pumpWidget(const App());
 
         final PatrolFinder bottomSheetFinder =
@@ -337,7 +337,7 @@ class LocalsTest {
         $ = tester;
         $.tester.printToConsole('Locals Test - Vincular um local desvinculado');
 
-        await _loggedWithSomeoneLocalAccount($, false);
+        await _loggedWithSomeoneLocalAccount(false);
         await $.pumpWidget(const App());
 
         final PatrolFinder bottomSheetFinder =