Skip to content

Commit 8795ca5

Browse files
authored
Tests should servemain.dart and index.html from the same directory (#1856)
1 parent b127883 commit 8795ca5

File tree

5 files changed

+38
-4
lines changed

5 files changed

+38
-4
lines changed

dwds/test/fixtures/context.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class TestContext {
127127
nullSafety == NullSafety.sound ? '_testSound' : '_test';
128128
final defaultDirectory = p.join('..', 'fixtures', defaultPackage);
129129
final defaultEntry = p.join('..', 'fixtures', defaultPackage, 'example',
130-
'append_body', 'main.dart');
130+
'hello_world', 'main.dart');
131131

132132
workingDirectory =
133133
absolutePath(pathFromDwds: directory ?? defaultDirectory);

dwds/test/inspector_test.dart

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,23 @@ import 'package:dwds/src/debugging/debugger.dart';
1111
import 'package:dwds/src/debugging/inspector.dart';
1212
import 'package:dwds/src/loaders/strategy.dart';
1313
import 'package:dwds/src/utilities/conversions.dart';
14+
import 'package:path/path.dart' as p;
1415
import 'package:test/test.dart';
1516
import 'package:vm_service/vm_service.dart';
1617
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1718

1819
import 'fixtures/context.dart';
1920

20-
final context = TestContext(path: 'scopes/scopes.html');
21+
final context = TestContext(
22+
path: 'scopes/scopes.html',
23+
entry: p.join(
24+
'..',
25+
'fixtures',
26+
'_testSound',
27+
'example',
28+
'scopes',
29+
'scopes_main.dart',
30+
));
2131

2232
WipConnection get tabConnection => context.tabConnection;
2333

dwds/test/instance_test.dart

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,23 @@ import 'package:dwds/src/connections/debug_connection.dart';
99
import 'package:dwds/src/debugging/debugger.dart';
1010
import 'package:dwds/src/debugging/inspector.dart';
1111
import 'package:dwds/src/loaders/strategy.dart';
12+
import 'package:path/path.dart' as p;
1213
import 'package:test/test.dart';
1314
import 'package:vm_service/vm_service.dart';
1415
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1516

1617
import 'fixtures/context.dart';
1718

18-
final context = TestContext(path: 'scopes/scopes.html');
19+
final context = TestContext(
20+
path: 'scopes/scopes.html',
21+
entry: p.join(
22+
'..',
23+
'fixtures',
24+
'_testSound',
25+
'example',
26+
'scopes',
27+
'scopes_main.dart',
28+
));
1929

2030
WipConnection get tabConnection => context.tabConnection;
2131

dwds/test/reload_test.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
@TestOn('vm')
77
@Timeout(Duration(minutes: 5))
88
import 'package:dwds/src/loaders/strategy.dart';
9+
import 'package:path/path.dart' as p;
910
import 'package:test/test.dart';
1011
import 'package:vm_service/vm_service.dart';
1112

@@ -14,6 +15,8 @@ import 'fixtures/logging.dart';
1415

1516
final context = TestContext(
1617
path: 'append_body/index.html',
18+
entry: p.join(
19+
'..', 'fixtures', '_testSound', 'example', 'append_body', 'main.dart'),
1720
);
1821

1922
void main() {

dwds/test/variable_scope_test.dart

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,24 @@
77
import 'package:dwds/src/connections/debug_connection.dart';
88
import 'package:dwds/src/debugging/dart_scope.dart';
99
import 'package:dwds/src/services/chrome_proxy_service.dart';
10+
import 'package:path/path.dart' as p;
1011
import 'package:test/test.dart';
1112
import 'package:vm_service/vm_service.dart';
1213
import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart';
1314

1415
import 'fixtures/context.dart';
1516

16-
final context = TestContext(path: 'scopes/scopes.html');
17+
final context = TestContext(
18+
path: 'scopes/scopes.html',
19+
entry: p.join(
20+
'..',
21+
'fixtures',
22+
'_testSound',
23+
'example',
24+
'scopes',
25+
'scopes_main.dart',
26+
));
27+
1728
ChromeProxyService get service =>
1829
fetchChromeProxyService(context.debugConnection);
1930
WipConnection get tabConnection => context.tabConnection;

0 commit comments

Comments
 (0)