Skip to content

Commit

Permalink
Merge pull request #46 from Workiva/_testing_
Browse files Browse the repository at this point in the history
Newer deps to get to analyzer 6
  • Loading branch information
rm-astro-wf authored Sep 6, 2024
2 parents 9fe3d6e + ac5dea4 commit 3dc415a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.12

- Update ranges of dependencies so that in Dart 3 we can resolve to analyzer 6, while still working with Dart 2.19. https://github.com/Workiva/webdev_proxy/pull/46

## 0.1.11

- Update webdev installation message to use `dart pub global activate` rather
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ environment:

dependencies:
args: ^2.3.1
http: ^0.13.3
http: '>=0.13.3 <2.0.0'
http_multi_server: ^3.2.1
io: ^1.0.3
logging: ^1.1.0
Expand All @@ -25,8 +25,8 @@ dependencies:
dev_dependencies:
# These two build deps are required by webdev.
build_runner: ^2.1.2
build_web_compilers: ^3.0.0
lints: ^2.0.1
build_web_compilers: '>3.0.0 <5.0.0'
lints: '>=2.0.1 <5.0.0'

shelf_static: ^1.1.0
sse: ^4.1.0
Expand Down
3 changes: 1 addition & 2 deletions test/sse_proxy_handler_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ void main() {
await webdriver.get('http://localhost:${proxy.port}');
await serverSse.connections.next;
expect(serverSse.numberOfClients, 1);

await webdriver.get('chrome://version/');
await webdriver.quit();
expect(serverSse.numberOfClients, 0);
});
}
Expand Down
13 changes: 11 additions & 2 deletions test/webdev_proc_utils_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// limitations under the License.

@TestOn('vm')
import 'dart:io';

import 'package:pub_semver/pub_semver.dart';
import 'package:test/test.dart';

Expand All @@ -36,8 +38,15 @@ void main() {
});

test('with webdev activated', () async {
await activateWebdev('2.0.0');
expect(getGlobalWebdevVersion(), Version.parse('2.0.0'));
if (Platform.version.contains('2.19')) {
await activateWebdev('2.0.0');
expect(getGlobalWebdevVersion(), Version.parse('2.0.0'));
} else if (Platform.version.contains('3.')) {
await activateWebdev('3.0.0');
expect(getGlobalWebdevVersion(), Version.parse('3.0.0'));
} else {
throw Exception('Unsupported Dart version: ${Platform.version}');
}
});
});

Expand Down

0 comments on commit 3dc415a

Please sign in to comment.