core: update code for dio 4.0.0-prev3

CHANGELOG.md

@@ -1,5 +1,5 @@
 ## 2.0.0-rc.2
-- core: Update dio to 4.0.0-prev2.
+- core: Update dio to 4.0.0-prev3.
 - Renamed `cacheStoreForce` to `forceCache`.
 - Renamed `cacheStoreNo` to `noCache`.
 - Make `CacheOptions.store` required but still with optional value.

example/lib/main.dart

@@ -78,7 +78,7 @@ class _MyAppState extends State<MyApp> {
                   child: Text('Call (Refresh policy)'),
                 ),
                 RaisedButton(
-                  onPressed: () async => await _cacheStoreNoCall(),
+                  onPressed: () async => await _noCacheCall(),
                   child: Text('Call (Cache no store policy)'),
                 ),
                 Text(text),
@@ -90,8 +90,8 @@ class _MyAppState extends State<MyApp> {
     );
   }
 
-  Future _cacheStoreNoCall() async {
-    final resp = await _call(policy: CachePolicy.cacheStoreNo);
+  Future _noCacheCall() async {
+    final resp = await _call(policy: CachePolicy.noCache);
     if (resp == null) return;
     setState(() => text = _getResponseContent(resp));
   }
@@ -152,7 +152,7 @@ class _MyAppState extends State<MyApp> {
     buffer.writeln('Call returned ${response.statusCode}\n');
 
     buffer.writeln('Request headers:');
-    buffer.writeln('${response.request.headers.toString()}\n');
+    buffer.writeln('${response.requestOptions.headers.toString()}\n');
 
     buffer.writeln('Response headers (cache related):');
     if (date != null) {

example/pubspec.yaml

@@ -19,8 +19,6 @@ dependencies:
   path_provider: ^2.0.0
   sqlite3_flutter_libs: ^0.4.0+1
 
-  cupertino_icons: ^0.1.3
-
 # The following section is specific to Flutter.
 flutter:
   uses-material-design: true

pubspec.yaml

@@ -3,14 +3,14 @@ description: Dio HTTP cache interceptor with multiple stores respecting HTTP dir
 repository: https://github.com/llfbandit/dio_cache_interceptor
 issue_tracker: https://github.com/llfbandit/dio_cache_interceptor/issues
 
-version: 2.0.0-rc.1
+version: 2.0.0-rc.2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   # https://pub.dev/packages/dio
-  dio: ^4.0.0-prev2
+  dio: ^4.0.0-prev3
   # https://pub.dev/packages/moor
   moor: ^4.1.0
   # https://pub.dev/packages/path

test/cache_interceptor_test.dart

@@ -34,16 +34,9 @@ void main() {
 
   test('Fetch canceled', () async {
     try {
-      final ct = CancelToken();
-      // ignore: unawaited_futures
-      Future.delayed(const Duration(milliseconds: 200)).then(
-        (value) => ct.cancel(),
-      );
-
-      // cancel waits for 400 milli seconds
       await _dio.get(
-        '${MockHttpClientAdapter.mockBase}/cancel',
-        cancelToken: ct,
+        '${MockHttpClientAdapter.mockBase}/ok',
+        cancelToken: CancelToken()..cancel(),
       );
     } catch (err) {
       expect(err is DioError, isTrue);

test/mock_httpclient_adapter.dart

@@ -57,15 +57,6 @@ class MockHttpClientAdapter extends HttpClientAdapter {
             Headers.contentTypeHeader: [Headers.jsonContentType]
           },
         );
-      case '/cancel':
-        await Future.delayed(const Duration(milliseconds: 400));
-        return ResponseBody.fromString(
-          jsonEncode({'path': uri.path}),
-          200,
-          headers: {
-            Headers.contentTypeHeader: [Headers.jsonContentType]
-          },
-        );
       case '/exception':
         if (options.extra.containsKey('x-err')) {
           throw DioError(