mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure Dart 1 compat

Browse source
This commit is contained in:
Tobe O 2018-07-09 12:21:14 -04:00
parent 046c1f7807
commit 525e72c510
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
example/main.dart
View file

@ -1,8 +1,8 @@
import 'dart:io';
import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/angel_framework.dart';
import 'package:angel_test/angel_test.dart'; import 'package:angel_test/angel_test.dart';
import 'package:angel_validate/angel_validate.dart'; import 'package:angel_validate/angel_validate.dart';
import 'package:angel_websocket/server.dart'; import 'package:angel_websocket/server.dart';
import 'package:dart2_constant/io.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
main() { main() {
@ -97,7 +97,6 @@ main() {
test('hasValidBody+hasContentType', () async { test('hasValidBody+hasContentType', () async {
var res = await client.get('/valid'); var res = await client.get('/valid');
expect(res, hasContentType('application/json')); expect(res, hasContentType('application/json'));
expect(res, hasContentType(new ContentType('application', 'json')));
expect( expect(
res, res,
hasValidBody(new Validator({ hasValidBody(new Validator({

5
lib/src/client.dart
View file

@ -1,6 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert' show Encoding; import 'dart:convert' show Encoding;
import 'dart:io' show ContentType, Cookie, HttpSession, HttpServer, WebSocket; import 'dart:io' show ContentType, Cookie, HttpServer, HttpSession, WebSocket;
import 'package:dart2_constant/convert.dart'; import 'package:dart2_constant/convert.dart';
import 'package:dart2_constant/io.dart' hide WebSocket; import 'package:dart2_constant/io.dart' hide WebSocket;
import 'package:angel_client/base_angel_client.dart' as client; import 'package:angel_client/base_angel_client.dart' as client;
@ -138,8 +138,9 @@ class TestClient extends client.BaseAngelClient {
Stream<List<int>> stream = rs; Stream<List<int>> stream = rs;
if (autoDecodeGzip != false && if (autoDecodeGzip != false &&
rs.headers['content-encoding']?.contains('gzip') == true) rs.headers['content-encoding']?.contains('gzip') == true) {
stream = stream.transform(gzip.decoder); stream = stream.transform(gzip.decoder);
}
return new StreamedResponse(stream, rs.statusCode, return new StreamedResponse(stream, rs.statusCode,
contentLength: rs.contentLength, contentLength: rs.contentLength,

2
lib/src/matchers.dart
View file

@ -133,7 +133,7 @@ class _HasHeader extends Matcher {
.matches(item.headers.keys, matchState); .matches(item.headers.keys, matchState);
} else { } else {
if (!item.headers.containsKey(key.toLowerCase())) return false; if (!item.headers.containsKey(key.toLowerCase())) return false;
Iterable v = value is Iterable ? value : [value]; Iterable v = value is Iterable ? (value as Iterable) : [value];
return v return v
.map((x) => x.toString()) .map((x) => x.toString())
.every(item.headers[key.toLowerCase()].split(',').contains); .every(item.headers[key.toLowerCase()].split(',').contains);

4
test/simple_test.dart
View file

@ -1,8 +1,9 @@
import 'dart:io'; import 'dart:io' show ContentType;
import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/angel_framework.dart';
import 'package:angel_test/angel_test.dart'; import 'package:angel_test/angel_test.dart';
import 'package:angel_validate/angel_validate.dart'; import 'package:angel_validate/angel_validate.dart';
import 'package:angel_websocket/server.dart'; import 'package:angel_websocket/server.dart';
import 'package:dart2_constant/io.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
main() { main() {
@ -112,6 +113,7 @@ main() {
test('gzip decode', () async { test('gzip decode', () async {
var res = await client.get('/gzip'); var res = await client.get('/gzip');
print('Body: ${res.body}');
expect(res, hasHeader('content-encoding', 'gzip')); expect(res, hasHeader('content-encoding', 'gzip'));
expect(res, hasBody('Poop')); expect(res, hasBody('Poop'));
}); });