Skip to content

Run instance tests with frontend server #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 5, 2023
Merged

Run instance tests with frontend server #2160

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f605460
Run instance tests with frontend server
Jun 26, 2023
054ee50
Cleanup
Jun 26, 2023
48adf44
Try fixing tests
Jun 27, 2023
415f6c6
Addressed CR comments and fixed failing tests
Jun 28, 2023
30cf46c
update pubspec and build
Jun 28, 2023
3cd0b8f
Require AssetReader to provide a base path
Jun 28, 2023
da62478
Merge branch 'master' of github.com:dart-lang/webdev into annagrin/ru…
Jul 5, 2023
024a64d
Fix test failures on windows
Jul 5, 2023
a0a5d82
Merge with master
Jul 5, 2023
2cee1fd
Merge with master
Jul 5, 2023
0446322
Merge with master
Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions dwds/test/fixtures/context.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class TestContext {
Stream<BuildResults> buildResults;
RequireStrategy requireStrategy;
String basePath = '';
String index = project.filePathToServe;

_port = await findUnusedPort();
switch (compilationMode) {
Expand Down Expand Up @@ -279,7 +280,12 @@ class TestContext {
break;
case CompilationMode.frontendServer:
{
_logger.info('Index: ${project.filePathToServe}');
index = webCompatiblePath([
project.directoryToServe,
project.filePathToServe,
]);

_logger.info('Index: $index');

final entry = p.toUri(
p.join(project.webAssetsPath, project.dartEntryFileName),
Expand Down Expand Up @@ -311,7 +317,7 @@ class TestContext {
fileSystem,
hostname,
assetServerPort,
p.join(project.directoryToServe, project.filePathToServe),
index,
);

if (enableExpressionEvaluation) {
Expand Down Expand Up @@ -393,8 +399,8 @@ class TestContext {
);

_appUrl = basePath.isEmpty
? 'http://localhost:$port/${project.filePathToServe}'
: 'http://localhost:$port/$basePath/${project.filePathToServe}';
? 'http://localhost:$port/$index'
: 'http://localhost:$port/$basePath/$index';

if (launchChrome) {
await _webDriver?.get(appUrl);
Expand Down
Loading