From 6f7b69e5cb547d37529f7663b2c788dbf5276c68 Mon Sep 17 00:00:00 2001 From: Greg Spencer Date: Thu, 7 Jun 2018 09:46:55 -0700 Subject: [PATCH 1/2] Add missing static resource. --- lib/src/html/resources.g.dart | 1 + 1 file changed, 1 insertion(+) 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 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', From b1b455af9fd1ec14179ad21411a18076e7e71500 Mon Sep 17 00:00:00 2001 From: Greg Spencer Date: Thu, 7 Jun 2018 10:37:17 -0700 Subject: [PATCH 2/2] Fix analyzer warning in test --- pubspec.lock | 2 +- test/model_test.dart | 4 ++-- .../test_package_docs/fake/ExtendsFutureVoid-class.html | 4 ++-- .../test_package_docs/fake/ExtendsFutureVoid/then.html | 8 ++++---- .../fake/ImplementsFutureVoid-class.html | 4 ++-- .../test_package_docs/fake/ImplementsFutureVoid/then.html | 8 ++++---- testing/test_package_docs/static-assets/play_button.svg | 1 + 7 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 testing/test_package_docs/static-assets/play_button.svg 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('Methods
inherited
- then<S>(FutureOr<S> onValue(T value), { Function onError }) - → Future<S> + then<R>(FutureOr<R> onValue(T value), { Function onError }) + → Future<R>
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 @@
  • test_package
  • fake
  • ExtendsFutureVoid
    • -
  • then<S> abstract method
    • +
  • then<R> abstract method
    • then
    - then<S>(FutureOr<S> onValue(T value), { Function onError }) - → Future<S> + then<R>(FutureOr<R> onValue(T value), { Function onError }) + → Future<R>
    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 @@
  • test_package
  • fake
  • ImplementsFutureVoid
    • -
  • then<S> abstract method
    • +
  • then<R> abstract method
    • then
    @@ -66,12 +66,12 @@
    ImplementsFutureVoid class
    -

    then<S> method

    +

    then<R> method

    - Future<S> + Future<R> then -<S>(FutureOr<S> onValue(T value), { Function onError }) +<R>(FutureOr<R> onValue(T value), { Function onError })
    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 @@ + \ No newline at end of file