sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart - Issue 216593006: Don't allow overlapping source directories.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart

Issue 216593006: Don't allow overlapping source directories. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Revise. Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_multiple_test.dart ('k') | sdk/lib/_internal/pub/test/serve/web_socket/unserve_directory_subdirectory_still_watched_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart

diff --git a/sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_with_line_test.dart b/sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart

similarity index 54%

copy from sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_with_line_test.dart

copy to sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart

index 04bfda5abea082070c19fb78f0f7089888028863..143e53147f4c134b579a167442b243da2e5c948f 100644

--- a/sdk/lib/_internal/pub/test/serve/web_socket/path_to_urls_with_line_test.dart

+++ b/sdk/lib/_internal/pub/test/serve/web_socket/serve_directory_overlapping_test.dart

@@ -4,7 +4,7 @@

library pub_tests;

-import 'package:path/path.dart' as p;

+import 'package:path/path.dart' as path;

import 'package:scheduled_test/scheduled_test.dart';

import '../../descriptor.dart' as d;

@@ -13,23 +13,23 @@ import '../utils.dart';

main() {

initConfig();

- integration("pathToUrls provides output line if given source", () {

+ integration("fails if the directory overlaps one already being served", () {

d.dir(appPath, [

d.appPubspec(),

d.dir("web", [

- d.file("main.dart", "main"),

+ d.file("index.html", "<body>"),

+ d.dir("sub", [

+ d.file("index.html", "<sub>"),

+ ])

])

]).create();

pubServe();

- expectWebSocketResult("pathToUrls", {

- "path": p.join("web", "main.dart"),

- "line": 12345

- }, {

- "urls": [getServerUrl("web", "main.dart")],

- "line": 12345

- });

+ var webSub = path.join("web", "sub");

+ expectWebSocketError("serveDirectory", {"path": webSub}, 2,

+ 'Path "$webSub" overlaps already served directory "web".',

+ data: containsPair("directories", ["web"]));

endPubServe();

});