Merge pull request #26 from SephVin/update-pw

SephVin · web-flow · commit f070e6a9b664 · 2025-12-16T14:30:07.000+05:00
Update pw
diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ public class RootByTextAttribute : Attribute, IRootLocatorAttribute
 # Минимальные требования
 
 + netstandard2.0 / NET6
-+ Playwright 1.51.0
++ Playwright 1.52.0
 + @skbkontur/react-ui 4.25.2 (рекомендуется использовать последние версии)
 
 # Запуск Storybook
diff --git a/readme/README-Controls.Extensions.md b/readme/README-Controls.Extensions.md
@@ -93,5 +93,5 @@ public class RootByTextAttribute : Attribute, IRootLocatorAttribute
 # Минимальные требования
 
 + netstandard2.0 / NET6
-+ Playwright 1.51.0
++ Playwright 1.52.0
 + @skbkontur/react-ui 4.25.2 (рекомендуется использовать последние версии)
diff --git a/readme/README-Controls.md b/readme/README-Controls.md
@@ -56,5 +56,5 @@ public new HeaderAssertions ExpectV2() => new(this);
 # Минимальные требования
 
 + netstandard2.0 / NET6
-+ Playwright 1.51.0
++ Playwright 1.52.0
 + @skbkontur/react-ui 4.25.2 (рекомендуется использовать последние версии)
diff --git a/src/Controls.Extensions/DropdownMenuExtensions.cs b/src/Controls.Extensions/DropdownMenuExtensions.cs
@@ -70,14 +70,4 @@ public static async Task WaitToContainItemsAsync(
         int timeoutInMilliseconds = 10000
     ) => await dropdownMenu.ExpectV2().ToContainItemsAsync(expectedItemsText, timeoutInMilliseconds)
         .ConfigureAwait(false);
-
-    public static async Task WaitToBeFocusedAsync(
-        this DropdownMenu dropdownMenu,
-        LocatorAssertionsToBeFocusedOptions? options = default
-    ) => await dropdownMenu.ExpectV2().ToBeFocusedAsync(options).ConfigureAwait(false);
-
-    public static async Task WaitNotToBeFocusedAsync(
-        this DropdownMenu dropdownMenu,
-        LocatorAssertionsToBeFocusedOptions? options = default
-    ) => await dropdownMenu.ExpectV2().NotToBeFocusedAsync(options).ConfigureAwait(false);
 }
