From edd1daa63df54d46b6e12a7566ecb10cc197f4c5 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 5 Jun 2017 14:09:52 -0700 Subject: [PATCH 1/4] fix tests due to doesNotComplete matcher in package:test --- pubspec.yaml | 2 +- test/server/utils.dart | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 57a1e37..e1a2a92 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,6 +7,6 @@ dependencies: stack_trace: '>=0.9.1 <2.0.0' stream_channel: '^1.1.0' dev_dependencies: - test: ">=0.12.0 <0.13.0" + test: "^0.12.21" environment: sdk: ">=1.8.0 <2.0.0" diff --git a/test/server/utils.dart b/test/server/utils.dart index f33cb13..02d9f34 100644 --- a/test/server/utils.dart +++ b/test/server/utils.dart @@ -61,20 +61,6 @@ void expectErrorResponse(ServerController controller, request, int errorCode, }))); } -/// Returns a matcher that matches [Future]s that never complete. -Matcher get doesNotComplete => predicate((future) { - future.then(expectAsync((_) { - // This will never be called. [expectAsync] with `count: 0` ensures that an - // error will be thrown when [future] completes. - }, count: 0)); - - // Make sure there's enough time in the test for [expectAsync] to fail if it's - // going to. - expect(pumpEventQueue(), completes); - - return true; -}); - /// Returns a matcher that matches a [json_rpc.RpcException] with an /// `invalid_params` error code. Matcher throwsInvalidParams(String message) { From 3bbcf4cebca187ccc0dd0e4a0e2a1d754a197323 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 5 Jun 2017 14:11:27 -0700 Subject: [PATCH 2/4] create new version --- CHANGELOG.md | 4 ++++ pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b6fdd1..cc62e35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.5 + +* Fix tests due to new `doesNotComplete` matcher in package:test + ## 2.0.4 * `Client.sendRequest()` now throws a `StateError` if the client is closed while diff --git a/pubspec.yaml b/pubspec.yaml index e1a2a92..9e84f3b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: json_rpc_2 -version: 2.0.4 +version: 2.0.5 author: Dart Team description: An implementation of the JSON-RPC 2.0 spec. homepage: http://github.com/dart-lang/json_rpc_2 From 3632f90cbab4d33db11b9825e7af09b2cdb02a2f Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 5 Jun 2017 14:25:34 -0700 Subject: [PATCH 3/4] change version to dev --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 9e84f3b..724e4d7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: json_rpc_2 -version: 2.0.5 +version: 2.0.5-dev author: Dart Team description: An implementation of the JSON-RPC 2.0 spec. homepage: http://github.com/dart-lang/json_rpc_2 From 4fc9a04a464b21973a21732ee309c198e1a2d244 Mon Sep 17 00:00:00 2001 From: Gary Roumanis Date: Mon, 5 Jun 2017 14:30:55 -0700 Subject: [PATCH 4/4] remove changelog entry --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc62e35..0b6fdd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.5 - -* Fix tests due to new `doesNotComplete` matcher in package:test - ## 2.0.4 * `Client.sendRequest()` now throws a `StateError` if the client is closed while