| Index: sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_in_lib_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_test.dart b/sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_in_lib_test.dart
|
| similarity index 76%
|
| copy from sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_test.dart
|
| copy to sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_in_lib_test.dart
|
| index a5098b63eff6fe497211a4f7d44d4369ee3ae041..6af3a816f54aba0c86015ca10e68831b40a10fff 100644
|
| --- a/sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_test.dart
|
| +++ b/sdk/lib/_internal/pub/test/build/includes_assets_from_dependencies_in_lib_test.dart
|
| @@ -10,14 +10,14 @@ import '../test_pub.dart';
|
| main() {
|
| initConfig();
|
|
|
| - integration("includes assets from dependencies", () {
|
| + integration("includes assets from the 'lib' directory of dependencies", () {
|
| // Dart2js can take a long time to compile dart code, so we increase the
|
| // timeout to cope with that.
|
| currentSchedule.timeout *= 3;
|
|
|
| d.dir("foo", [
|
| d.libPubspec("foo", "0.0.1"),
|
| - d.dir("asset", [
|
| + d.dir("lib", [
|
| d.file("foo.txt", "foo"),
|
| d.dir("sub", [
|
| d.file("bar.txt", "bar"),
|
| @@ -34,17 +34,20 @@ main() {
|
| ]),
|
| d.dir("web", [
|
| d.file("index.html", "html"),
|
| + d.dir("sub", [
|
| + d.file("index.html", "html")
|
| + ])
|
| ])
|
| ]).create();
|
|
|
| schedulePub(args: ["build", "--all"],
|
| - output: new RegExp(r"Built 6 files!"));
|
| + output: new RegExp(r"Built 7 files!"));
|
|
|
| d.dir(appPath, [
|
| d.dir('build', [
|
| d.dir('example', [
|
| d.file("index.html", "html"),
|
| - d.dir('assets', [
|
| + d.dir('packages', [
|
| d.dir('foo', [
|
| d.file('foo.txt', 'foo'),
|
| d.dir('sub', [
|
| @@ -55,13 +58,18 @@ main() {
|
| ]),
|
| d.dir('web', [
|
| d.file("index.html", "html"),
|
| - d.dir('assets', [
|
| + d.dir('packages', [
|
| d.dir('foo', [
|
| d.file('foo.txt', 'foo'),
|
| d.dir('sub', [
|
| d.file('bar.txt', 'bar'),
|
| ]),
|
| ])
|
| + ]),
|
| + d.dir("sub", [
|
| + d.file("index.html", "html"),
|
| + // "packages" should *only* be created in the top-level directory.
|
| + d.nothing("packages")
|
| ])
|
| ])
|
| ])
|
|
|