Skip to content

Commit 62aad41

Browse files
authored
Enable flutter plugin test (#1866)
* Enable flutter plugin test * Plugin makes flutter check take longer again * Add workaround for #1431 and use update-packages to make sure Flutter is ready to go before building docs * flag in wrong place * dartfmt
1 parent ca8fe9d commit 62aad41

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ dart:
44
- stable
55
- "dev/raw/latest"
66
env:
7+
- DARTDOC_BOT=flutter
78
- DARTDOC_BOT=sdk-analyzer
89
- DARTDOC_BOT=main
9-
- DARTDOC_BOT=flutter
1010
- DARTDOC_BOT=packages
1111
- DARTDOC_BOT=sdk-docs
1212
script: ./tool/travis.sh

test/compare_output_test.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ void main() {
6767
'Top level package requires Flutter but FLUTTER_ROOT environment variable not set|test_package_flutter_plugin requires the Flutter SDK, version solving failed')));
6868
expect(result.stderr, isNot(contains('asynchronous gap')));
6969
expect(result.exitCode, isNot(0));
70-
},
71-
skip:
72-
true /* TODO(gspencer): Re-enable as soon as Flutter's config is sane again. */);
70+
});
7371

7472
test("Validate --version works", () async {
7573
var args = <String>[dartdocBin, '--version'];
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
android/**

tool/grind.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,8 +592,7 @@ Future<void> serveFlutterDocs() async {
592592
}
593593

594594
@Task('Validate flutter docs')
595-
// TODO(jcollins-g): add buildDartdocFlutterPluginDocs once passing
596-
@Depends(buildFlutterDocs)
595+
@Depends(buildFlutterDocs, buildDartdocFlutterPluginDocs)
597596
void validateFlutterDocs() {}
598597

599598
@Task('Build flutter docs')
@@ -641,6 +640,11 @@ class FlutterRepo {
641640
['precache'],
642641
workingDirectory: flutterPath,
643642
);
643+
await launcher.runStreamed(
644+
bin,
645+
['update-packages'],
646+
workingDirectory: flutterPath,
647+
);
644648
}
645649

646650
factory FlutterRepo.fromPath(String flutterPath, Map<String, String> env,
@@ -924,6 +928,8 @@ Future<WarningsCollection> _buildDartdocFlutterPluginDocs() async {
924928
[
925929
'--enable-asserts',
926930
pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'),
931+
'--exclude-packages',
932+
'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431
927933
'--json',
928934
'--link-to-remote',
929935
'--output',

0 commit comments

Comments
 (0)