Added browser clients tests including test fixes

Author: seifibrahim32

pkgs/http/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.0
+
+* Added caching options for `BrowserClient` with fixing tests.
+ 
 ## 1.4.0-wip
 
 * Fixed default encoding for application/json without a charset

pkgs/http/test/html/cache_test.dart

@@ -9,94 +9,76 @@ import 'dart:async';
 
 import 'package:http/browser_client.dart';
 import 'package:http/http.dart' as http;
-import 'package:http/src/exception.dart';
+import 'package:http/http.dart';
 import 'package:test/test.dart';
 
 import 'utils.dart';
 
 void main() {
-  late int port;
+  late Uri url;
   setUp(() async {
-    final channel = spawnHybridUri(Uri(path: '/test/stub_server.dart'),
-        stayAlive: true);
-    port = await channel.stream.first as int;
+    final channel = spawnHybridUri(Uri(path: '/test/stub_server.dart'));
+    var port = await channel.stream.first as int;
+    url = echoUrl.replace(port: port);
   });
 
-  test('#send a POST Request with default type', () async {
-    var client = BrowserClient();
-
-    var request = http.StreamedRequest('POST', echoUrl.replace(port: port));
-    var responseFuture = client.send(request);
-    request.sink.add('{"hello": "world"}'.codeUnits);
-    unawaited(request.sink.close());
-
-    var response = await responseFuture;
-
-    client.close();
-
-    expect(response.statusCode, 200);
-    expect('response', response.contentLength);
-    client.close();
-
-  });
-
-  test('#send a StreamedRequest with default type', () async {
+  test('#send a GET with default type', () async {
     var client = BrowserClient(cacheMode: CacheMode.defaultType);
-    var request = http.StreamedRequest('POST', echoUrl);
-    var responseFuture = client.send(request);
-    request.sink.add('{"hello": "world"}'.codeUnits);
-    unawaited(request.sink.close());
-
-    var response = await responseFuture;
-
+    await client.get(url);
+    var response = await client.get(url);
     client.close();
 
     expect(response.statusCode, 200);
     expect(response.reasonPhrase, 'OK');
-  }, skip: 'Need to fix server tests for browser');
+    expect(response.body, parse(allOf(containsPair('numOfRequests', 2))));
+  });
 
-  test('#send a POST Request with reload type', () async {
+  test('#send a GET Request with reload type', () async {
     var client = BrowserClient(cacheMode: CacheMode.reload);
+    await client.get(url);
+    var response = await client.get(url);
+    expect(response.body, parse(allOf(containsPair('numOfRequests', 2))));
+    client.close();
+  });
 
-    var responseFuture = client.post(echoUrl.replace(port: port));
+  test('#send a POST with no-cache type', () async {
+    var client = BrowserClient(cacheMode: CacheMode.noCache);
 
+    await client.post(url);
+    var response = await client.post(url);
     client.close();
+    expect(
+        response.body,
+        parse(anyOf(containsPair('numOfRequests', 2),
+            containsPair('cache-control', ['max-age=0']))));
+  });
 
-  }, skip: 'Need to fix server tests for browser');
+  test('#send a POST with no-store type', () async {
+    var client = BrowserClient(cacheMode: CacheMode.noStore);
 
-  test('#send a StreamedRequest with no-cache type', () async {
-    var client = BrowserClient(cacheMode: CacheMode.noCache);
-    var request = http.StreamedRequest('POST', echoUrl);
+    await client.post(url);
+    var response = await client.post(url);
+    client.close();
+    expect(response.body, parse(allOf(containsPair('numOfRequests', 2))));
+  });
 
-    var responseFuture = client.send(request);
-    request.sink.add('{"hello": "world"}'.codeUnits);
-    unawaited(request.sink.close());
-    var response = await responseFuture;
-    var bytesString = await response.stream.bytesToString();
+  test('#send a POST with force-store type', () async {
+    var client = BrowserClient(cacheMode: CacheMode.forceCache);
 
+    await client.post(url);
+    var response = await client.post(url);
     client.close();
-    expect(bytesString, contains('max-age=0'));
-  }, skip: 'Need to fix server tests for browser');
+    expect(response.body, parse(allOf(containsPair('numOfRequests', 2))));
+  });
 
   test('#send a StreamedRequest with only-if-cached type', () {
     var client = BrowserClient(cacheMode: CacheMode.onlyIfCached);
-    var request = http.StreamedRequest('POST', echoUrl);
+    var request = http.StreamedRequest('POST', url);
 
     expectLater(client.send(request), throwsA(isA<ClientException>()));
     request.sink.add('{"hello": "world"}'.codeUnits);
     unawaited(request.sink.close());
 
     client.close();
-  }, skip: 'Need to fix server tests for browser');
-
-  test('#send with an invalid URL', () {
-    var client = BrowserClient(cacheMode: CacheMode.onlyIfCached);
-    var url = Uri.http('http.invalid', '');
-    var request = http.StreamedRequest('POST', url);
-
-    expect(client.send(request), throwsClientException());
-
-    request.sink.add('{"hello": "world"}'.codeUnits);
-    request.sink.close();
-  }, skip: 'Need to fix server tests for browser');
+  });
 }

