Skip to content

Commit 7c1685d

Browse files
committed
fix tests
1 parent 71420b2 commit 7c1685d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lib/src/tools/webdev_serve_tool.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'dart:async';
22
import 'dart:io';
33

44
import 'package:args/args.dart';
5-
import 'package:dart_dev/src/utils/dart_semver_version.dart';
65
import 'package:io/ansi.dart';
76
import 'package:io/io.dart';
87
import 'package:logging/logging.dart';
@@ -11,6 +10,7 @@ import 'package:pub_semver/pub_semver.dart';
1110
import '../dart_dev_tool.dart';
1211
import '../utils/arg_results_utils.dart';
1312
import '../utils/assert_no_positional_args_nor_args_after_separator.dart';
13+
import '../utils/dart_semver_version.dart';
1414
import '../utils/executables.dart' as exe;
1515
import '../utils/global_package_is_active_and_compatible.dart';
1616
import '../utils/logging.dart';

test/tools/webdev_serve_tool_test.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:args/args.dart';
33
import 'package:args/command_runner.dart';
44
import 'package:dart_dev/src/dart_dev_tool.dart';
55
import 'package:dart_dev/src/tools/webdev_serve_tool.dart';
6+
import 'package:dart_dev/src/utils/dart_semver_version.dart';
67
import 'package:dart_dev/src/utils/executables.dart' as exe;
78
import 'package:io/ansi.dart';
89
import 'package:io/io.dart';
@@ -138,7 +139,7 @@ void main() {
138139

139140
setUpAll(() {
140141
pubCacheWithWebdev = TempPubCache();
141-
globalActivate('webdev', '^2.0.0',
142+
globalActivate('webdev', '^${dartSemverVersion.major}.0.0',
142143
environment: pubCacheWithWebdev.envOverride);
143144

144145
pubCacheWithoutWebdev = TempPubCache();
@@ -180,7 +181,8 @@ void main() {
180181
Logger.root.onRecord,
181182
emitsThrough(severeLogOf(allOf(
182183
contains('webdev serve could not run'),
183-
contains('dart pub global activate webdev ^2.0.0')))));
184+
contains(
185+
'dart pub global activate webdev ^${dartSemverVersion.major}.0.0')))));
184186

185187
expect(
186188
buildExecution(DevToolExecutionContext(),

0 commit comments

Comments
 (0)