Skip to content

Commit

Permalink
Merge pull request #26 from Workiva/batch/fedx/unblock_analyzer1
Browse files Browse the repository at this point in the history
Unblock Analyzer 1
  • Loading branch information
rmconsole7-wk authored Dec 22, 2022
2 parents 6bb2cfb + 6ec7fac commit 341c2b7
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dart_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
sdk: [ stable, 2.13.4, dev ]
sdk: [ stable, 2.13.4 ]
steps:
- uses: actions/checkout@v2
- uses: dart-lang/[email protected]
Expand All @@ -33,5 +33,5 @@ jobs:
run: dart analyze

- name: Tests
run: dart test
run: dart test --chain-stack-traces
if: ${{ matrix.sdk == '2.13.4' }}
34 changes: 17 additions & 17 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ environment:
sdk: ">=2.11.0 <3.0.0"

dependencies:
args: '>=1.5.1 <3.0.0'
glob: ^1.1.7
http: ^0.12.0
http_multi_server: ^2.1.0
io: '>=0.3.3 <2.0.0'
logging: '>=0.11.3+2 <2.0.0'
meta: ">=1.1.7 <1.7.0" # pin to avoid issue in 1.7.0
pedantic: ^1.7.0
pub_semver: '>=1.4.2 <3.0.0'
shelf: ^0.7.2
shelf_proxy: ^0.1.0
stack_trace: ^1.9.3
args: ^2.3.1
glob: ^2.0.1
http: ^0.13.3
http_multi_server: ^3.2.1
io: ^1.0.3
logging: ^1.1.0
meta: ^1.8.0
pedantic: ^1.11.1
pub_semver: ^2.1.2
shelf: ^1.2.0
shelf_proxy: ^1.0.0
stack_trace: ^1.10.0

dev_dependencies:
# These two build deps are required by webdev.
build_runner: '>=1.5.1 <3.0.0'
build_web_compilers: '>=2.12.0 <3.0.0'
build_runner: ^2.1.2
build_web_compilers: ^3.0.0

shelf_static: ^0.2.8
sse: ^3.6.1
test: ^1.6.3
shelf_static: ^1.1.0
sse: ^4.1.0
test: ^1.17.12
webdriver: ^3.0.0

executables:
Expand Down
10 changes: 5 additions & 5 deletions test/proxy_server_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void main() {
);

final response =
await http.get('http://localhost:${proxy.port}/index.dart');
await http.get(Uri.parse('http://localhost:${proxy.port}/index.dart'));
expect(response.statusCode, 200);
expect(response.body, isNotEmpty);
});
Expand Down Expand Up @@ -89,8 +89,8 @@ void main() {
rewrite404s: true,
);

final response =
await http.get('http://localhost:${proxy.port}/path/to/nothing');
final response = await http
.get(Uri.parse('http://localhost:${proxy.port}/path/to/nothing'));
expect(response.statusCode, 200);
expect(response.body, startsWith('<!DOCTYPE html>'));
});
Expand All @@ -103,8 +103,8 @@ void main() {
rewrite404s: false,
);

final response =
await http.get('http://localhost:${proxy.port}/path/to/nothing');
final response = await http
.get(Uri.parse('http://localhost:${proxy.port}/path/to/nothing'));
expect(response.statusCode, 404);
});
}
10 changes: 5 additions & 5 deletions test/webdev_proxy_server_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void main() {
);

final response =
await http.get('http://localhost:${proxy.port}/index.dart');
await http.get(Uri.parse('http://localhost:${proxy.port}/index.dart'));
expect(response.statusCode, 200);
expect(response.body, isNotEmpty);
});
Expand All @@ -87,8 +87,8 @@ void main() {
rewrite404s: true,
);

final response =
await http.get('http://localhost:${proxy.port}/path/to/nothing');
final response = await http
.get(Uri.parse('http://localhost:${proxy.port}/path/to/nothing'));
expect(response.statusCode, 200);
expect(response.body, startsWith('<!DOCTYPE html>'));
});
Expand All @@ -101,8 +101,8 @@ void main() {
rewrite404s: false,
);

final response =
await http.get('http://localhost:${proxy.port}/path/to/nothing');
final response = await http
.get(Uri.parse('http://localhost:${proxy.port}/path/to/nothing'));
expect(response.statusCode, 404);
});
}
3 changes: 2 additions & 1 deletion test/webdev_server_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ void main() async {
http.Response response;
while (true) {
try {
response = await http.get('http://localhost:$port/web/index.dart');
response =
await http.get(Uri.parse('http://localhost:$port/web/index.dart'));
} catch (_) {
await Future.delayed(Duration(milliseconds: 250));
continue;
Expand Down

0 comments on commit 341c2b7

Please sign in to comment.