From 7acbcb710c6b2b7aa466d19e651b4b7dc7750622 Mon Sep 17 00:00:00 2001
From: "nweiz@google.com" <nweiz@google.com>
Date: Thu, 6 Nov 2014 01:40:47 +0000
Subject: [PATCH] Fix dart2js tests in pub.
Pub's [requestShouldSucceed] test helper didn't verify that the
request returned a 200 response, which was masking some issues.
R=rnystrom@google.com
Review URL: https://codereview.chromium.org//704053002
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@41541 260f80e4-7a28-3924-810f-c04153c831b5
---
lib/src/barback/dart2js_transformer.dart | 2 +-
test/dart2js/minify_configuration_overrides_mode_test.dart | 5 ++++-
test/dart2js/supports_valid_options_test.dart | 6 ++++--
test/serve/utils.dart | 1 +
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/src/barback/dart2js_transformer.dart b/lib/src/barback/dart2js_transformer.dart
index 0200ac38..41427e6d 100644
--- a/lib/src/barback/dart2js_transformer.dart
+++ b/lib/src/barback/dart2js_transformer.dart
@@ -24,7 +24,7 @@ import 'asset_environment.dart';
/// The set of all valid configuration options for this transformer.
final _validOptions = new Set<String>.from([
'commandLineOptions', 'checked', 'csp', 'minify', 'verbose', 'environment',
- 'analyzeAll', 'preserveUris', 'suppressWarnings', 'suppressHints',
+ 'preserveUris', 'suppressWarnings', 'suppressHints',
'suppressPackageWarnings', 'terse'
]);
diff --git a/test/dart2js/minify_configuration_overrides_mode_test.dart b/test/dart2js/minify_configuration_overrides_mode_test.dart
index 739bd9d0..da0e6bcc 100644
--- a/test/dart2js/minify_configuration_overrides_mode_test.dart
+++ b/test/dart2js/minify_configuration_overrides_mode_test.dart
@@ -15,7 +15,10 @@ main() {
"transformers": [{
"\$dart2js": {"minify": true}
}]
- })
+ }),
+ d.dir("web", [
+ d.file("main.dart", "void main() => print('Hello!');")
+ ])
]).create();
pubServe();
diff --git a/test/dart2js/supports_valid_options_test.dart b/test/dart2js/supports_valid_options_test.dart
index 4bf175a7..81212b05 100644
--- a/test/dart2js/supports_valid_options_test.dart
+++ b/test/dart2js/supports_valid_options_test.dart
@@ -22,14 +22,16 @@ main() {
"minify": true,
"verbose": true,
"environment": {"name": "value"},
- "analyzeAll": true,
"suppressWarnings": true,
"suppressHints": true,
"suppressPackageWarnings": false,
"terse": true
}
}]
- })
+ }),
+ d.dir("web", [
+ d.file("main.dart", "void main() => print('Hello!');")
+ ])
]).create();
// None of these options should be rejected, either by pub or by dart2js.
diff --git a/test/serve/utils.dart b/test/serve/utils.dart
index 9516cd2d..f84eb9a3 100644
--- a/test/serve/utils.dart
+++ b/test/serve/utils.dart
@@ -260,6 +260,7 @@ Future<http.Response> scheduleRequest(String urlPath, {String root}) {
/// [headers] may be either a [Matcher] or a map to match an exact headers map.
void requestShouldSucceed(String urlPath, expectation, {String root, headers}) {
scheduleRequest(urlPath, root: root).then((response) {
+ expect(response.statusCode, equals(200));
if (expectation != null) expect(response.body, expectation);
if (headers != null) expect(response.headers, headers);
});
--
GitLab