diff --git a/src/Controls/Assertions/ButtonAssertions.cs b/src/Controls/Assertions/ButtonAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await buttonLocator.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await buttonLocator.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/CheckboxAssertions.cs b/src/Controls/Assertions/CheckboxAssertions.cs
@@ -46,6 +46,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/ComboboxAssertions.cs b/src/Controls/Assertions/ComboboxAssertions.cs
@@ -63,6 +63,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/ControlListAssertions.cs b/src/Controls/Assertions/ControlListAssertions.cs
@@ -51,6 +51,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await firstItemLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/DateInputAssertions.cs b/src/Controls/Assertions/DateInputAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/DatePickerAssertions.cs b/src/Controls/Assertions/DatePickerAssertions.cs
@@ -51,6 +51,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/DropdownAssertions.cs b/src/Controls/Assertions/DropdownAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await buttonLocator.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await buttonLocator.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/DropdownMenuAssertions.cs b/src/Controls/Assertions/DropdownMenuAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await buttonLocator.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await buttonLocator.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/DropdownMenuAssertionsV2.cs b/src/Controls/Assertions/DropdownMenuAssertionsV2.cs
@@ -19,34 +19,34 @@ public DropdownMenuAssertionsV2(DropdownMenu dropdownMenu)
     }
 
     public async Task ToBeEnabledAsync(LocatorAssertionsToBeEnabledOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToBeEnabledAsync(options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToBeEnabledAsync(options).ConfigureAwait(false);
 
     public async Task ToBeDisabledAsync(LocatorAssertionsToBeDisabledOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToBeDisabledAsync(options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToBeDisabledAsync(options).ConfigureAwait(false);
 
     public async Task ToHaveTextAsync(string text, LocatorAssertionsToHaveTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToHaveTextAsync(text, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToHaveTextAsync(text, options).ConfigureAwait(false);
 
     public async Task NotToHaveTextAsync(string text, LocatorAssertionsToHaveTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().Not.ToHaveTextAsync(text, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().Not.ToHaveTextAsync(text, options).ConfigureAwait(false);
 
     public async Task ToHaveTextAsync(Regex regex, LocatorAssertionsToHaveTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToHaveTextAsync(regex, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToHaveTextAsync(regex, options).ConfigureAwait(false);
 
     public async Task NotToHaveTextAsync(Regex regex, LocatorAssertionsToHaveTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().Not.ToHaveTextAsync(regex, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().Not.ToHaveTextAsync(regex, options).ConfigureAwait(false);
 
     public async Task ToContainTextAsync(string text, LocatorAssertionsToContainTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToContainTextAsync(text, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToContainTextAsync(text, options).ConfigureAwait(false);
 
     public async Task NotToContainTextAsync(string text, LocatorAssertionsToContainTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().Not.ToContainTextAsync(text, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().Not.ToContainTextAsync(text, options).ConfigureAwait(false);
 
     public async Task ToContainTextAsync(Regex regex, LocatorAssertionsToContainTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToContainTextAsync(regex, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().ToContainTextAsync(regex, options).ConfigureAwait(false);
 
     public async Task NotToContainTextAsync(Regex regex, LocatorAssertionsToContainTextOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().Not.ToContainTextAsync(regex, options).ConfigureAwait(false);
+        => await dropdownMenu.CaptionLocator.Expect().Not.ToContainTextAsync(regex, options).ConfigureAwait(false);
 
     public async Task ToContainItemsAsync(string[] expectedItemsText, int timeoutInMilliseconds = 10000)
     {
@@ -80,10 +80,4 @@ public async Task ToContainItemsAsync(string[] expectedItemsText, int timeoutInM
         throw new TimeoutException(
             $"Не дождались наличия элементов [{string.Join(", ", expectedItemsText)}] в списке DropdownMenu за {timeoutInMilliseconds}ms.");
     }
-
-    public async Task ToBeFocusedAsync(LocatorAssertionsToBeFocusedOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().ToBeFocusedAsync(options).ConfigureAwait(false);
-
-    public async Task NotToBeFocusedAsync(LocatorAssertionsToBeFocusedOptions? options = default)
-        => await dropdownMenu.ButtonLocator.Expect().Not.ToBeFocusedAsync(options).ConfigureAwait(false);
 }
diff --git a/src/Controls/Assertions/InputAssertions.cs b/src/Controls/Assertions/InputAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/KebabAssertions.cs b/src/Controls/Assertions/KebabAssertions.cs
@@ -55,6 +55,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = null)
         => await captionLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = null)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/LinkAssertions.cs b/src/Controls/Assertions/LinkAssertions.cs
@@ -53,6 +53,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = null)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = null)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/PagingAssertions.cs b/src/Controls/Assertions/PagingAssertions.cs
@@ -62,6 +62,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = null)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = null)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/RadioAssertions.cs b/src/Controls/Assertions/RadioAssertions.cs
@@ -46,6 +46,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/SelectAssertions.cs b/src/Controls/Assertions/SelectAssertions.cs
@@ -81,6 +81,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = null)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = null)
     {
         if (await IsLinkAsync().ConfigureAwait(false))
diff --git a/src/Controls/Assertions/TabAssertions.cs b/src/Controls/Assertions/TabAssertions.cs
@@ -53,6 +53,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = null)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = null)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/TextareaAssertions.cs b/src/Controls/Assertions/TextareaAssertions.cs
@@ -48,6 +48,12 @@ public async Task ToBeInViewportAsync(LocatorAssertionsToBeInViewportOptions? op
     public async Task ToBeVisibleAsync(LocatorAssertionsToBeVisibleOptions? options = default)
         => await rootLocatorAssertions.ToBeVisibleAsync(options).ConfigureAwait(false);
 
+    public Task ToContainClassAsync(string expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
+    public Task ToContainClassAsync(IEnumerable<string> expected, LocatorAssertionsToContainClassOptions? options = null)
+        => throw new System.NotImplementedException();
+
     public async Task ToContainTextAsync(string expected, LocatorAssertionsToContainTextOptions? options = default)
         => await rootLocatorAssertions.ToContainTextAsync(expected, options).ConfigureAwait(false);
 
diff --git a/src/Controls/Assertions/ToggleAssertions.cs b/src/Controls/Assertions/ToggleAssertions.cs
diff --git a/src/Controls/Controls.csproj b/src/Controls/Controls.csproj
diff --git a/src/Controls/DropdownMenu.cs b/src/Controls/DropdownMenu.cs
diff --git a/src/Tests/Assertions/DropdownMenuAssertionsV2Tests.cs b/src/Tests/Assertions/DropdownMenuAssertionsV2Tests.cs
diff --git a/src/Tests/Controls/DropdownMenuTests.cs b/src/Tests/Controls/DropdownMenuTests.cs
diff --git a/src/Tests/Extensions/DropdownMenuExtensionsTests.cs b/src/Tests/Extensions/DropdownMenuExtensionsTests.cs
