Merge pull request #125 from quantori/added-tagname-to-iwebelementwrapper-interface

Added property "TagName" to IWebElementWrapper

Author: ILastovka

Behavioral.Automation.Selenium/Behavioral.Automation.DemoBindings/Elements/WebElementWrapper.cs

@@ -124,5 +124,7 @@ private bool AriaEnabled
                 return false;
             }
         }
+
+        public string TagName => Element.TagName;
     }
 }

Behavioral.Automation.Selenium/Behavioral.Automation/Behavioral.Automation.csproj

@@ -16,7 +16,7 @@ The whole automation code is divided into the following parts:
 - UI structure descriptive code
 - Supportive code</Description>
         <Copyright>Quantori Inc.</Copyright>
-        <PackageVersion>1.14.1</PackageVersion>
+        <PackageVersion>1.14.2</PackageVersion>
         <RepositoryUrl>https://github.com/quantori/Behavioral.Automation</RepositoryUrl>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>

Behavioral.Automation.Selenium/Behavioral.Automation/Bindings/LabelBinding.cs

@@ -38,7 +38,7 @@ public void CheckSelectedText(
             [NotNull] string value)
         {
             Assert.ShouldBecome(() => StringExtensions.GetElementTextOrValue(element), value, behavior,
-                $"{element.Caption} text is \"{StringExtensions.GetElementTextOrValue(element)}\"");
+                () => $"{element.Caption} text is \"{StringExtensions.GetElementTextOrValue(element)}\"");
         }
 
         /// <summary>
@@ -56,7 +56,7 @@ public void CheckSelectedTextContain(
             [NotNull] string value)
         {
             Assert.ShouldBecome(() => element.Text.Contains(value), !behavior.Contains("not"),
-                $"{element.Caption} text is \"{element.Text}\"");
+                () => $"{element.Caption} text is \"{element.Text}\"");
         }
 
         /// <summary>
@@ -87,7 +87,7 @@ public void CheckElementTooltip(
         public void CheckElementIsEmpty([NotNull] IWebElementWrapper element, AssertionBehavior behavior)
         {
             Assert.ShouldBecome(() => StringExtensions.GetElementTextOrValue(element), string.Empty, behavior,
-                $"{element.Caption} text is \"{StringExtensions.GetElementTextOrValue(element)}\"");
+                () => $"{element.Caption} text is \"{StringExtensions.GetElementTextOrValue(element)}\"");
         }
 
         /// <summary>

Behavioral.Automation.Selenium/Behavioral.Automation/Elements/IWebElementWrapper.cs

@@ -77,5 +77,10 @@ public interface IWebElementWrapper
         /// Element staleness. See <seealso cref="StaleElementReferenceException"/>
         /// </summary>
         public bool Stale { get; }
+
+        /// <summary>
+        /// Element's Tag name (span, div, etc.)
+        /// </summary>
+        public string TagName { get; }
     }
 }

Behavioral.Automation.Selenium/Behavioral.Automation/Services/StringExtensions.cs

@@ -126,7 +126,7 @@ public static int ParseNumberFromString(string s)
         /// <returns>String with element's text or value</returns>
         public static string GetElementTextOrValue(IWebElementWrapper element)
         {
-            if (ElementTagsToIgnore.Contains(element.Element.TagName) || element.GetAttribute("value") == null)
+            if (ElementTagsToIgnore.Contains(element.TagName) || element.GetAttribute("value") == null)
             {
                 return element.Text;
             }

Behavioral.Automation.Selenium/CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-[1.14.1] - 2022-08-01
+[1.14.2] - 2022-08-05
 ### Changed
-- Changed StringExtensions.GetElementTextOrValue method, so it would always get text value for li elements, otherwise it returns value attribute, which is always index
+- Added property "TagName" to IWebElementWrapper
+- Updated Label Bindings that use GetElementTextOrValue to get Error message when we actually get an error