Merge pull request #124 from eBay/feature/fix-material-issue

Feature/fix material issue

packages/.gitignore

@@ -9,3 +9,5 @@ build/
 ios/.generated/
 ios/Flutter/Generated.xcconfig
 ios/Runner/GeneratedPluginRegistrant.*
+
+**lcov.info

packages/golden_toolkit/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.0
+
+- migrate from pedantic -> flutter_lints
+- resolved warning that could appear for consumers ```package:golden_toolkit has `uses-material-design: true` set but the primary pubspec contains `uses-material-design: false`. If the application needs material icons, then `uses-material-design`  must be set to true```
+- updated documentation to indicate that you no longer need to include an empty images folder to get fonts to render in goldens for packages that do not contain any images.
+
 ## 0.10.0
 
 This release has a few updates & changes.

packages/golden_toolkit/README.md

@@ -295,14 +295,6 @@ At the moment, it is only possible to load a single .ttf file for a font family.
 
 Additionally, in some instances, it is not possible to replace the "Ahem" font. There are specific places in the Flutter codebase, such as rendering the "debug banner" where no explicit font family is specified. In these instances, the engine will use Ahem in a test context, with no way to override the behavior.
 
-Also note that at the moment for having the required files generated for font processing the pubspec.yaml should have an entry in the images section, make sure it has at least this:
-
-```yaml
-flutter:
-  assets:
-    - images/
-```
-
 ### testGoldens()
 
 It is possible to use golden assertions in any testWidgets() test. As the UI for a widget evolves, it is common to need to regenerate goldens to capture your new reference images. The easiest way to do this is via the command-line:

packages/golden_toolkit/example/lib/src/flutter_demo_page.dart

@@ -45,6 +45,7 @@ class _MyHomePageState extends State<_MyHomePage> {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
+            const Icon(Icons.flutter_dash),
             const Text(
               'You have pushed the button this many times:',
             ),

packages/golden_toolkit/example/pubspec.lock

@@ -73,7 +73,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.10.0"
+    version: "0.11.0"
   lints:
     dependency: transitive
     description:

packages/golden_toolkit/pubspec.yaml

@@ -1,6 +1,6 @@
 name: golden_toolkit
 description: Common patterns for screenshot-based widget testing using Goldens.
-version: 0.10.0
+version: 0.11.0
 homepage: https://github.com/eBay/flutter_glove_box/
 repository: https://github.com/eBay/flutter_glove_box/tree/master/packages/golden_toolkit
 issue_tracker: https://github.com/eBay/flutter_glove_box/issues
@@ -22,10 +22,6 @@ dev_dependencies:
   test_api: ^0.4.2
 
 flutter:
-  uses-material-design: true
-  assets:
-    # needed to trigger the FontManifest.json to be included
-    - images/
   fonts:
     - family: Roboto
       fonts:

packages/golden_toolkit/test/font_loading_test.dart

@@ -18,8 +18,6 @@ Future<void> main() async {
       final golden = GoldenBuilder.column()
         ..addScenario('Material Fonts should work',
             const Text('This is material text in "Roboto"'))
-        ..addScenario(
-            'Material Icons should work', const Icon(Icons.phone_in_talk))
         ..addScenario(
             'Fonts from packages should work',
             const Text('This is a custom font',

packages/golden_toolkit/test/material_app_wrapper_test.dart

@@ -22,28 +22,40 @@ void main() {
     });
 
     group('allow specification of TargetPlatform', () {
-      testGoldens('Android asset should display correctly', (tester) async {
+      testWidgets('Android asset should display correctly', (tester) async {
         await tester.pumpWidgetBuilder(
-          Row(children: const [BackButtonIcon(), Text('Android')]),
+          Builder(
+            builder: (context) => Text(
+              Theme.of(context).platform == TargetPlatform.iOS
+                  ? 'iOS'
+                  : 'Android',
+            ),
+          ),
           wrapper: materialAppWrapper(
             platform: TargetPlatform.android,
             theme: ThemeData.light(),
           ),
           surfaceSize: const Size(80, 40),
         );
-        await screenMatchesGolden(tester, 'back_button_android');
+        expect(find.text('Android'), findsOneWidget);
       });
 
-      testGoldens('iOS should display correctly', (tester) async {
+      testWidgets('iOS should display correctly', (tester) async {
         await tester.pumpWidgetBuilder(
-          Row(children: const [BackButtonIcon(), Text('iOS')]),
+          Builder(
+            builder: (context) => Text(
+              Theme.of(context).platform == TargetPlatform.iOS
+                  ? 'iOS'
+                  : 'Android',
+            ),
+          ),
           surfaceSize: const Size(80, 40),
           wrapper: materialAppWrapper(
             platform: TargetPlatform.iOS,
             theme: ThemeData.light(),
           ),
         );
-        await screenMatchesGolden(tester, 'back_button_ios');
+        expect(find.text('iOS'), findsOneWidget);
       });
     });
   });