| Index: sdk/lib/_internal/pub_generated/test/serve/web_socket/path_to_urls_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_test.dart b/sdk/lib/_internal/pub_generated/test/serve/web_socket/path_to_urls_test.dart
|
| similarity index 59%
|
| copy from sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_test.dart
|
| copy to sdk/lib/_internal/pub_generated/test/serve/web_socket/path_to_urls_test.dart
|
| index 5db405c3087390f509e46d413133e61717a73a02..820d5522feeef7c5ebf82d48504107b7b8aabd5b 100644
|
| --- a/sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/serve/web_socket/path_to_urls_test.dart
|
| @@ -15,34 +15,25 @@ main() {
|
| // TODO(rnystrom): Split into independent tests.
|
| initConfig();
|
| integration("pathToUrls converts asset ids to matching URL paths", () {
|
| - d.dir("foo", [
|
| - d.libPubspec("foo", "1.0.0"),
|
| - d.dir("lib", [
|
| - d.file("foo.dart", "foo() => null;")
|
| - ])
|
| - ]).create();
|
| -
|
| - d.dir(appPath, [
|
| - d.appPubspec({"foo": {"path": "../foo"}}),
|
| - d.dir("test", [
|
| - d.file("index.html", "<body>"),
|
| - d.dir("sub", [
|
| - d.file("bar.html", "bar"),
|
| - ])
|
| - ]),
|
| - d.dir("lib", [
|
| - d.file("app.dart", "app() => null;")
|
| - ]),
|
| - d.dir("web", [
|
| - d.file("index.html", "<body>"),
|
| - d.dir("sub", [
|
| - d.file("bar.html", "bar"),
|
| - ])
|
| - ]),
|
| - d.dir("randomdir", [
|
| - d.file("index.html", "<body>")
|
| - ])
|
| - ]).create();
|
| + d.dir(
|
| + "foo",
|
| + [
|
| + d.libPubspec("foo", "1.0.0"),
|
| + d.dir("lib", [d.file("foo.dart", "foo() => null;")])]).create();
|
| +
|
| + d.dir(appPath, [d.appPubspec({
|
| + "foo": {
|
| + "path": "../foo"
|
| + }
|
| + }),
|
| + d.dir(
|
| + "test",
|
| + [d.file("index.html", "<body>"), d.dir("sub", [d.file("bar.html", "bar"),])]),
|
| + d.dir("lib", [d.file("app.dart", "app() => null;")]),
|
| + d.dir(
|
| + "web",
|
| + [d.file("index.html", "<body>"), d.dir("sub", [d.file("bar.html", "bar"),])]),
|
| + d.dir("randomdir", [d.file("index.html", "<body>")])]).create();
|
|
|
| pubServe(args: ["test", "web", "randomdir"], shouldGetFirst: true);
|
|
|
| @@ -82,38 +73,42 @@ main() {
|
| // A path in lib/.
|
| expectWebSocketResult("pathToUrls", {
|
| "path": p.join("lib", "app.dart")
|
| - }, {"urls": [
|
| - getServerUrl("test", "packages/myapp/app.dart"),
|
| - getServerUrl("web", "packages/myapp/app.dart"),
|
| - getServerUrl("randomdir", "packages/myapp/app.dart")
|
| - ]});
|
| + }, {
|
| + "urls": [
|
| + getServerUrl("test", "packages/myapp/app.dart"),
|
| + getServerUrl("web", "packages/myapp/app.dart"),
|
| + getServerUrl("randomdir", "packages/myapp/app.dart")]
|
| + });
|
|
|
| // A path to this package in packages/.
|
| expectWebSocketResult("pathToUrls", {
|
| "path": p.join("packages", "myapp", "app.dart")
|
| - }, {"urls": [
|
| - getServerUrl("test", "packages/myapp/app.dart"),
|
| - getServerUrl("web", "packages/myapp/app.dart"),
|
| - getServerUrl("randomdir", "packages/myapp/app.dart")
|
| - ]});
|
| + }, {
|
| + "urls": [
|
| + getServerUrl("test", "packages/myapp/app.dart"),
|
| + getServerUrl("web", "packages/myapp/app.dart"),
|
| + getServerUrl("randomdir", "packages/myapp/app.dart")]
|
| + });
|
|
|
| // A path to another package in packages/.
|
| expectWebSocketResult("pathToUrls", {
|
| "path": p.join("packages", "foo", "foo.dart")
|
| - }, {"urls": [
|
| - getServerUrl("test", "packages/foo/foo.dart"),
|
| - getServerUrl("web", "packages/foo/foo.dart"),
|
| - getServerUrl("randomdir", "packages/foo/foo.dart")
|
| - ]});
|
| + }, {
|
| + "urls": [
|
| + getServerUrl("test", "packages/foo/foo.dart"),
|
| + getServerUrl("web", "packages/foo/foo.dart"),
|
| + getServerUrl("randomdir", "packages/foo/foo.dart")]
|
| + });
|
|
|
| // A relative path to another package's lib/ directory.
|
| expectWebSocketResult("pathToUrls", {
|
| "path": p.join("..", "foo", "lib", "foo.dart")
|
| - }, {"urls": [
|
| - getServerUrl("test", "packages/foo/foo.dart"),
|
| - getServerUrl("web", "packages/foo/foo.dart"),
|
| - getServerUrl("randomdir", "packages/foo/foo.dart")
|
| - ]});
|
| + }, {
|
| + "urls": [
|
| + getServerUrl("test", "packages/foo/foo.dart"),
|
| + getServerUrl("web", "packages/foo/foo.dart"),
|
| + getServerUrl("randomdir", "packages/foo/foo.dart")]
|
| + });
|
|
|
| // Note: Using canonicalize here because pub gets the path to the
|
| // entrypoint package from the working directory, which has had symlinks
|
| @@ -123,11 +118,12 @@ main() {
|
| // An absolute path to another package's lib/ directory.
|
| expectWebSocketResult("pathToUrls", {
|
| "path": canonicalize(p.join(sandboxDir, "foo", "lib", "foo.dart"))
|
| - }, {"urls": [
|
| - getServerUrl("test", "packages/foo/foo.dart"),
|
| - getServerUrl("web", "packages/foo/foo.dart"),
|
| - getServerUrl("randomdir", "packages/foo/foo.dart")
|
| - ]});
|
| + }, {
|
| + "urls": [
|
| + getServerUrl("test", "packages/foo/foo.dart"),
|
| + getServerUrl("web", "packages/foo/foo.dart"),
|
| + getServerUrl("randomdir", "packages/foo/foo.dart")]
|
| + });
|
|
|
| endPubServe();
|
| });
|
|
|