From 14e859efa3468598b0120c29306557b7971b0682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alaksiej=20Miale=C5=A1ka?= Date: Wed, 18 Sep 2019 12:07:18 +0300 Subject: [PATCH] Fix elementStateProvider, removed web-specific attribute check from it. --- .../src/Aquality.Selenium.Core/Elements/Constants.cs | 12 ------------ .../Elements/ElementStateProvider.cs | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Constants.cs diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Constants.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Constants.cs deleted file mode 100644 index bab2164..0000000 --- a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/Constants.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Aquality.Selenium.Core.Elements -{ - internal static class PopularClassNames - { - public static string Disabled => "disabled"; - } - - internal static class Attributes - { - public static string Class => "class"; - } -} diff --git a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementStateProvider.cs b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementStateProvider.cs index 242fc1b..c48479f 100644 --- a/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementStateProvider.cs +++ b/Aquality.Selenium.Core/src/Aquality.Selenium.Core/Elements/ElementStateProvider.cs @@ -64,9 +64,9 @@ public bool WaitForNotEnabled(TimeSpan? timeout = null) return IsElementInDesiredState(element => !IsElementEnabled(element), "NOT ENABLED", timeout); } - private bool IsElementEnabled(IWebElement element) + protected virtual bool IsElementEnabled(IWebElement element) { - return element.Enabled && !element.GetAttribute(Attributes.Class).Contains(PopularClassNames.Disabled); + return element.Enabled; } private bool IsElementInDesiredState(Func elementStateCondition, string state, TimeSpan? timeout)