Unverified Commit abb1758e authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Fix places in devicelab tests where it expects the app template. (#22696)

I missed some create template conversions in the devicelab directory.
parent 3246a663
...@@ -9,7 +9,7 @@ import 'package:flutter_devicelab/framework/framework.dart'; ...@@ -9,7 +9,7 @@ import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/framework/utils.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
/// Tests that the Flutter module project template works and supports /// Tests that the Flutter application project template works and supports
/// adding Flutter to an existing Android app. /// adding Flutter to an existing Android app.
Future<void> main() async { Future<void> main() async {
await task(() async { await task(() async {
...@@ -21,15 +21,15 @@ Future<void> main() async { ...@@ -21,15 +21,15 @@ Future<void> main() async {
return TaskResult.failure('Could not find Java'); return TaskResult.failure('Could not find Java');
print('\nUsing JAVA_HOME=$javaHome'); print('\nUsing JAVA_HOME=$javaHome');
section('Create Flutter module project'); section('Create Flutter application project');
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_module_test.'); final Directory tempDir = Directory.systemTemp.createTempSync('flutter_application_test.');
final Directory projectDir = Directory(path.join(tempDir.path, 'hello')); final Directory projectDir = Directory(path.join(tempDir.path, 'hello'));
try { try {
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await flutter( await flutter(
'create', 'create',
options: <String>['--org', 'io.flutter.devicelab', '-t', 'module', 'hello'], options: <String>['--org', 'io.flutter.devicelab', '--template=application', 'hello'],
); );
}); });
...@@ -49,7 +49,7 @@ Future<void> main() async { ...@@ -49,7 +49,7 @@ Future<void> main() async {
); );
}); });
section('Build Flutter module library archive'); section('Build Flutter application library archive');
await inDirectory(Directory(path.join(projectDir.path, '.android')), () async { await inDirectory(Directory(path.join(projectDir.path, '.android')), () async {
await exec( await exec(
......
...@@ -10,20 +10,20 @@ import 'package:flutter_devicelab/framework/ios.dart'; ...@@ -10,20 +10,20 @@ import 'package:flutter_devicelab/framework/ios.dart';
import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/framework/utils.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
/// Tests that the Flutter module project template works and supports /// Tests that the Flutter application project template works and supports
/// adding Flutter to an existing iOS app. /// adding Flutter to an existing iOS app.
Future<void> main() async { Future<void> main() async {
await task(() async { await task(() async {
section('Create Flutter module project'); section('Create Flutter application project');
final Directory tempDir = Directory.systemTemp.createTempSync('flutter_module_test.'); final Directory tempDir = Directory.systemTemp.createTempSync('flutter_application_test.');
final Directory projectDir = Directory(path.join(tempDir.path, 'hello')); final Directory projectDir = Directory(path.join(tempDir.path, 'hello'));
try { try {
await inDirectory(tempDir, () async { await inDirectory(tempDir, () async {
await flutter( await flutter(
'create', 'create',
options: <String>['--org', 'io.flutter.devicelab', '-t', 'module', 'hello'], options: <String>['--org', 'io.flutter.devicelab', '--template=application', 'hello'],
); );
}); });
await prepareProvisioningCertificates(projectDir.path); await prepareProvisioningCertificates(projectDir.path);
......
...@@ -158,7 +158,7 @@ class FlutterProject { ...@@ -158,7 +158,7 @@ class FlutterProject {
static Future<FlutterProject> create(Directory directory, String name) async { static Future<FlutterProject> create(Directory directory, String name) async {
await inDirectory(directory, () async { await inDirectory(directory, () async {
await flutter('create', options: <String>[name]); await flutter('create', options: <String>['--template=app', name]);
}); });
return FlutterProject(directory, name); return FlutterProject(directory, name);
} }
...@@ -234,7 +234,7 @@ class FlutterPluginProject { ...@@ -234,7 +234,7 @@ class FlutterPluginProject {
static Future<FlutterPluginProject> create(Directory directory, String name) async { static Future<FlutterPluginProject> create(Directory directory, String name) async {
await inDirectory(directory, () async { await inDirectory(directory, () async {
await flutter('create', options: <String>['-t', 'plugin', name]); await flutter('create', options: <String>['--template=plugin', name]);
}); });
return FlutterPluginProject(directory, name); return FlutterPluginProject(directory, name);
} }
......
...@@ -76,7 +76,7 @@ TaskFunction createBasicMaterialCompileTest() { ...@@ -76,7 +76,7 @@ TaskFunction createBasicMaterialCompileTest() {
rmTree(sampleDir); rmTree(sampleDir);
await inDirectory<void>(Directory.systemTemp, () async { await inDirectory<void>(Directory.systemTemp, () async {
await flutter('create', options: <String>[sampleAppName]); await flutter('create', options: <String>['--template=app', sampleAppName]);
}); });
if (!(await sampleDir.exists())) if (!(await sampleDir.exists()))
......
...@@ -263,9 +263,9 @@ tasks: ...@@ -263,9 +263,9 @@ tasks:
stage: devicelab stage: devicelab
required_agent_capabilities: ["linux/android"] required_agent_capabilities: ["linux/android"]
module_test: application_test:
description: > description: >
Checks that the module project template works and supports add2app on Android. Checks that the application project template works and supports add2app on Android.
stage: devicelab stage: devicelab
required_agent_capabilities: ["linux/android"] required_agent_capabilities: ["linux/android"]
...@@ -297,9 +297,9 @@ tasks: ...@@ -297,9 +297,9 @@ tasks:
stage: devicelab_ios stage: devicelab_ios
required_agent_capabilities: ["mac/ios"] required_agent_capabilities: ["mac/ios"]
module_test_ios: application_test_ios:
description: > description: >
Checks that the module project template works and supports add2app on iOS. Checks that the application project template works and supports add2app on iOS.
stage: devicelab stage: devicelab
required_agent_capabilities: ["mac/ios"] required_agent_capabilities: ["mac/ios"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment