Fixes

cfug · Jan 21, 2024 · 4449817 · 4449817
1 parent 997b4ec
commit 4449817
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -56,7 +56,7 @@ jobs:
       - name: '[Verify step] Analyze Flutter packages'
         run: melos exec $(eval echo $IGNORED_PACKAGES) --flutter -- "flutter analyze --fatal-infos"
       - name: '[Verify step] Publish dry-run'
-        run: melos exec $(eval echo $IGNORED_PACKAGES) --ignore="*example*" --ignore="dio_tests" -- "dart pub publish --dry-run"
+        run: melos exec $(eval echo $IGNORED_PACKAGES) --ignore="*example*" --ignore="dio_test" -- "dart pub publish --dry-run"
       - name: '[Verify step] Test Dart packages [VM]'
         run: melos exec $(eval echo $IGNORED_PACKAGES) --ignore="*example*" --no-flutter -- "MELOS_ROOT_PATH/scripts/dart_test.sh --platform=vm"
       - name: '[Verify step] Test Dart packages [Chrome]'

diff --git a/dio/test/basic_test.dart b/dio/test/basic_test.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:dio/src/utils.dart';
 import 'package:test/test.dart';
 
 import 'mock/adapters.dart';
-import 'utils.dart';
 
 void main() {
   test('send with an invalid URL', () async {
@@ -15,7 +15,7 @@ void main() {
         allOf([
           isA<DioException>(),
           (DioException e) => e.type == (DioExceptionType.connectionError),
-          if (!isWeb) (DioException e) => e.error is SocketException,
+          if (!kIsWeb) (DioException e) => e.error is SocketException,
         ]),
       ),
     );

diff --git a/dio/test/cors_tests.dart b/dio/test/cors_tests.dart
@@ -1,8 +1,7 @@
 import 'package:dio/dio.dart';
+import 'package:dio_test/util.dart';
 import 'package:test/test.dart';
 
-import '../../dio_test/lib/src/matcher.dart';
-
 // Test that browsers can correctly classify requests as
 // either "simple" or "preflighted". Reference:
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#simple_requests

diff --git a/dio_test/lib/src/test/parameter_tests.dart b/dio_test/lib/src/test/parameter_tests.dart
@@ -1,8 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:test/test.dart';
 
-import '../utils.dart';
-
 void parameterTests(
   Dio Function() create,
 ) {

diff --git a/dio_test/lib/src/test/redirect_tests.dart b/dio_test/lib/src/test/redirect_tests.dart
@@ -23,7 +23,7 @@ void redirectTests(
       );
       expect(response.isRedirect, isTrue);
 
-      if (!isWeb) {
+      if (!kIsWeb) {
         // Redirects are not supported in web.
         // Rhe browser will follow the redirects automatically.
         expect(response.redirects.length, 1);
@@ -40,7 +40,7 @@ void redirectTests(
       );
       expect(response.isRedirect, isTrue);
 
-      if (!isWeb) {
+      if (!kIsWeb) {
         // Redirects are not supported in web.
         // The browser will follow the redirects automatically.
         expect(response.redirects.length, 3);

diff --git a/dio_test/lib/src/utils.dart b/dio_test/lib/src/utils.dart
@@ -1,3 +1,3 @@
-const isWeb = bool.hasEnvironment('dart.library.js_util')
+const kIsWeb = bool.hasEnvironment('dart.library.js_util')
     ? bool.fromEnvironment('dart.library.js_util')
     : identical(0, 0.0);