commit 3d3e8f528a8670d10e9a8df67b69ca151bcb5d03
author Natalie Weizenbaum <nweiz@google.com> Thu Mar 03 13:32:21 2016 -0800
committer Natalie Weizenbaum <nweiz@google.com> Thu Mar 03 13:32:21 2016 -0800
tree d7013abb6e30288ef0e438e49ed1fbec5bafef2b
parent a679d005420e797884ea508ea59766f18f283014
parent 4b2ef9dec05268a8952014392313690749e07b13

Merge branch 'web-socket-channel' into 0.12.11+x

Closes #401

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9566b2c..218f80b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.12.11+2
+
+* Update to `shelf_web_socket` 0.2.0.
+
 ## 0.12.11+1
 
 * Purely internal change.

lib/src/runner/browser/browser_manager.dart

diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index 513c2a7..12d9b8b 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -6,9 +6,9 @@
 import 'dart:convert';
 
 import 'package:async/async.dart';
-import 'package:http_parser/http_parser.dart';
 import 'package:pool/pool.dart';
 import 'package:stream_channel/stream_channel.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
 
 import '../../backend/metadata.dart';
 import '../../backend/test_platform.dart';

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index 4763f66..0345b5f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test
-version: 0.12.11+1
+version: 0.12.11+2
 author: Dart Team <misc@dartlang.org>
 description: A library for writing dart unit tests.
 homepage: https://github.com/dart-lang/test
@@ -15,19 +15,19 @@
   crypto: '^0.9.0'
   glob: '^1.0.0'
   http_multi_server: '>=1.0.0 <3.0.0'
-  http_parser: '>=0.0.2 <3.0.0'
   path: '^1.2.0'
   pool: '^1.2.0'
   pub_semver: '^1.0.0'
   shelf: '>=0.6.5 <0.8.0'
   shelf_static: '^0.2.0'
-  shelf_web_socket: '^0.1.0'
+  shelf_web_socket: '^0.2.0'
   source_map_stack_trace: '^1.0.0'
   source_maps: '^0.10.1'
   source_span: '^1.0.0'
   stack_trace: '^1.2.1'
   stream_channel: '^1.3.1'
   string_scanner: '^0.1.1'
+  web_socket_channel: '^1.0.0'
   yaml: '>=0.9.0 <3.0.0'
 
   # Use a tight version constraint to ensure that a constraint on matcher

test/runner/browser/code_server.dart

diff --git a/test/runner/browser/code_server.dart b/test/runner/browser/code_server.dart
index fcba73c..e617116 100644
--- a/test/runner/browser/code_server.dart
+++ b/test/runner/browser/code_server.dart
@@ -4,10 +4,10 @@
 
 import 'dart:async';
 
-import 'package:http_parser/http_parser.dart';
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf_web_socket/shelf_web_socket.dart';
 import 'package:scheduled_test/scheduled_server.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
 
 /// A class that schedules a server to serve Dart and/or JS code and receive
 /// WebSocket connections.