From 0996616dfb1c3bc38c30f3bf98b711a0fa55ac32 Mon Sep 17 00:00:00 2001
From: Erick Zanardo <erickzanardoo@gmail.com>
Date: Fri, 6 May 2022 12:19:47 -0300
Subject: [PATCH] fix: conflicts

---
 .../backbox/displays/leaderboard_display.dart |  7 ++--
 .../game/components/backbox/backbox_test.dart |  4 +--
 .../displays/leaderboard_display_test.dart    | 35 ++++++++++++-------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/lib/game/components/backbox/displays/leaderboard_display.dart b/lib/game/components/backbox/displays/leaderboard_display.dart
index 5f79b77c..8f24fb7d 100644
--- a/lib/game/components/backbox/displays/leaderboard_display.dart
+++ b/lib/game/components/backbox/displays/leaderboard_display.dart
@@ -2,8 +2,10 @@ import 'package:flame/components.dart';
 import 'package:flutter/material.dart';
 import 'package:leaderboard_repository/leaderboard_repository.dart';
 import 'package:pinball/game/pinball_game.dart';
+import 'package:pinball/l10n/l10n.dart';
 import 'package:pinball/leaderboard/models/leader_board_entry.dart';
 import 'package:pinball_components/pinball_components.dart';
+import 'package:pinball_flame/pinball_flame.dart';
 import 'package:pinball_ui/pinball_ui.dart';
 
 final _titleTextPaint = TextPaint(
@@ -25,8 +27,7 @@ final _bodyTextPaint = TextPaint(
 /// {@template leaderboard_display}
 /// Component that builds the leaderboard list of the Backbox.
 /// {@endtemplate}
-class LeaderboardDisplay extends PositionComponent
-    with HasGameRef<PinballGame> {
+class LeaderboardDisplay extends PositionComponent with HasGameRef {
   /// {@macro leaderboard_display}
   LeaderboardDisplay({required List<LeaderboardEntryData> entries})
       : _entries = entries;
@@ -54,7 +55,7 @@ class LeaderboardDisplay extends PositionComponent
   Future<void> onLoad() async {
     position = Vector2(0, -30);
 
-    final l10n = gameRef.l10n;
+    final l10n = readProvider<AppLocalizations>();
     final ranking = _entries.take(5).toList();
     await add(
       PositionComponent(
diff --git a/test/game/components/backbox/backbox_test.dart b/test/game/components/backbox/backbox_test.dart
index b2604b5b..d61bd83a 100644
--- a/test/game/components/backbox/backbox_test.dart
+++ b/test/game/components/backbox/backbox_test.dart
@@ -128,7 +128,7 @@ void main() {
       'adds LeaderboardRequested when loaded',
       (game) async {
         final backbox = Backbox.test(bloc: bloc);
-        await game.ensureAdd(backbox);
+        await game.pump(backbox);
 
         verify(() => bloc.add(LeaderboardRequested())).called(1);
       },
@@ -257,7 +257,7 @@ void main() {
         );
 
         final backbox = Backbox.test(bloc: bloc);
-        await game.ensureAdd(backbox);
+        await game.pump(backbox);
 
         expect(
           game.descendants().whereType<LeaderboardDisplay>().length,
diff --git a/test/game/components/backbox/displays/leaderboard_display_test.dart b/test/game/components/backbox/displays/leaderboard_display_test.dart
index bd5f5219..263222fc 100644
--- a/test/game/components/backbox/displays/leaderboard_display_test.dart
+++ b/test/game/components/backbox/displays/leaderboard_display_test.dart
@@ -1,16 +1,16 @@
 // ignore_for_file: cascade_invocations
 
 import 'package:flame/components.dart';
+import 'package:flame_forge2d/forge2d_game.dart';
 import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:leaderboard_repository/leaderboard_repository.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:pinball/game/components/backbox/displays/leaderboard_display.dart';
 import 'package:pinball/l10n/l10n.dart';
+import 'package:pinball_flame/pinball_flame.dart';
 import 'package:pinball_theme/pinball_theme.dart';
 
-import '../../../../helpers/helpers.dart';
-
 class _MockAppLocalizations extends Mock implements AppLocalizations {
   @override
   String get rank => 'rank';
@@ -22,21 +22,32 @@ class _MockAppLocalizations extends Mock implements AppLocalizations {
   String get name => 'name';
 }
 
+class _TestGame extends Forge2DGame {
+  @override
+  Future<void> onLoad() async {
+    await super.onLoad();
+    images.prefix = '';
+    await images.load(const AndroidTheme().leaderboardIcon.keyName);
+  }
+
+  Future<void> pump(LeaderboardDisplay component) {
+    return ensureAdd(
+      FlameProvider.value(
+        _MockAppLocalizations(),
+        children: [component],
+      ),
+    );
+  }
+}
+
 void main() {
   group('LeaderboardDisplay', () {
     TestWidgetsFlutterBinding.ensureInitialized();
 
-    final flameTester = FlameTester(
-      () => EmptyPinballTestGame(
-        l10n: _MockAppLocalizations(),
-        assets: [
-          const AndroidTheme().leaderboardIcon.keyName,
-        ],
-      ),
-    );
+    final flameTester = FlameTester(_TestGame.new);
 
     flameTester.test('renders the titles', (game) async {
-      await game.ensureAdd(LeaderboardDisplay(entries: const []));
+      await game.pump(LeaderboardDisplay(entries: const []));
 
       final textComponents =
           game.descendants().whereType<TextComponent>().toList();
@@ -47,7 +58,7 @@ void main() {
     });
 
     flameTester.test('renders the entries', (game) async {
-      await game.ensureAdd(
+      await game.pump(
         LeaderboardDisplay(
           entries: const [
             LeaderboardEntryData(