diff --git a/lib/src/html/resources.g.dart b/lib/src/html/resources.g.dart
index 66be0c2990..d2dfcc4bd6 100644
--- a/lib/src/html/resources.g.dart
+++ b/lib/src/html/resources.g.dart
@@ -10,6 +10,7 @@ const List<String> resource_names = const [
   'package:dartdoc/resources/favicon.png',
   'package:dartdoc/resources/github.css',
   'package:dartdoc/resources/highlight.pack.js',
+  'package:dartdoc/resources/play_button.svg',
   'package:dartdoc/resources/readme.md',
   'package:dartdoc/resources/script.js',
   'package:dartdoc/resources/sdk_footer_text.html',
diff --git a/pubspec.lock b/pubspec.lock
index d2d89f04f7..19cd01f1fd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -394,4 +394,4 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: "2.0.0-dev.59.0"
+  dart: ">=2.0.0-dev.59.0 <=2.0.0-dev.60.0"
diff --git a/test/model_test.dart b/test/model_test.dart
index 103ade3dc2..94bfeb257f 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -576,8 +576,8 @@ void main() {
           isTrue);
     });
     test("Doesn't place animations in one line doc", () {
-      expect(withAnimationInline.oneLineDoc, isNot(contains('<video')));
-      expect(withAnimationInline.documentation, contains('<video'));
+      expect(withAnimationInOneLineDoc.oneLineDoc, isNot(contains('<video')));
+      expect(withAnimationInOneLineDoc.documentation, contains('<video'));
     });
     test("Handles animations inline properly", () {
       expect(withAnimationInline.documentation, isNot(contains('  works')));
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
index 4db663f56b..dd1428047a 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
@@ -244,8 +244,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="then" class="callable inherited">
-          <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
+          <span class="name"><a href="fake/ExtendsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid/then.html b/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
index 8c81e1e7be..a03aef4395 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid/then.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
-    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">S</span>&gt; abstract method</li>
+    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">R</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">then</div>
   <form class="search navbar-right" role="search">
@@ -66,12 +66,12 @@ <h5>ExtendsFutureVoid class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>then&lt;<wbr><span class="type-parameter">S</span>&gt; method</h1>
+    <h1>then&lt;<wbr><span class="type-parameter">R</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
       <span class="name ">then</span>
-&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+&lt;<wbr><span class="type-parameter">R</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
     </section>
     
     
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
index 87a40d6efa..d008ff6785 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
@@ -243,8 +243,8 @@ <h2>Methods</h2>
           <div class="features">inherited</div>
 </dd>
         <dt id="then" class="callable inherited">
-          <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
-            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
+          <span class="name"><a href="fake/ImplementsFutureVoid/then.html">then</a></span><span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span><span class="signature">(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+            <span class="returntype parameter">&#8594; Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
           </span>
         </dt>
         <dd class="inherited">
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid/then.html b/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
index 51db5a729e..c5d392c4ad 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid/then.html
@@ -26,7 +26,7 @@
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
     <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
-    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">S</span>&gt; abstract method</li>
+    <li class="self-crumb">then&lt;<wbr><span class="type-parameter">R</span>&gt; abstract method</li>
   </ol>
   <div class="self-name">then</div>
   <form class="search navbar-right" role="search">
@@ -66,12 +66,12 @@ <h5>ImplementsFutureVoid class</h5>
   </div><!--/.sidebar-offcanvas-->
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
-    <h1>then&lt;<wbr><span class="type-parameter">S</span>&gt; method</h1>
+    <h1>then&lt;<wbr><span class="type-parameter">R</span>&gt; method</h1>
 
     <section class="multi-line-signature">
-      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span>
+      <span class="returntype">Future<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span>
       <span class="name ">then</span>
-&lt;<wbr><span class="type-parameter">S</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">S</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
+&lt;<wbr><span class="type-parameter">R</span>&gt;(<wbr><span class="parameter" id="then-param-onValue"><span class="type-annotation">FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">R</span>&gt;</span></span> <span class="parameter-name">onValue</span>(<span class="parameter" id="onValue-param-value"><span class="type-annotation">T</span> <span class="parameter-name">value</span></span>), {</span> <span class="parameter" id="then-param-onError"><span class="type-annotation">Function</span> <span class="parameter-name">onError</span></span> })
     </section>
     
     
diff --git a/testing/test_package_docs/static-assets/play_button.svg b/testing/test_package_docs/static-assets/play_button.svg
new file mode 100644
index 0000000000..c39a2f4a87
--- /dev/null
+++ b/testing/test_package_docs/static-assets/play_button.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="68" height="68" viewBox="0 0 17.992 17.992"><path d="M17.992 8.996A8.996 8.996 0 1 0 0 8.996a8.996 8.996 0 0 0 17.992 0m-2.23 0l-9.895 5.713V3.282l9.896 5.714h2.229z" fill-opacity=".198"/><path d="M15.763 8.996l-9.896 5.713V3.283z" fill="#7d7d7d" fill-opacity=".821"/></svg>
\ No newline at end of file