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