fix: merge conflicts

pull/178/head
alestiago 3 years ago
parent d2206f4d11
commit f6c909d585

@ -13,7 +13,7 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final flameTester = FlameTester(EmptyPinballGameTest.new); final flameTester = FlameTester(EmptyPinballTestGame.new);
group('AlienZone', () { group('AlienZone', () {
flameTester.test( flameTester.test(
@ -52,7 +52,7 @@ void main() {
}); });
final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>( final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
gameBuilder: EmptyPinballGameTest.new, gameBuilder: EmptyPinballTestGame.new,
blocBuilder: () => gameBloc, blocBuilder: () => gameBloc,
); );

@ -13,8 +13,8 @@ void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final flameTester = FlameTester(EmptyPinballTestGame.new); final flameTester = FlameTester(EmptyPinballTestGame.new);
final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>( final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
gameBuilder: EmptyPinballGameTest.new, gameBuilder: EmptyPinballTestGame.new,
blocBuilder: () { blocBuilder: () {
final bloc = MockGameBloc(); final bloc = MockGameBloc();
const state = GameState( const state = GameState(

@ -12,10 +12,10 @@ import '../../helpers/helpers.dart';
void main() { void main() {
TestWidgetsFlutterBinding.ensureInitialized(); TestWidgetsFlutterBinding.ensureInitialized();
final flameTester = FlameTester(EmptyPinballGameTest.new); final flameTester = FlameTester(EmptyPinballTestGame.new);
final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>( final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
gameBuilder: EmptyPinballGameTest.new, gameBuilder: EmptyPinballTestGame.new,
blocBuilder: () { blocBuilder: () {
final bloc = MockGameBloc(); final bloc = MockGameBloc();
const state = GameState( const state = GameState(

Loading…
Cancel
Save