Skip to content
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

Jump to bottom

Only alert about new prereleases for prereleases #2556

Merged
merged 2 commits into from
Jul 10, 2020
Merged

Only alert about new prereleases for prereleases #2556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf68f5
Only alert about new prereleases for prereleases
sigurdm Jul 9, 2020
3aa1399
Fix test
sigurdm Jul 10, 2020
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
5 changes: 4 additions & 1 deletion lib/src/solver/report.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,10 @@ class SolveReport {
String message;
if (newerStable) {
message = '(${maxAll(versions, Version.prioritize)} available)';
} else if (newerUnstable) {
} else if (
// Only show newer prereleases for versions where a prerelease is
// already chosen.
newId.version.isPreRelease && newerUnstable) {
message = '(${maxAll(versions)} available)';
}

Expand Down
2 changes: 1 addition & 1 deletion test/upgrade/report/does_not_show_newer_versions_for_locked_packages_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void main() {
await pubUpgrade(args: ['upgraded'], output: RegExp(r'''
Resolving dependencies\.\.\..*
not_upgraded 1\.0\.0
. upgraded 2\.0\.0 \(was 1\.0\.0\) \(3\.0\.0-dev available\)
. upgraded 2\.0\.0 \(was 1\.0\.0\)
''', multiLine: true), environment: {'PUB_ALLOW_PRERELEASE_SDK': 'false'});
});
}
13 changes: 11 additions & 2 deletions test/upgrade/report/shows_newer_available_versions_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@ void main() {
builder.serve('multiple_newer_unstable', '1.0.0');
builder.serve('multiple_newer_unstable', '1.0.1-unstable.1');
builder.serve('multiple_newer_unstable', '1.0.1-unstable.2');
builder.serve('multiple_newer_unstable2', '1.0.1-unstable.1');
builder.serve('multiple_newer_unstable2', '1.0.1-unstable.2');
builder.serve('multiple_newer_unstable2', '1.0.1-unstable.2');
builder.serve('no_newer', '1.0.0');
builder.serve('one_newer_unstable', '1.0.0');
builder.serve('one_newer_unstable', '1.0.1-unstable.1');
builder.serve('one_newer_unstable2', '1.0.1-unstable.1');
builder.serve('one_newer_unstable2', '1.0.1-unstable.2');
builder.serve('one_newer_stable', '1.0.0');
builder.serve('one_newer_stable', '1.0.1');
});
Expand All @@ -32,8 +37,10 @@ void main() {
'multiple_newer': '1.0.0',
'multiple_newer_stable': '1.0.0',
'multiple_newer_unstable': '1.0.0',
'multiple_newer_unstable2': '1.0.1-unstable.1',
'no_newer': '1.0.0',
'one_newer_unstable': '1.0.0',
'one_newer_unstable2': '1.0.1-unstable.1',
'one_newer_stable': '1.0.0'
}).create();

Expand All @@ -42,10 +49,12 @@ void main() {
Resolving dependencies\.\.\..*
. multiple_newer 1\.0\.0 \(1\.0\.1 available\)
. multiple_newer_stable 1\.0\.0 \(1\.0\.2\ available\)
. multiple_newer_unstable 1\.0\.0 \(1\.0\.1-unstable\.2 available\)
. multiple_newer_unstable 1\.0\.0
. multiple_newer_unstable2 1\.0\.1-unstable\.1 \(1\.0\.1-unstable\.2 available\)
. no_newer 1\.0\.0
. one_newer_stable 1\.0\.0 \(1\.0\.1 available\)
. one_newer_unstable 1\.0\.0 \(1\.0\.1-unstable\.1 available\)
. one_newer_unstable 1\.0\.0
. one_newer_unstable2 1\.0\.1-unstable\.1 \(1\.0\.1-unstable\.2 available\)
''', multiLine: true), environment: {'PUB_ALLOW_PRERELEASE_SDK': 'false'});
});
}