| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS d.file | |
| 2 // for details. All rights reserved. Use of this source code is governed by a | |
| 3 // BSD-style license that can be found in the LICENSE file. | |
| 4 | |
| 5 library pub_tests; | 1 library pub_tests; |
| 6 | |
| 7 import 'package:path/path.dart' as path; | 2 import 'package:path/path.dart' as path; |
| 8 import 'package:scheduled_test/scheduled_test.dart'; | 3 import 'package:scheduled_test/scheduled_test.dart'; |
| 9 | |
| 10 import '../../descriptor.dart' as d; | 4 import '../../descriptor.dart' as d; |
| 11 import '../../test_pub.dart'; | 5 import '../../test_pub.dart'; |
| 12 import '../utils.dart'; | 6 import '../utils.dart'; |
| 13 | |
| 14 main() { | 7 main() { |
| 15 initConfig(); | 8 initConfig(); |
| 16 integration("fails if the directory overlaps one already being served", () { | 9 integration("fails if the directory overlaps one already being served", () { |
| 17 d.dir(appPath, [ | 10 d.dir( |
| 18 d.appPubspec(), | 11 appPath, |
| 19 d.dir("web", [ | 12 [ |
| 20 d.file("index.html", "<body>"), | 13 d.appPubspec(), |
| 21 d.dir("sub", [ | 14 d.dir( |
| 22 d.file("index.html", "<sub>"), | 15 "web", |
| 23 ]) | 16 [ |
| 24 ]) | 17 d.file("index.html", "<body>"), |
| 25 ]).create(); | 18 d.dir("sub", [d.file("index.html", "<sub>")])])]).create(); |
| 26 | |
| 27 pubServe(); | 19 pubServe(); |
| 28 | |
| 29 var webSub = path.join("web", "sub"); | 20 var webSub = path.join("web", "sub"); |
| 30 expectWebSocketError("serveDirectory", {"path": webSub}, 2, | 21 expectWebSocketError("serveDirectory", { |
| 22 "path": webSub |
| 23 }, |
| 24 2, |
| 31 'Path "$webSub" overlaps already served directory "web".', | 25 'Path "$webSub" overlaps already served directory "web".', |
| 32 data: containsPair("directories", ["web"])); | 26 data: containsPair("directories", ["web"])); |
| 33 | |
| 34 endPubServe(); | 27 endPubServe(); |
| 35 }); | 28 }); |
| 36 } | 29 } |
| OLD | NEW |