From 85ad699865ad2afa0ef5948cb35deda0cf4df093 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 3 Apr 2020 10:32:55 -0700 Subject: [PATCH] Remove URL shortening from GitHub reporter similar issues URL (#53882) --- packages/flutter_tools/lib/runner.dart | 2 +- .../lib/src/reporting/github_template.dart | 5 ++-- .../general.shard/github_template_test.dart | 26 +++---------------- .../general.shard/runner/runner_test.dart | 5 +--- 4 files changed, 7 insertions(+), 31 deletions(-) diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart index 5342f24d021..cb86d54f1e6 100644 --- a/packages/flutter_tools/lib/runner.dart +++ b/packages/flutter_tools/lib/runner.dart @@ -165,7 +165,7 @@ Future _informUserOfCrash(List args, dynamic error, StackTrace sta flutterProjectFactory: globals.projectFactory, client: clientFactory != null ? clientFactory() : HttpClient(), ); - final String similarIssuesURL = await gitHubTemplateCreator.toolCrashSimilarIssuesGitHubURL(errorString); + final String similarIssuesURL = GitHubTemplateCreator.toolCrashSimilarIssuesURL(errorString); globals.printStatus('$similarIssuesURL\n', wrap: false); globals.printStatus('To report your crash to the Flutter team, first read the guide to filing a bug.', emphasis: true); globals.printStatus('https://flutter.dev/docs/resources/bug-reports\n', wrap: false); diff --git a/packages/flutter_tools/lib/src/reporting/github_template.dart b/packages/flutter_tools/lib/src/reporting/github_template.dart index 76a1bd3c00b..c21f8461688 100644 --- a/packages/flutter_tools/lib/src/reporting/github_template.dart +++ b/packages/flutter_tools/lib/src/reporting/github_template.dart @@ -32,9 +32,8 @@ class GitHubTemplateCreator { final FlutterProjectFactory _flutterProjectFactory; final HttpClient _client; - Future toolCrashSimilarIssuesGitHubURL(String errorString) async { - final String fullURL = 'https://github.com/flutter/flutter/issues?q=is%3Aissue+${Uri.encodeQueryComponent(errorString)}'; - return await _shortURL(fullURL); + static String toolCrashSimilarIssuesURL(String errorString) { + return 'https://github.com/flutter/flutter/issues?q=is%3Aissue+${Uri.encodeQueryComponent(errorString)}'; } /// GitHub URL to present to the user containing encoded suggested template. diff --git a/packages/flutter_tools/test/general.shard/github_template_test.dart b/packages/flutter_tools/test/general.shard/github_template_test.dart index 01732bd97dc..f128a7ef2c8 100644 --- a/packages/flutter_tools/test/general.shard/github_template_test.dart +++ b/packages/flutter_tools/test/general.shard/github_template_test.dart @@ -24,33 +24,13 @@ void main() { }); group('GitHub template creator', () { - testWithoutContext('similar issues URL', () async { - final GitHubTemplateCreator creator = GitHubTemplateCreator( - fileSystem: fs, - logger: logger, - client: SuccessShortenURLFakeHttpClient(), - flutterProjectFactory: FlutterProjectFactory(), - ); + testWithoutContext('similar issues URL', () { expect( - await creator.toolCrashSimilarIssuesGitHubURL('this is a 100% error'), - _kShortURL + GitHubTemplateCreator.toolCrashSimilarIssuesURL('this is a 100% error'), + 'https://github.com/flutter/flutter/issues?q=is%3Aissue+this+is+a+100%25+error', ); }); - testWithoutContext('similar issues URL with network failure', () async { - final GitHubTemplateCreator creator = GitHubTemplateCreator( - fileSystem: fs, - logger: logger, - client: FakeHttpClient(), - flutterProjectFactory: FlutterProjectFactory(), - ); - expect( - await creator.toolCrashSimilarIssuesGitHubURL('this is a 100% error'), - 'https://github.com/flutter/flutter/issues?q=is%3Aissue+this+is+a+100%25+error' - ); - expect(logger.traceText, contains('Failed to shorten GitHub template URL')); - }); - group('new issue template URL', () { StackTrace stackTrace; const String command = 'flutter test'; diff --git a/packages/flutter_tools/test/general.shard/runner/runner_test.dart b/packages/flutter_tools/test/general.shard/runner/runner_test.dart index ae4555e6f80..861a25337a4 100644 --- a/packages/flutter_tools/test/general.shard/runner/runner_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/runner_test.dart @@ -81,9 +81,6 @@ void main() { }); testUsingContext('GitHub issue template', () async { - const String similarURL = 'https://example.com/1'; - when(mockGitHubTemplateCreator.toolCrashSimilarIssuesGitHubURL(any)) - .thenAnswer((_) async => similarURL); const String templateURL = 'https://example.com/2'; when(mockGitHubTemplateCreator.toolCrashIssueTemplateGitHubURL(any, any, any, any, any)) .thenAnswer((_) async => templateURL); @@ -115,7 +112,7 @@ void main() { expect(errorText, contains('Oops; flutter has exited unexpectedly: "an exception % --".\n')); final String statusText = testLogger.statusText; - expect(statusText, contains(similarURL)); + expect(statusText, contains('https://github.com/flutter/flutter/issues?q=is%3Aissue+an+exception+%25+--')); expect(statusText, contains('https://flutter.dev/docs/resources/bug-reports')); expect(statusText, contains(templateURL));