@@ -11,8 +11,10 @@ import 'package:flutter_tools/src/base/logger.dart';
1111import 'package:flutter_tools/src/base/time.dart' ;
1212import 'package:flutter_tools/src/build_info.dart' ;
1313import 'package:flutter_tools/src/build_system/build_system.dart' ;
14+ import 'package:flutter_tools/src/dart/pub.dart' ;
1415import 'package:flutter_tools/src/devfs.dart' ;
1516import 'package:flutter_tools/src/device.dart' ;
17+ import 'package:flutter_tools/src/features.dart' ;
1618import 'package:flutter_tools/src/isolated/devfs_web.dart' ;
1719import 'package:flutter_tools/src/isolated/resident_web_runner.dart' ;
1820import 'package:flutter_tools/src/project.dart' ;
@@ -23,6 +25,7 @@ import 'package:test/fake.dart';
2325
2426import '../src/common.dart' ;
2527import '../src/context.dart' ;
28+ import '../src/fake_pub_deps.dart' ;
2629import '../src/fakes.dart' ;
2730import '../src/test_build_system.dart' ;
2831
@@ -31,6 +34,12 @@ void main() {
3134 late FakeWebDevFS mockWebDevFS;
3235 late MemoryFileSystem fileSystem;
3336
37+ // TODO(matanlurey): Remove after `explicit-package-dependencies` is enabled by default.
38+ // See https://github.com/flutter/flutter/issues/160257 for details.
39+ FeatureFlags enableExplicitPackageDependencies () {
40+ return TestFeatureFlags (isExplicitPackageDependenciesEnabled: true );
41+ }
42+
3443 setUp (() {
3544 fileSystem = MemoryFileSystem .test ();
3645 mockWebDevFS = FakeWebDevFS ();
@@ -74,6 +83,8 @@ void main() {
7483 BuildSystem : () => TestBuildSystem .all (BuildResult (success: true )),
7584 FileSystem : () => fileSystem,
7685 ProcessManager : () => FakeProcessManager .any (),
86+ FeatureFlags : enableExplicitPackageDependencies,
87+ Pub : FakePubWithPrimedDeps .new ,
7788 });
7889
7990 // Regression test for https://github.com/flutter/flutter/issues/60613
@@ -99,6 +110,8 @@ void main() {
99110 BuildSystem : () => TestBuildSystem .all (BuildResult (success: false )),
100111 FileSystem : () => fileSystem,
101112 ProcessManager : () => FakeProcessManager .any (),
113+ FeatureFlags : enableExplicitPackageDependencies,
114+ Pub : FakePubWithPrimedDeps .new ,
102115 });
103116
104117 // Regression test for https://github.com/flutter/flutter/issues/60613
@@ -124,6 +137,8 @@ void main() {
124137 BuildSystem : () => TestBuildSystem .error (Exception ('foo' )),
125138 FileSystem : () => fileSystem,
126139 ProcessManager : () => FakeProcessManager .any (),
140+ FeatureFlags : enableExplicitPackageDependencies,
141+ Pub : FakePubWithPrimedDeps .new ,
127142 });
128143
129144 testUsingContext ('Can full restart after attaching' , () async {
@@ -153,6 +168,8 @@ void main() {
153168 BuildSystem : () => TestBuildSystem .all (BuildResult (success: true )),
154169 FileSystem : () => fileSystem,
155170 ProcessManager : () => FakeProcessManager .any (),
171+ FeatureFlags : enableExplicitPackageDependencies,
172+ Pub : FakePubWithPrimedDeps .new ,
156173 });
157174
158175 testUsingContext ('Fails on compilation errors in hot restart' , () async {
@@ -186,6 +203,8 @@ void main() {
186203 ]),
187204 FileSystem : () => fileSystem,
188205 ProcessManager : () => FakeProcessManager .any (),
206+ FeatureFlags : enableExplicitPackageDependencies,
207+ Pub : FakePubWithPrimedDeps .new ,
189208 });
190209}
191210
0 commit comments