Skip to content

Commit 5b7f789

Browse files
committed
Add e2e test
1 parent 345445b commit 5b7f789

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

e2e/Maui/MauiModule/ViewModels/ViewModelBase.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected ViewModelBase(BaseServices baseServices)
3030
ShowDialog = new DelegateCommand(OnShowDialogCommand, () => !string.IsNullOrEmpty(SelectedDialog))
3131
.ObservesProperty(() => SelectedDialog);
3232
GoBack = new DelegateCommand<string>(OnGoToBack);
33+
NavigateFrom = new DelegateCommand(OnNavigateFrom);
3334
}
3435

3536
public IEnumerable<string> AvailableDialogs { get; }
@@ -55,6 +56,8 @@ public string SelectedDialog
5556

5657
public DelegateCommand<string> GoBack { get; }
5758

59+
public DelegateCommand NavigateFrom { get; }
60+
5861
private void OnNavigateCommandExecuted(string uri)
5962
{
6063
Messages.Add($"OnNavigateCommandExecuted: {uri}");
@@ -83,6 +86,12 @@ private void OnGoToBack(string viewName)
8386
_navigationService.GoBackToAsync(viewName);
8487
}
8588

89+
private void OnNavigateFrom()
90+
{
91+
Messages.Add($"On Navigate From B To C");
92+
_navigationService.NavigateFromAsync("ViewB", "ViewC");
93+
}
94+
8695
public void Initialize(INavigationParameters parameters)
8796
{
8897
Messages.Add("ViewModel Initialized");

e2e/Maui/MauiModule/Views/ViewD.xaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
xmlns:loc="clr-namespace:MauiModule.ViewModels"
@@ -63,5 +63,10 @@
6363
Margin="10"
6464
Grid.Row="4"
6565
Grid.Column="0"/>
66+
<Button Text="Navigate From"
67+
Command="{Binding NavigateFrom}"
68+
Margin="10"
69+
Grid.Row="4"
70+
Grid.Column="1"/>
6671
</Grid>
6772
</ContentPage>

src/Maui/Prism.Maui/Navigation/INavigationServiceExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static Task<INavigationResult> NavigateFromAsync(this INavigationService
134134
/// <param name="route">The route as a string to navigate to</param>
135135
/// <param name="parameters">Additional parameters for the navigation.</param>
136136
/// <returns>If <c>true</c> a navigate from operation was successful. If <c>false</c> the navigate from operation failed.</returns>
137-
public static Task<INavigationResult> NavigateFromAsync(this INavigationService navigationService, string viewName, string route, NavigationParameters parameters) =>
137+
public static Task<INavigationResult> NavigateFromAsync(this INavigationService navigationService, string viewName, string route, INavigationParameters parameters) =>
138138
navigationService.NavigateFromAsync(viewName, new Uri(route, UriKind.RelativeOrAbsolute), parameters);
139139

140140
/// <summary>

0 commit comments

Comments
 (0)