From ef08427fe28d9f7b41bd5102b5b060f5c67ed2de Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 10:54:00 -0700
Subject: [PATCH 1/6] add option for bulk-updating screenshots; update
 screenshots

---
 lib/web_ui/dev/felt.dart                      |   2 +-
 lib/web_ui/dev/goldens_lock.yaml              |   3 +-
 lib/web_ui/dev/test_platform.dart             |  31 +++++++++++++-----
 lib/web_ui/dev/test_runner.dart               |  21 ++++++++++--
 lib/web_ui/test/golden_files/smoke_test.png   | Bin 2413 -> 2159 bytes
 .../golden_success_smoke_test.dart            |   1 +
 6 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/lib/web_ui/dev/felt.dart b/lib/web_ui/dev/felt.dart
index ca9eafbb3d0a5..b1754c1e11562 100644
--- a/lib/web_ui/dev/felt.dart
+++ b/lib/web_ui/dev/felt.dart
@@ -15,7 +15,7 @@ CommandRunner runner = CommandRunner<bool>(
   'Command-line utility for building and testing Flutter web engine.',
 )
   ..addCommand(LicensesCommand())
-  ..addCommand(TestsCommand())
+  ..addCommand(TestCommand())
   ..addCommand(BuildCommand());
 
 void main(List<String> args) async {
diff --git a/lib/web_ui/dev/goldens_lock.yaml b/lib/web_ui/dev/goldens_lock.yaml
index 1b72c1367e6bf..77186e753d3b3 100644
--- a/lib/web_ui/dev/goldens_lock.yaml
+++ b/lib/web_ui/dev/goldens_lock.yaml
@@ -1,2 +1,3 @@
 repository: https://github.com/flutter/goldens.git
-revision: dd993a32c23c5c542f083134467e7cda09cac975
+# TODO: DO NOT SUBMIT - this SHA is from a pending PR
+revision: 1fda4f5305bbbd787c0b2a3e0f04b6aa358e64ce
diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart
index ab2c08c675d92..5c475dcab3705 100644
--- a/lib/web_ui/dev/test_platform.dart
+++ b/lib/web_ui/dev/test_platform.dart
@@ -55,14 +55,16 @@ class BrowserPlatform extends PlatformPlugin {
   ///
   /// [root] is the root directory that the server should serve. It defaults to
   /// the working directory.
-  static Future<BrowserPlatform> start({String root}) async {
+  static Future<BrowserPlatform> start({String root, bool isUpdateScreenshotGoldens: false}) async {
     var server = shelf_io.IOServer(await HttpMultiServer.loopback(0));
     return BrowserPlatform._(
-        server,
-        Configuration.current,
-        p.fromUri(await Isolate.resolvePackageUri(
-            Uri.parse('package:test/src/runner/browser/static/favicon.ico'))),
-        root: root);
+      server,
+      Configuration.current,
+      p.fromUri(await Isolate.resolvePackageUri(
+          Uri.parse('package:test/src/runner/browser/static/favicon.ico'))),
+      root: root,
+      isUpdateScreenshotGoldens: isUpdateScreenshotGoldens,
+    );
   }
 
   /// The test runner configuration.
@@ -99,8 +101,11 @@ class BrowserPlatform extends PlatformPlugin {
   /// Whether [close] has been called.
   bool get _closed => _closeMemo.hasRun;
 
+  /// Whether to update screenshot golden files.
+  final bool isUpdateScreenshotGoldens;
+
   BrowserPlatform._(this._server, Configuration config, String faviconPath,
-      {String root})
+      {String root, this.isUpdateScreenshotGoldens})
       : _config = config,
         _root = root == null ? p.current : root,
         _http = config.pubServeUrl == null ? null : HttpClient() {
@@ -147,6 +152,10 @@ class BrowserPlatform extends PlatformPlugin {
   }
 
   Future<String> _diffScreenshot(String filename, bool write, [ Map<String, dynamic> region ]) async {
+    if (isUpdateScreenshotGoldens) {
+      write = true;
+    }
+
     String goldensDirectory;
     if (filename.startsWith('__local__')) {
       filename = filename.substring('__local__/'.length);
@@ -213,8 +222,14 @@ To automatically create this file call matchGoldenFile('$filename', write: true)
 
     if (write) {
       // Don't even bother with the comparison, just write and return
+      print('Updating screenshot golden: $file');
       file.writeAsBytesSync(encodePng(screenshot), flush: true);
-      return 'Golden file $filename was updated. You can remove "write: true" in the call to matchGoldenFile.';
+      if (isUpdateScreenshotGoldens) {
+        // Do not fail tests when bulk-updating screenshot goldens.
+        return 'OK';
+      } else {
+        return 'Golden file $filename was updated. You can remove "write: true" in the call to matchGoldenFile.';
+      }
     }
 
     ImageDiff diff = ImageDiff(golden: decodeNamedImage(file.readAsBytesSync(), filename), other: screenshot);
diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index 1dc88669b7458..1110787a668e2 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -19,8 +19,8 @@ import 'test_platform.dart';
 import 'environment.dart';
 import 'utils.dart';
 
-class TestsCommand extends Command<bool> {
-  TestsCommand() {
+class TestCommand extends Command<bool> {
+  TestCommand() {
     argParser
       ..addMultiOption(
         'target',
@@ -32,6 +32,13 @@ class TestsCommand extends Command<bool> {
         help: 'Pauses the browser before running a test, giving you an '
             'opportunity to add breakpoints or inspect loaded code before '
             'running the code.',
+      )
+      ..addFlag(
+        'update-screenshot-goldens',
+        defaultsTo: false,
+        help: 'When running screenshot tests writes them to the file system into '
+            '.dart_tool/goldens. Use this option to bulk-update all screenshots, '
+            'for example, when a new browser version affects pixels.',
       );
 
     addChromeVersionOption(argParser);
@@ -73,6 +80,10 @@ class TestsCommand extends Command<bool> {
   /// See [ChromeInstallerCommand.chromeVersion].
   String get chromeVersion => argResults['chrome-version'];
 
+  /// When running screenshot tests writes them to the file system into
+  /// ".dart_tool/goldens".
+  bool get isUpdateScreenshotGoldens => argResults['update-screenshot-goldens'];
+
   Future<void> _runTargetTests(List<FilePath> targets) async {
     await _runTestBatch(targets, concurrency: 1, expectFailure: false);
     _checkExitCode();
@@ -234,7 +245,11 @@ class TestsCommand extends Command<bool> {
       ...testFiles.map((f) => f.relativeToWebUi).toList(),
     ];
     hack.registerPlatformPlugin(<Runtime>[Runtime.chrome], () {
-      return BrowserPlatform.start(root: io.Directory.current.path);
+      return BrowserPlatform.start(
+        root: io.Directory.current.path,
+        // It doesn't make sense to update a screenshot for a test that is expected to fail.
+        isUpdateScreenshotGoldens: !expectFailure && isUpdateScreenshotGoldens,
+      );
     });
 
     // We want to run tests with `web_ui` as a working directory.
diff --git a/lib/web_ui/test/golden_files/smoke_test.png b/lib/web_ui/test/golden_files/smoke_test.png
index e136d923394b50c7b2a7f4beeea91524e7ac47c2..5b0f5dcd278497f7b15df5c08dfdac76a07d45fb 100644
GIT binary patch
literal 2159
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

literal 2413
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

diff --git a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
index c4366eb4310a7..00e8e652ef08e 100644
--- a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
+++ b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
@@ -10,6 +10,7 @@ import 'package:web_engine_tester/golden_tester.dart';
 
 void main() {
   test('screenshot test reports success', () async {
+    html.document.body.style.fontFamily = 'Roboto';
     html.document.body.innerHtml = 'Hello world!';
     await matchGoldenFile('__local__/smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200));
   });

From e2da9ae02cff27d693a70b699465053fccc7e0ae Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 12:32:20 -0700
Subject: [PATCH 2/6] use bundled Roboto font

---
 lib/web_ui/dev/test_runner.dart               | 29 +++++++++++--------
 lib/web_ui/lib/assets/.gitignore              |  2 +-
 .../lib/src/engine/text/font_collection.dart  | 10 +++++--
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index 1110787a668e2..e9a5c233da776 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -54,7 +54,7 @@ class TestCommand extends Command<bool> {
   Future<bool> run() async {
     Chrome.version = chromeVersion;
 
-    _copyAhemFontIntoWebUi();
+    _copyTestFontsIntoWebUi();
     await _buildHostPage();
 
     final List<FilePath> targets =
@@ -272,15 +272,20 @@ class TestCommand extends Command<bool> {
   }
 }
 
-void _copyAhemFontIntoWebUi() {
-  final io.File sourceAhemTtf = io.File(path.join(
-      environment.flutterDirectory.path,
-      'third_party',
-      'txt',
-      'third_party',
-      'fonts',
-      'ahem.ttf'));
-  final String destinationAhemTtfPath =
-      path.join(environment.webUiRootDir.path, 'lib', 'assets', 'ahem.ttf');
-  sourceAhemTtf.copySync(destinationAhemTtfPath);
+const List<String> _kTestFonts = <String>['ahem.ttf', 'Roboto-Light.ttf'];
+
+void _copyTestFontsIntoWebUi() {
+  final String fontsPath = path.join(
+    environment.flutterDirectory.path,
+    'third_party',
+    'txt',
+    'third_party',
+    'fonts',
+  );
+
+  for (String fontFile in _kTestFonts) {
+    final io.File sourceTtf = io.File(path.join(fontsPath, fontFile));
+    final String destinationTtfPath = path.join(environment.webUiRootDir.path, 'lib', 'assets', fontFile);
+    sourceTtf.copySync(destinationTtfPath);
+  }
 }
diff --git a/lib/web_ui/lib/assets/.gitignore b/lib/web_ui/lib/assets/.gitignore
index 252e3401e5f02..6ca895932c4e5 100644
--- a/lib/web_ui/lib/assets/.gitignore
+++ b/lib/web_ui/lib/assets/.gitignore
@@ -1 +1 @@
-ahem.ttf
\ No newline at end of file
+*.ttf
\ No newline at end of file
diff --git a/lib/web_ui/lib/src/engine/text/font_collection.dart b/lib/web_ui/lib/src/engine/text/font_collection.dart
index b6daf744a922d..0a6d4d419af5d 100644
--- a/lib/web_ui/lib/src/engine/text/font_collection.dart
+++ b/lib/web_ui/lib/src/engine/text/font_collection.dart
@@ -4,8 +4,10 @@
 
 part of engine;
 
-const String _testFontFamily = 'Ahem';
-const String _testFontUrl = 'packages/ui/assets/ahem.ttf';
+const String _ahemFontFamily = 'Ahem';
+const String _ahemFontUrl = 'packages/ui/assets/ahem.ttf';
+const String _robotoFontFamily = 'Roboto';
+const String _robotoFontUrl = 'packages/ui/assets/Roboto-Light.ttf';
 
 /// This class is responsible for registering and loading fonts.
 ///
@@ -75,7 +77,9 @@ class FontCollection {
   void debugRegisterTestFonts() {
     _testFontManager = _FontManager();
     _testFontManager.registerAsset(
-        _testFontFamily, 'url($_testFontUrl)', const <String, String>{});
+        _ahemFontFamily, 'url($_ahemFontUrl)', const <String, String>{});
+    _testFontManager.registerAsset(
+        _robotoFontFamily, 'url($_robotoFontUrl)', const <String, String>{});
   }
 
   /// Returns a [Future] that completes when the registered fonts are loaded

From 39ac372b5a5e7ad1914b49049e78a5ddadebb02d Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 12:46:28 -0700
Subject: [PATCH 3/6] switch to Roboto-Regular

---
 lib/web_ui/dev/test_runner.dart                     | 2 +-
 lib/web_ui/lib/src/engine/text/font_collection.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index e9a5c233da776..3954ce17140a9 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -272,7 +272,7 @@ class TestCommand extends Command<bool> {
   }
 }
 
-const List<String> _kTestFonts = <String>['ahem.ttf', 'Roboto-Light.ttf'];
+const List<String> _kTestFonts = <String>['ahem.ttf', 'Roboto-Regular.ttf'];
 
 void _copyTestFontsIntoWebUi() {
   final String fontsPath = path.join(
diff --git a/lib/web_ui/lib/src/engine/text/font_collection.dart b/lib/web_ui/lib/src/engine/text/font_collection.dart
index 0a6d4d419af5d..799b959b90803 100644
--- a/lib/web_ui/lib/src/engine/text/font_collection.dart
+++ b/lib/web_ui/lib/src/engine/text/font_collection.dart
@@ -7,7 +7,7 @@ part of engine;
 const String _ahemFontFamily = 'Ahem';
 const String _ahemFontUrl = 'packages/ui/assets/ahem.ttf';
 const String _robotoFontFamily = 'Roboto';
-const String _robotoFontUrl = 'packages/ui/assets/Roboto-Light.ttf';
+const String _robotoFontUrl = 'packages/ui/assets/Roboto-Regular.ttf';
 
 /// This class is responsible for registering and loading fonts.
 ///

From dc5c289538751565a309c121c28180e14dfbe7fa Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 13:02:33 -0700
Subject: [PATCH 4/6] make golden smoke test use the engine

---
 lib/web_ui/test/golden_files/smoke_test.png   | Bin 2159 -> 1769 bytes
 .../golden_success_smoke_test.dart            |   6 +++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/web_ui/test/golden_files/smoke_test.png b/lib/web_ui/test/golden_files/smoke_test.png
index 5b0f5dcd278497f7b15df5c08dfdac76a07d45fb..f1b4a7fef0439a1daa15cfd46e7f5f352a50044d 100644
GIT binary patch
literal 1769
zcmeH||5K6&0LEWQ(=yGvGE0*#TW&2)S81ydGZidPQhZ}Z*%vcP!!J416JC(YtW0g!
zPFE@}mzgi7l_E;PYg40nD%W<e5bqGpnTesIA}SH{_BZUuetGV>dwzKCp8MQAH;zP+
zoR)7`4gi2t1UWPY0BnL6{cDG%i+a~~j}QQsK8XlD5SwkISJNL=CwRyWi2r)|t?S?V
zN9`m>I^SRM`<m#R?p?LF53bmKmE1LWCggY;-y{5|e{ktx2al7NQSY>@>bmW5$zj-!
zLJ>-p_e5Fjtrs6_N2o&SEL%OH79j+M`C}fB83XWLdreM2cPY;|w_qKOuy7u29dSmi
z#JhT#AiGM}M;FTG-VqU>Q`{NAmwuFG=mY~byIzRx28T<9{X8pzG|p!Z@WIlP@vL^I
zX~??`=~$D!)iKbL)U3&rP2lF%G2;N<e6>z81`F8rNu?)X-_{4ZS&Xr=lR^Yf@E~+r
zK@%BEGJ0!s2KaDAmS@noI$0Qy@==-M$!*b%KNkjBU+}E`Y*6k&HTDET+xB5BOqR(L
z{~cp|?FG`}<5=>I?Zk;j1?($%q^rn+oe51kRYJZ=tk{z4_ojJ!u8$jH?XT(3a<R&4
zy@-aQGzF)3euM@YK@>}+S>_qV@7K~|36`13^cul2*4sp?7MVK4^AvL-^mINbH6BHy
zNyfPzqohHmuGDYjOwK8$<alsGhP87C^SqF|c^13Kx>{tiEOopgIv?MUa2GD1jyqzZ
z`9xH}KB|A7itbj%5~jPmZ9dHn!KLx=!el#q(0LS7Z|;~H2D3DvND)Mp3pkgGbtF9K
z6BlEAUj{NNHC}x<Rfux)_oZXwGPX8T3xVDhP4f^m6@f}vgnH(TvMydjYFrYY>t}d~
z%f^_{hP@hsDONgrjHeBUm=Dl!&R=?|shegUxB^#X>TKN4AJCl6hn?K7Em1wJW8O5s
za))x%y{!Y6VS9X?#PG_qO;~>qV^Q|pPsO-qg9*j8XfmmW<nRRV|4Lehia_>9|3wZG
zC9Xd=Aoc2VWwlI4*KUq6tl$;Ji%#a5nbZ23ioPYPa6Y3vT68I~@?P@*WIBPS%b6M$
zNn}nn5iA+EzO%b_BhZ9Q&U)yTC)wpiK{-imc2U5c0D@&OKPZv#;aAz?!Yvr<VR8Rb
z^%}9yv8Fczjfz>j!lB{`M>lVQio~R6XrlGyFBuoCxLxBJO{1SbggE&{zxQmbJ}m6r
zE7bjYSSZMWDS22^YuLNbW_e{sn+?Qju9#LOKv(-*x2YSY7L)eVT=Q!4P_f0biZs)}
z5X6a+KvZh#wMdw2vjg<MP@_gi_Rkza6-3(OxSgEHvP0sbP?xQJB|QcK=NZxa_|q!u
z*dL=crm+0CO~Im!qW#Y(-(X#a$d?z*SXCJP?0Prbv?su`-O7z42D$lA8a*yWfm7^j
zC=Rk8f6-{qnrZ#o&p!viV$;f9`Li2TOff7<mgCJ9(~x#TlDv|^?&&Pp;mkv{Ttf42
z=bopyiwgHK79de)nersQp9rnZ{t@q&zJJ*M%(6``hXMW%IERka!JA3|+*4bZ>tE#t
lZ@01i5`9_Y|7T+?_4Re~S+bi2TD&kIA}lJjKIGKpe*rp9_nrU%

literal 2159
zcmeHJ=~vQe6o$%auak4e%2Q}{m?_Q3Emzb`#U;uaZKy;^8#Fa@Hy}{UI+>}skhmmd
z7KWylhNy+wVx^=MsF<OU8zGttAR!9#`v>OZeCx}-?|I*I&wKCl+~=Nq%l`yo^9JJ$
zAP{J?kGIEPAQ0FMIKN-_3t&su*w=tS>yG$%91X;QXGAfXr}`lsU!hUqjGYA(gF6&o
zv&=BxM-PgRV$WvAR_rxk?mV#n_o1~1_HOE;95%auKil7Clj}cOrKLVlGvBO7KMZf2
z4)yRVR*$d_MHI*HlHyd89eTXvu(ftNaWSQX9zDY%Tj*3K>rL+&p|op2bw=PduMFKx
z5B`^{HcPMc%JJ2zXHQ;Hf3H=GMmui{K9pDs>f3dtL+n^g|54zLe(Cv4)3bz$Zl#o-
z#u%s#s(R>0Wyl0on4!-Y1D>m%NRXCa<}(ATj73txNmnEpzIfUZH+Qa8UiX|YuWzS?
ze<;pR)l5*6#&Ya*84(-N+1n(p_dIXwb){u?v8i`>YaSs%HAxQo2oET6)jA|s4^77t
zimN*5q{TB)1CP%Tl%EiS0;nH<vz^GlU#?%0*W0A&mX%*`niNHj!PTO|5aN8Na_;q3
zOq^c({W)wnRXZaaBfHk&NjJCb=D)xzx+%6!aT2#FApfP&+c5seieoj7UNpv5h_n4}
zr<8*vRX<8r7TeY$nODSPa9?jEE&rJBt2#-yxj6X5k+;#*26<}joTw#HrWU8wv*9-%
zG!c<7#J)6=yq3)`v5w$BKGVn-r|E;k0&=<v|Deh*ICuxQCi!rwFxa-?=J@l*HW&Ok
zD~WLnPtA_Rj-Y#!XNFj|U{M3suVujgTt~W}<6DFYDKJbYO5{Cs`rceQ@{}DbrqOVt
zx0I5Mtqf`i;lK(|V&uzf2FZ)e<5$fwR~Z#k?fJl`q^K`VF_l`5UZ;%|w~-=wG&mDM
zhG2sr1}>WMLRmiwgJg>mxSp7HfN8@@wm8)ZuIdZGe%VKME;w=5K0lmCD^Hmo{BzdU
zA>F|dPZ6@Bg@$b-oGVoOiO!N2b9t-n<0KtPGb~{U-|{Wlgl=SUwojrtgl;}OjF*;2
z_LSN(vD_kTkPZ%CQ3`CeJHYOOz+{jDv#{0W$Gwro-^~A}$YMH|RC2%T3rULU&yCnG
zD{3*OP0Wf$Rf0uNLXT-2FNvBRzbN)cPxUcnWLKTHF!*wCxfF;&F@*SW)OraQ){gd~
z(bIHzW2cmh>m}Aa=ftje&6>$F7@<u}QU?>3=ifz-Qj@0#pZ2;q5H%)OmqDeu)vJp$
z{7YO07H8Pv0gYz7t8k*IWa#Ll_k!1NmzNbhXn4%fGiD<vpy~v6&t43f8((X&HvE0w
zo=5=$32g$Pv<ToYC+3E_%<e<v_MywPnA}f!CTYu0KY33otd}wv(ku+6RktJ$s1M<E
zD;J3Piu;!M`B9}zpz<Qz!A(kG<5$;0_6sFuFQbKZ!Nx8`T<PIZ_gkU4fdE-B`Ht-c
zVmpLBto8CNZSq4&fa=OBeYQEIV;6nbedm6TY9J`ONt(|`+70)8lPkOrX~zpscDs9e
zhD7#&qrbru#u>=6q7mF!j#W<W3sgup9$?DX6sF#>Jz<ukF6#eIBsE%fYh_jRsp&#-
zqao&=ta%iC*9z-PQ1saO#VyqC!C$AKf&dJMlYY#7^%^Tckk7x(_Tjl`FYbIe3|vEx
z2eB_%R7849d&{|FfPie-4d}!kTkO#DsQ&7Pf-5cWn)6<C-*x?L74|06CVupd)k?29
zmo+15vF0pvo69)rk($dZhRuXJ97vHRr(#mi7?~z)Qj8+n><+=a0-YMV&AS|E_#3vE
zdan9gZ3xE^uKajxJ1IDKxHVZmg>L7vo5qC$5O7GZWv>uWhas;eQCcKR(KSvEo-#r=
z5RvhK5M)4m|LS(Zy?Vnr-G@uZ79!A!$|hnhtbU8#I53auG%n(z1YOm^v#h97uP7$e
zu+I%xRTHw*hUwgk>akpiv6OP-x#S@)G9(znnvmf--{<e+uD)<qRI>3pG~Mm=s&zlz
gPYC|UF3|tN%<#>a^2i$m7737#=LwHG_jA|&1)q88!~g&Q

diff --git a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
index 00e8e652ef08e..6b451af43b21a 100644
--- a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
+++ b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
@@ -6,9 +6,13 @@ import 'dart:html' as html;
 
 import 'package:test/test.dart';
 import 'package:ui/ui.dart';
+import 'package:ui/src/engine.dart';
 import 'package:web_engine_tester/golden_tester.dart';
 
-void main() {
+void main() async {
+  debugEmulateFlutterTesterEnvironment = true;
+  await webOnlyInitializePlatform(assetManager: WebOnlyMockAssetManager());
+
   test('screenshot test reports success', () async {
     html.document.body.style.fontFamily = 'Roboto';
     html.document.body.innerHtml = 'Hello world!';

From 6a997919865d0e18019a12a318a19dab1a37f0e1 Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 13:21:15 -0700
Subject: [PATCH 5/6] use the real SHA

---
 lib/web_ui/dev/goldens_lock.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/web_ui/dev/goldens_lock.yaml b/lib/web_ui/dev/goldens_lock.yaml
index 77186e753d3b3..004237536a306 100644
--- a/lib/web_ui/dev/goldens_lock.yaml
+++ b/lib/web_ui/dev/goldens_lock.yaml
@@ -1,3 +1,2 @@
 repository: https://github.com/flutter/goldens.git
-# TODO: DO NOT SUBMIT - this SHA is from a pending PR
-revision: 1fda4f5305bbbd787c0b2a3e0f04b6aa358e64ce
+revision: 17a42169bbf6739421fce8a0a1695eb3405375b6

From 427a000b0a62f92ef3336efc2ada1177f2835b79 Mon Sep 17 00:00:00 2001
From: Yegor Jbanov <yjbanov@google.com>
Date: Fri, 4 Oct 2019 13:43:26 -0700
Subject: [PATCH 6/6] doUpdateScreenshotGoldens

---
 lib/web_ui/dev/test_platform.dart | 12 ++++++------
 lib/web_ui/dev/test_runner.dart   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart
index 5c475dcab3705..8426676be88c3 100644
--- a/lib/web_ui/dev/test_platform.dart
+++ b/lib/web_ui/dev/test_platform.dart
@@ -55,7 +55,7 @@ class BrowserPlatform extends PlatformPlugin {
   ///
   /// [root] is the root directory that the server should serve. It defaults to
   /// the working directory.
-  static Future<BrowserPlatform> start({String root, bool isUpdateScreenshotGoldens: false}) async {
+  static Future<BrowserPlatform> start({String root, bool doUpdateScreenshotGoldens: false}) async {
     var server = shelf_io.IOServer(await HttpMultiServer.loopback(0));
     return BrowserPlatform._(
       server,
@@ -63,7 +63,7 @@ class BrowserPlatform extends PlatformPlugin {
       p.fromUri(await Isolate.resolvePackageUri(
           Uri.parse('package:test/src/runner/browser/static/favicon.ico'))),
       root: root,
-      isUpdateScreenshotGoldens: isUpdateScreenshotGoldens,
+      doUpdateScreenshotGoldens: doUpdateScreenshotGoldens,
     );
   }
 
@@ -102,10 +102,10 @@ class BrowserPlatform extends PlatformPlugin {
   bool get _closed => _closeMemo.hasRun;
 
   /// Whether to update screenshot golden files.
-  final bool isUpdateScreenshotGoldens;
+  final bool doUpdateScreenshotGoldens;
 
   BrowserPlatform._(this._server, Configuration config, String faviconPath,
-      {String root, this.isUpdateScreenshotGoldens})
+      {String root, this.doUpdateScreenshotGoldens})
       : _config = config,
         _root = root == null ? p.current : root,
         _http = config.pubServeUrl == null ? null : HttpClient() {
@@ -152,7 +152,7 @@ class BrowserPlatform extends PlatformPlugin {
   }
 
   Future<String> _diffScreenshot(String filename, bool write, [ Map<String, dynamic> region ]) async {
-    if (isUpdateScreenshotGoldens) {
+    if (doUpdateScreenshotGoldens) {
       write = true;
     }
 
@@ -224,7 +224,7 @@ To automatically create this file call matchGoldenFile('$filename', write: true)
       // Don't even bother with the comparison, just write and return
       print('Updating screenshot golden: $file');
       file.writeAsBytesSync(encodePng(screenshot), flush: true);
-      if (isUpdateScreenshotGoldens) {
+      if (doUpdateScreenshotGoldens) {
         // Do not fail tests when bulk-updating screenshot goldens.
         return 'OK';
       } else {
diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index 3954ce17140a9..4a19873a95d5e 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -82,7 +82,7 @@ class TestCommand extends Command<bool> {
 
   /// When running screenshot tests writes them to the file system into
   /// ".dart_tool/goldens".
-  bool get isUpdateScreenshotGoldens => argResults['update-screenshot-goldens'];
+  bool get doUpdateScreenshotGoldens => argResults['update-screenshot-goldens'];
 
   Future<void> _runTargetTests(List<FilePath> targets) async {
     await _runTestBatch(targets, concurrency: 1, expectFailure: false);
@@ -248,7 +248,7 @@ class TestCommand extends Command<bool> {
       return BrowserPlatform.start(
         root: io.Directory.current.path,
         // It doesn't make sense to update a screenshot for a test that is expected to fail.
-        isUpdateScreenshotGoldens: !expectFailure && isUpdateScreenshotGoldens,
+        doUpdateScreenshotGoldens: !expectFailure && doUpdateScreenshotGoldens,
       );
     });