Skip to content

Commit 1cf78c5

Browse files
Merge pull request #526 from NeoCoderMatrix86/409-add-import-of-text
409 add import of text
2 parents 9f6a752 + 5ad558d commit 1cf78c5

47 files changed

Lines changed: 1241 additions & 827 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AudioCuesheetEditor.End2EndTests/Models/AppBar.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ internal async Task RedoAsync()
6363
internal async Task OpenFileAsync(string file)
6464
{
6565
await OpenFileDialogAsync();
66-
await _page.Locator("#dropFileInputId_SelectFileDialog").GetByRole(AriaRole.Button, new() { Name = "Choose File" }).ClickAsync();
67-
await _page.Locator("#dropFileInputId_SelectFileDialog").GetByRole(AriaRole.Button, new() { Name = "Choose File" }).SetInputFilesAsync(file);
66+
await _page.GetByLabel("Open file upload").SetInputFilesAsync(file);
6867
}
6968

7069
internal async Task OpenFileDialogAsync()

AudioCuesheetEditor.End2EndTests/Models/ImportView.cs

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818

1919
namespace AudioCuesheetEditor.End2EndTests.Models
2020
{
21-
partial class ImportView(IPage page)
21+
partial class ImportView(IPage page, bool mobile)
2222
{
2323
[GeneratedRegex("^Scheme common data$")]
2424
private static partial Regex SchemeCommonData();
2525

2626
internal const string BaseUrl = "http://localhost:5132/";
2727

2828
private readonly IPage _page = page;
29+
private readonly bool _isMobile = mobile;
2930

3031
internal ILocator CuesheetArtistInput => _page.GetByRole(AriaRole.Textbox, new() { Name = "Cuesheet artist" });
3132

@@ -43,12 +44,30 @@ internal async Task GotoAsync()
4344

4445
internal async Task ImportFileAsync(string filepath)
4546
{
46-
await _page.GetByRole(AriaRole.Button, new() { Name = "Choose File" }).SetInputFilesAsync(filepath);
47+
await _page.GetByLabel("TextField file upload").SetInputFilesAsync(filepath);
48+
}
49+
50+
internal async Task ImportTextAsync(string text)
51+
{
52+
await _page.GetByRole(AriaRole.Textbox, new() { Name = "Please enter text or upload a" }).FillAsync(text);
53+
}
54+
55+
internal async Task Analyze()
56+
{
57+
await _page.GetByRole(AriaRole.Button, new() { Name = "Analyze" }).ClickAsync();
4758
}
4859

4960
internal async Task CompleteImportAsync()
5061
{
51-
await _page.GetByRole(AriaRole.Button, new() { Name = "Complete" }).ClickAsync();
62+
if (_isMobile)
63+
{
64+
await _page.Locator(".mud-button-root.mud-fab").ClickAsync();
65+
await _page.GetByText("Import data").ClickAsync();
66+
}
67+
else
68+
{
69+
await _page.GetByRole(AriaRole.Button, new() { Name = "Import data" }).ClickAsync();
70+
}
5271
}
5372

5473
internal async Task SelectTracksAsync(IEnumerable<int> trackTablePositions, Boolean uncheck = false)

AudioCuesheetEditor.End2EndTests/Tests/Desktop/BasicTest.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ public async Task KeyboardCommands_ShouldControlDialogs_WhenUsingEnterOrEscapeAs
110110
var bar = new AppBar(TestPage);
111111
var detailView = new DetailView(TestPage, DeviceName != null);
112112
await detailView.GotoAsync();
113-
await bar.OpenFileDialogAsync();
114-
await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
115-
await TestPage.Keyboard.PressAsync("Escape");
116113
await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
117114
await bar.OpenExportDialogAsync("Cuesheet");
118115
await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();

AudioCuesheetEditor.End2EndTests/Tests/Desktop/ImportTest.cs

Lines changed: 239 additions & 6 deletions
Large diffs are not rendered by default.

AudioCuesheetEditor.End2EndTests/Tests/Desktop/TracingTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,12 @@ await Expect(TestPage.GetByRole(AriaRole.Table)).ToMatchAriaSnapshotAsync(@"- ta
423423
public async Task UndoRedo_ShouldRestoreCuesheet_WhenUsingImport()
424424
{
425425
var bar = new AppBar(TestPage);
426-
var importView = new ImportView(TestPage);
426+
var importView = new ImportView(TestPage, DeviceName != null);
427427
await importView.GotoAsync();
428428
await importView.ImportFileAsync("Textimport with Cuesheetdata.txt");
429429
await importView.SetSchemeCommonDataAsync("Artist - Title - ");
430430
await importView.SelectSchemeCommonDataPlaceholderAsync("Cataloguenumber");
431+
await importView.Analyze();
431432
await Expect(bar.UndoButton).ToBeDisabledAsync();
432433
await Expect(bar.RedoButton).ToBeDisabledAsync();
433434
await importView.CompleteImportAsync();

AudioCuesheetEditor.End2EndTests/Tests/Smartphone/BasicTestSmartphone.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ public async Task KeyboardCommands_ShouldControlDialogs_WhenUsingEnterOrEscapeAs
109109
var bar = new AppBar(TestPage);
110110
var detailView = new DetailView(TestPage, DeviceName != null);
111111
await detailView.GotoAsync();
112-
await bar.OpenFileDialogAsync();
113-
await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();
114-
await TestPage.Keyboard.PressAsync("Escape");
115112
await TestPage.GetByRole(AriaRole.Dialog).WaitForAsync(new() { State = WaitForSelectorState.Detached });
116113
await bar.OpenExportDialogAsync("Cuesheet");
117114
await Expect(TestPage.GetByRole(AriaRole.Dialog)).ToBeVisibleAsync();

0 commit comments

Comments
 (0)