Merge branch 'main' into feat/game-boundaries

lib/game/components/components.dart

@@ -1,11 +1,9 @@
 export 'board.dart';
 export 'bonus_word.dart';
-export 'chrome_dino.dart';
 export 'controlled_ball.dart';
 export 'controlled_flipper.dart';
 export 'flutter_forest.dart';
 export 'jetpack_ramp.dart';
-export 'kicker.dart';
 export 'launcher_ramp.dart';
 export 'plunger.dart';
 export 'score_points.dart';

packages/pinball_components/lib/src/components/chrome_dino.dart

@@ -43,7 +43,7 @@ class ChromeDino extends BodyComponent with InitialPosition {
     await add(
       TimerComponent(
         period: 1,
-        onTick: joint.swivel,
+        onTick: joint._swivel,
         repeat: true,
       ),
     );
@@ -150,7 +150,7 @@ class _ChromeDinoJoint extends RevoluteJoint {
   _ChromeDinoJoint(_ChromeDinoAnchorRevoluteJointDef def) : super(def);
 
   /// Sweeps the [ChromeDino] up and down repeatedly.
-  void swivel() {
+  void _swivel() {
     setMotorSpeed(-motorSpeed);
   }
 }

packages/pinball_components/lib/src/components/components.dart

@@ -3,6 +3,7 @@ export 'baseboard.dart';
 export 'board_dimensions.dart';
 export 'board_side.dart';
 export 'boundaries.dart';
+export 'chrome_dino.dart';
 export 'dash_nest_bumper.dart';
 export 'dino_walls.dart';
 export 'fire_effect.dart';
@@ -10,6 +11,7 @@ export 'flipper.dart';
 export 'flutter_sign_post.dart';
 export 'initial_position.dart';
 export 'joint_anchor.dart';
+export 'kicker.dart';
 export 'layer.dart';
 export 'ramp_opening.dart';
 export 'shapes/shapes.dart';

packages/pinball_components/test/src/components/chrome_dino_test.dart

@@ -0,0 +1,38 @@
+// ignore_for_file: cascade_invocations
+
+import 'package:flame_forge2d/flame_forge2d.dart';
+import 'package:flame_test/flame_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:pinball_components/pinball_components.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+  final flameTester = FlameTester(Forge2DGame.new);
+
+  group('ChromeDino', () {
+    flameTester.test(
+      'loads correctly',
+      (game) async {
+        final chromeDino = ChromeDino();
+        await game.ensureAdd(chromeDino);
+
+        expect(game.contains(chromeDino), isTrue);
+      },
+    );
+
+    flameTester.test(
+      'swivels',
+      (game) async {
+        // TODO(alestiago): Write golden tests to check the
+        // swivel animation.
+        final chromeDino = ChromeDino();
+        await game.ensureAdd(chromeDino);
+
+        final previousPosition = chromeDino.body.position.clone();
+        game.update(64);
+
+        expect(chromeDino.body.position, isNot(equals(previousPosition)));
+      },
+    );
+  });
+}

packages/pinball_components/test/src/components/kicker_test.dart

@@ -3,7 +3,6 @@
 import 'package:flame_forge2d/flame_forge2d.dart';
 import 'package:flame_test/flame_test.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball/game/game.dart';
 import 'package:pinball_components/pinball_components.dart';
 
 void main() {

test/game/components/chrome_dino_test.dart

@@ -1,23 +0,0 @@
-import 'package:flame_forge2d/flame_forge2d.dart';
-import 'package:flame_test/flame_test.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:pinball/game/game.dart';
-
-void main() {
-  TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(Forge2DGame.new);
-
-  group('ChromeDino', () {
-    flameTester.test(
-      'loads correctly',
-      (game) async {
-        final chromeDino = ChromeDino();
-
-        await game.ready();
-        await game.ensureAdd(chromeDino);
-
-        expect(game.contains(chromeDino), isTrue);
-      },
-    );
-  });
-}