pkgs/http/test/html/client_test.dart

@@ -14,20 +14,30 @@ import 'package:test/test.dart';
 import 'utils.dart';
 
 void main() {
+  late int port;
+  setUpAll(() async {
+    final channel =
+        spawnHybridUri(Uri(path: '/test/stub_server.dart'), stayAlive: true);
+    port = await channel.stream.first as int;
+  });
+
   test('#send a StreamedRequest', () async {
     var client = BrowserClient();
-    var request = http.StreamedRequest('POST', echoUrl);
+    var request = http.StreamedRequest('POST', echoUrl.replace(port: port));
 
     var responseFuture = client.send(request);
     request.sink.add('{"hello": "world"}'.codeUnits);
     unawaited(request.sink.close());
 
     var response = await responseFuture;
+
     var bytesString = await response.stream.bytesToString();
+
     client.close();
 
-    expect(bytesString, equals('{"hello": "world"}'));
-  }, skip: 'Need to fix server tests for browser');
+    expect(bytesString,
+        parse(allOf(containsPair('body', '{"hello": "world"}'.codeUnits))));
+  });
 
   test('#send with an invalid URL', () {
     var client = BrowserClient();

pkgs/http/test/html/streamed_request_test.dart

@@ -14,27 +14,35 @@ import 'package:test/test.dart';
 import 'utils.dart';
 
 void main() {
+  late Uri url;
+  setUpAll(() async {
+    final channel =
+        spawnHybridUri(Uri(path: '/test/stub_server.dart'), stayAlive: true);
+    var port = await channel.stream.first as int;
+    url = echoUrl.replace(port: port);
+  });
   group('contentLength', () {
     test("works when it's set", () async {
-      var request = http.StreamedRequest('POST', echoUrl)
+      var request = http.StreamedRequest('POST', url)
         ..contentLength = 10
         ..sink.add([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
       unawaited(request.sink.close());
 
       final response = await BrowserClient().send(request);
 
-      expect(await response.stream.toBytes(),
-          equals([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]));
+      expect(await response.stream.bytesToString(),
+          parse(allOf(containsPair('body', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]))));
     });
 
     test("works when it's not set", () async {
-      var request = http.StreamedRequest('POST', echoUrl);
+      var request = http.StreamedRequest('POST', url);
       request.sink.add([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
       unawaited(request.sink.close());
 
       final response = await BrowserClient().send(request);
-      expect(await response.stream.toBytes(),
-          equals([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]));
+
+      expect(await response.stream.bytesToString(),
+          parse(allOf(containsPair('body', [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]))));
     });
-  }, skip: 'Need to fix server tests for browser');
+  });
 }

pkgs/http/test/stub_server.dart

@@ -11,6 +11,7 @@ import 'package:http/src/utils.dart';
 import 'package:stream_channel/stream_channel.dart';
 
 void hybridMain(StreamChannel<dynamic> channel) async {
+  var numOfRequests = 0;
   final server = await HttpServer.bind('localhost', 63618);
   final url = Uri.http('localhost:${server.port}', '');
   server.listen((request) async {
@@ -35,17 +36,6 @@ void hybridMain(StreamChannel<dynamic> channel) async {
       return;
     }
 
-    if (path == '/echo') {
-      response
-        ..headers.add("Access-Control-Allow-Origin", "localhost")
-        ..headers.add("Access-Control-Allow-Methods", "POST, GET")
-        ..statusCode = 200
-        ..contentLength = 31
-        ..write('object');
-      unawaited(response.close());
-      return;
-    }
-
     if (path == '/redirect') {
       response
         ..statusCode = 302
@@ -64,6 +54,14 @@ void hybridMain(StreamChannel<dynamic> channel) async {
       return;
     }
 
+    // For browser runtime testing...
+    if (path == '/echo') {
+      ++numOfRequests;
+      response
+        ..headers.add('Access-Control-Allow-Origin', '*')
+        ..headers.add('Access-Control-Allow-Methods', 'POST, GET');
+    }
+
     var requestBodyBytes = await ByteStream(request).toBytes();
     var encodingName = request.uri.queryParameters['response-encoding'];
     var outputEncoding =
@@ -99,6 +97,7 @@ void hybridMain(StreamChannel<dynamic> channel) async {
       'path': request.uri.path,
       if (requestBody != null) 'body': requestBody,
       'headers': headers,
+      if (path == '/echo') 'numOfRequests': numOfRequests
     };
 
     var body = json.encode(content);