From f6c909d585396c6cbcd7c9c14dea0e3282ddf03b Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Fri, 15 Apr 2022 09:27:22 +0100
Subject: [PATCH] fix: merge conflicts

---
 test/game/components/alien_zone_test.dart         | 4 ++--
 test/game/components/controlled_flipper_test.dart | 4 ++--
 test/game/components/controlled_plunger_test.dart | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/game/components/alien_zone_test.dart b/test/game/components/alien_zone_test.dart
index 68a2c2f1..863bef31 100644
--- a/test/game/components/alien_zone_test.dart
+++ b/test/game/components/alien_zone_test.dart
@@ -13,7 +13,7 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(EmptyPinballGameTest.new);
+  final flameTester = FlameTester(EmptyPinballTestGame.new);
 
   group('AlienZone', () {
     flameTester.test(
@@ -52,7 +52,7 @@ void main() {
       });
 
       final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
-        gameBuilder: EmptyPinballGameTest.new,
+        gameBuilder: EmptyPinballTestGame.new,
         blocBuilder: () => gameBloc,
       );
 
diff --git a/test/game/components/controlled_flipper_test.dart b/test/game/components/controlled_flipper_test.dart
index e99b4a4d..9e58cc9d 100644
--- a/test/game/components/controlled_flipper_test.dart
+++ b/test/game/components/controlled_flipper_test.dart
@@ -13,8 +13,8 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
   final flameTester = FlameTester(EmptyPinballTestGame.new);
 
-  final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>(
-    gameBuilder: EmptyPinballGameTest.new,
+  final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
+    gameBuilder: EmptyPinballTestGame.new,
     blocBuilder: () {
       final bloc = MockGameBloc();
       const state = GameState(
diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart
index dddf407b..40f93256 100644
--- a/test/game/components/controlled_plunger_test.dart
+++ b/test/game/components/controlled_plunger_test.dart
@@ -12,10 +12,10 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(EmptyPinballGameTest.new);
+  final flameTester = FlameTester(EmptyPinballTestGame.new);
 
-  final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>(
-    gameBuilder: EmptyPinballGameTest.new,
+  final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
+    gameBuilder: EmptyPinballTestGame.new,
     blocBuilder: () {
       final bloc = MockGameBloc();
       const state = GameState(