Skip to content

Commit fce2950

Browse files
committed
Merge branch 'develop' of github.com:adamashton/BlazorContextMenu into develop
2 parents 8c5be79 + d0cfb16 commit fce2950

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

BlazorContextMenu/BlazorContextMenu.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Copyright />
1717
<PackageTags>blazor blazor-component blazor-context-menu context-menu contextmenu menu blazor-menu blazorcontextmenu razor razor-components razorcomponents</PackageTags>
1818
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
19-
<Version>1.14.0</Version>
19+
<Version>1.15.0</Version>
2020
<Version Condition=" '$(VersionSuffix)' != '' ">$(Version)-$(VersionSuffix)</Version>
2121
<Product>Blazor.ContextMenu</Product>
2222
</PropertyGroup>

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,12 @@ public class Startup
244244
</details>
245245
246246
## Release Notes
247-
<details open="open"><summary>1.14</summary>
247+
<details open="open"><summary>1.15</summary>
248+
249+
>- Add IsMenuShown to BlazorContextMenuService. Contributed by [Adam Ashton](https://github.com/adamashton).
250+
</details>
251+
252+
<details><summary>1.14</summary>
248253

249254
>- Fix for [#121](https://github.com/stavroskasidis/BlazorContextMenu/issues/121).
250255
</details>

Tests/BlazorContextMenu.TestsCommon/CommonTests/TestAppIndexTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public void Menu7_InitialState_MenuIsShownReturnsFalse()
442442

443443
//Assert
444444
var menuElement = Browser.FindElement(By.Id("menu7-isShownResult"));
445-
var display = menuElement.GetAttribute("text");
445+
var display = menuElement.Text;
446446
Assert.Equal(expectedDisplay, display);
447447
}
448448

@@ -453,13 +453,13 @@ public async Task Menu7_TriggerMenu_MenuIsShownReturnsTrue()
453453
var expectedDisplay = bool.TrueString;
454454

455455
//Act
456-
await OpenContextMenuAt("menu7", MouseButtonTrigger.Left);
456+
await OpenContextMenuAt("menu7-test1-trigger", MouseButtonTrigger.Left);
457457
var determineIfMenu7IsShownbtn = Browser.FindElement(By.Id("determineIfMenu7IsShownbtn"));
458458
determineIfMenu7IsShownbtn.Click();
459459

460460
//Assert
461461
var menuElement = Browser.FindElement(By.Id("menu7-isShownResult"));
462-
var display = menuElement.GetAttribute("text");
462+
var display = menuElement.Text;
463463
Assert.Equal(expectedDisplay, display);
464464
}
465465
}

0 commit comments

Comments
 (0)