Fix of flutter packages get in plugin project (flutter#14757)

mravn-google · web-flow · commit f526805e20f9 · 2018-02-17T21:25:13.000+01:00
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart
@@ -56,15 +56,11 @@ class FlutterProject {
   /// Generates project files necessary to make Gradle builds work on Android
   /// and CocoaPods+Xcode work on iOS.
   void ensureReadyForPlatformSpecificTooling() {
-    if (!directory.existsSync()) {
+    if (!directory.existsSync() || isPluginProject) {
       return;
     }
-    if (isPluginProject) {
-      example.ensureReadyForPlatformSpecificTooling();
-    } else {
-      injectPlugins(directory: directory.path);
-      generateXcodeProperties(directory.path);
-    }
+    injectPlugins(directory: directory.path);
+    generateXcodeProperties(directory.path);
   }
 }
 
diff --git a/packages/flutter_tools/test/commands/packages_test.dart b/packages/flutter_tools/test/commands/packages_test.dart
@@ -192,6 +192,24 @@ void main() {
       // TODO(mravn): This test fails on the Chrome windows bot only.
       // Skipping until resolved.
     }, timeout: allowForRemotePubInvocation, skip: true);
+    testUsingContext('get fetches packages and injects plugin in plugin project', () async {
+      final String projectPath = await createProject(
+        temp,
+        arguments: <String>['-t', 'plugin', '--no-pub'],
+      );
+      final String exampleProjectPath = fs.path.join(projectPath, 'example');
+      removeGeneratedFiles(projectPath);
+      removeGeneratedFiles(exampleProjectPath);
+
+      await runCommandIn(projectPath, 'get');
+
+      expectDependenciesResolved(projectPath);
+
+      await runCommandIn(exampleProjectPath, 'get');
+
+      expectDependenciesResolved(exampleProjectPath);
+      expectPluginInjected(exampleProjectPath);
+    }, timeout: allowForRemotePubInvocation);
   });
 
   group('packages test/pub', () {
diff --git a/packages/flutter_tools/test/project_test.dart b/packages/flutter_tools/test/project_test.dart
@@ -23,6 +23,12 @@ void main() {
         project.ensureReadyForPlatformSpecificTooling();
         expect(project.directory.existsSync(), isFalse);
       });
+      testInMemory('does nothing in plugin root project', () async {
+        final FlutterProject project = aPluginProject();
+        project.ensureReadyForPlatformSpecificTooling();
+        expect(project.example.ios.directory.childFile('Runner/GeneratedPluginRegistrant.h').existsSync(), isFalse);
+        expect(project.example.ios.directory.childFile('Flutter/Generated.xcconfig').existsSync(), isFalse);
+      });
       testInMemory('injects plugins', () async {
         final FlutterProject project = aProjectWithIos();
         project.ensureReadyForPlatformSpecificTooling();
@@ -33,12 +39,6 @@ void main() {
         project.ensureReadyForPlatformSpecificTooling();
         expect(project.ios.directory.childFile('Flutter/Generated.xcconfig').existsSync(), isTrue);
       });
-      testInMemory('generates files in plugin example project', () async {
-        final FlutterProject project = aPluginProject();
-        project.ensureReadyForPlatformSpecificTooling();
-        expect(project.example.ios.directory.childFile('Runner/GeneratedPluginRegistrant.h').existsSync(), isTrue);
-        expect(project.example.ios.directory.childFile('Flutter/Generated.xcconfig').existsSync(), isTrue);
-      });
     });
     group('organization names set', () {
       testInMemory('is empty, if project not created', () async {
diff --git a/packages/flutter_tools/test/src/common.dart b/packages/flutter_tools/test/src/common.dart
@@ -88,13 +88,15 @@ Matcher throwsProcessExit([dynamic exitCode]) {
 /// Matcher for [ProcessExit]s.
 const Matcher isProcessExit = const isInstanceOf<ProcessExit>();
 
-/// Creates a flutter project in the [temp] directory.
+/// Creates a flutter project in the [temp] directory using the
+/// [arguments] list if specified, or `--no-pub` if not.
 /// Returns the path to the flutter project.
-Future<String> createProject(Directory temp) async {
+Future<String> createProject(Directory temp, {List<String> arguments}) async {
+  arguments ??= <String>['--no-pub'];
   final String projectPath = fs.path.join(temp.path, 'flutter_project');
   final CreateCommand command = new CreateCommand();
   final CommandRunner<Null> runner = createTestCommandRunner(command);
-  await runner.run(<String>['create', '--no-pub', projectPath]);
+  await runner.run(<String>['create']..addAll(arguments)..add(projectPath));
   return projectPath;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,15 +56,11 @@ class FlutterProject {`
`56`	`56`	`/// Generates project files necessary to make Gradle builds work on Android`
`57`	`57`	`/// and CocoaPods+Xcode work on iOS.`
`58`	`58`	`void ensureReadyForPlatformSpecificTooling() {`
`59`		`- if (!directory.existsSync()) {`
	`59`	`+ if (!directory.existsSync() \|\| isPluginProject) {`
`60`	`60`	`return;`
`61`	`61`	`}`
`62`		`- if (isPluginProject) {`
`63`		`- example.ensureReadyForPlatformSpecificTooling();`
`64`		`- } else {`
`65`		`- injectPlugins(directory: directory.path);`
`66`		`- generateXcodeProperties(directory.path);`
`67`		`- }`
	`62`	`+ injectPlugins(directory: directory.path);`
	`63`	`+ generateXcodeProperties(directory.path);`
`68`	`64`	`}`
`69`	`65`	`}`
`70`	`66`