Set the correct mime types for assets served via pub serve.

nex3 · nex3 · commit 41b1dedda654 · 2014-02-11T21:45:53.000Z
R=rnystrom@google.com BUG=14815 Review URL: https://codereview.chromium.org//131233011 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@32580 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/_internal/pub/lib/src/barback/server.dart b/sdk/lib/_internal/pub/lib/src/barback/server.dart
@@ -9,6 +9,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:barback/barback.dart';
+import 'package:mime/mime.dart';
 import 'package:path/path.dart' as path;
 import 'package:stack_trace/stack_trace.dart';
 
@@ -114,6 +115,7 @@ class BarbackServer {
       return validateStream(asset.read()).then((stream) {
         _resultsController.add(
             new BarbackServerResult._success(request.uri, id));
+        request.response.headers.add('content-type', lookupMimeType(id.path));
         // TODO(rnystrom): Set content-type based on asset type.
         return Chain.track(request.response.addStream(stream)).then((_) {
           // Log successful requests both so we can provide debugging
diff --git a/sdk/lib/_internal/pub/test/serve/uses_appropriate_mime_types_test.dart b/sdk/lib/_internal/pub/test/serve/uses_appropriate_mime_types_test.dart
@@ -0,0 +1,37 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS d.file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library pub_tests;
+
+import 'package:scheduled_test/scheduled_test.dart';
+
+import '../descriptor.dart' as d;
+import '../test_pub.dart';
+import 'utils.dart';
+
+main() {
+  initConfig();
+  integration("uses appropriate mime types", () {
+    d.dir(appPath, [
+      d.appPubspec(),
+      d.dir("web", [
+        d.file("index.html", "<body>"),
+        d.file("file.dart", "main() => print('hello');"),
+        d.file("file.js", "console.log('hello');"),
+        d.file("file.css", "body {color: blue}")
+      ])
+    ]).create();
+
+    pubServe();
+    requestShouldSucceed("index.html", anything,
+        headers: containsPair('content-type', 'text/html'));
+    requestShouldSucceed("file.dart", anything,
+        headers: containsPair('content-type', 'application/dart'));
+    requestShouldSucceed("file.js", anything,
+        headers: containsPair('content-type', 'application/javascript'));
+    requestShouldSucceed("file.css", anything,
+        headers: containsPair('content-type', 'text/css'));
+    endPubServe();
+  });
+}
diff --git a/sdk/lib/_internal/pub/test/serve/utils.dart b/sdk/lib/_internal/pub/test/serve/utils.dart
@@ -169,10 +169,12 @@ void endPubServe() {
 /// verifies that it responds with a body that matches [expectation].
 ///
 /// [expectation] may either be a [Matcher] or a string to match an exact body.
-void requestShouldSucceed(String urlPath, expectation) {
+/// [headers] may be either a [Matcher] or a map to match an exact headers map.
+void requestShouldSucceed(String urlPath, expectation, {headers}) {
   schedule(() {
     return http.get("http://127.0.0.1:$_port/$urlPath").then((response) {
-      expect(response.body, expectation);
+      if (expectation != null) expect(response.body, expectation);
+      if (headers != null) expect(response.headers, headers);
     });
   }, "request $urlPath");
 }
