Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart

Issue 141113011: Support directories other than "web" in pub build. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Revise. Created 6 years, 11 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
Index: sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart
diff --git a/sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart b/sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart
index 9bd4ff41a7d552df57b5a75013d94000d01bd7f8..f8bf83d37189af2b247f291bd99816713c0cefbc 100644
--- a/sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart
+++ b/sdk/lib/_internal/pub/test/build/copies_browser_js_next_to_entrypoints_test.dart
@@ -4,7 +4,6 @@
import 'dart:convert';
-import 'package:path/path.dart' as path;
import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
@@ -51,37 +50,62 @@ main() {
d.dir(appPath, [
d.appPubspec({"browser": "1.0.0"}),
- d.dir('web', [
+ d.dir('example', [
d.file('file.dart', 'void main() => print("hello");'),
d.dir('subdir', [
d.file('subfile.dart', 'void main() => print("subhello");')
])
+ ]),
+ d.dir('web', [
+ d.file('file.dart', 'void main() => print("hello");'),
+ d.dir('subweb', [
+ d.file('subfile.dart', 'void main() => print("subhello");')
+ ])
])
]).create();
pubGet();
- schedulePub(args: ["build"],
- output: new RegExp(r"Built 12 files!"),
- exitCode: 0);
+ schedulePub(args: ["build", "--all"],
+ output: new RegExp(r"Built 20 files!"));
d.dir(appPath, [
d.dir('build', [
- d.matcherFile('file.dart.js', isNot(isEmpty)),
- d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
- d.matcherFile('file.dart.js.map', isNot(isEmpty)),
- d.dir('packages', [d.dir('browser', [
- d.file('dart.js', 'contents of dart.js'),
- d.file('interop.js', 'contents of interop.js')
- ])]),
- d.dir('subdir', [
+ d.dir('example', [
+ d.matcherFile('file.dart.js', isNot(isEmpty)),
+ d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
+ d.matcherFile('file.dart.js.map', isNot(isEmpty)),
d.dir('packages', [d.dir('browser', [
d.file('dart.js', 'contents of dart.js'),
d.file('interop.js', 'contents of interop.js')
])]),
- d.matcherFile('subfile.dart.js', isNot(isEmpty)),
- d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
- d.matcherFile('subfile.dart.js.map', isNot(isEmpty))
+ d.dir('subdir', [
+ d.dir('packages', [d.dir('browser', [
+ d.file('dart.js', 'contents of dart.js'),
+ d.file('interop.js', 'contents of interop.js')
+ ])]),
+ d.matcherFile('subfile.dart.js', isNot(isEmpty)),
+ d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
+ d.matcherFile('subfile.dart.js.map', isNot(isEmpty))
+ ])
+ ]),
+ d.dir('web', [
+ d.matcherFile('file.dart.js', isNot(isEmpty)),
+ d.matcherFile('file.dart.precompiled.js', isNot(isEmpty)),
+ d.matcherFile('file.dart.js.map', isNot(isEmpty)),
+ d.dir('packages', [d.dir('browser', [
+ d.file('dart.js', 'contents of dart.js'),
+ d.file('interop.js', 'contents of interop.js')
+ ])]),
+ d.dir('subweb', [
+ d.dir('packages', [d.dir('browser', [
+ d.file('dart.js', 'contents of dart.js'),
+ d.file('interop.js', 'contents of interop.js')
+ ])]),
+ d.matcherFile('subfile.dart.js', isNot(isEmpty)),
+ d.matcherFile('subfile.dart.precompiled.js', isNot(isEmpty)),
+ d.matcherFile('subfile.dart.js.map', isNot(isEmpty))
+ ])
])
])
]).validate();

Powered by Google App Engine
This is Rietveld 408576698