Merge pull request #15 from pmahend1/dev

Migrate cleanup from dev
pmahend1 · Apr 4, 2021 · 4743da2 · 4743da2
2 parents 835f3f3 + e2c6c86
commit 4743da2
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 245 deletions.
diff --git a/.Net Core/MSRewards/Constants.cs b/.Net Core/MSRewards/Constants.cs
@@ -16,6 +16,8 @@ public static class Constants
 
         public const string ID_P = "id_p";
 
+        public const string ID_L = "id_l";
+
         public const string ID_A = "id_a";
 
         public const string B_Results = "b_results";
@@ -42,6 +44,8 @@ public static class Constants
 
         public const string BingSearchURL = "http://www.bing.com/search?q=";
 
+        public const string BingHome = "http://www.bing.com/"; 
+
         public const string GeckoPathKey = "webdriver.gecko.driver";
 
         public const string UserAgentKey = "general.useragent.override";

diff --git a/.Net Core/MSRewards/Extensions.cs b/.Net Core/MSRewards/Extensions.cs
@@ -0,0 +1,56 @@
+using OpenQA.Selenium;
+using OpenQA.Selenium.Support.UI;
+using System;
+
+namespace MSRewards
+{
+    public static class Extensions
+    {
+        public static bool IsClickable(this IWebElement webElement)
+        {
+            if (webElement != null)
+                return webElement.Displayed && webElement.Enabled;
+            else
+                return false;
+        }
+
+        public static IWebElement FindClickableElement(this IWebDriver driver, By condition, int fromSeconds = 10)
+        {
+            bool isElementPresent = false;
+            IWebElement singleElement = null;
+
+            var driverWait = new WebDriverWait(driver, TimeSpan.FromSeconds(fromSeconds));
+            driverWait.IgnoreExceptionTypes(typeof(NoSuchElementException));
+
+            try
+            {
+                isElementPresent = driverWait.Until(d => d.FindElement(condition).IsClickable());
+
+                if (isElementPresent)
+                {
+                    singleElement = driver.FindElement(condition);
+                }
+            }
+            catch
+            {
+                // log any errors
+            }
+
+            return singleElement;
+        }
+
+        public static bool WaitUntilClickable(this IWebDriver driver, By condition, int fromSeconds = 10)
+        {
+            var element = driver.FindClickableElement(condition, fromSeconds);
+            return (element != null);
+        }
+
+
+        public static void WaitUntilElementFound(this IWebDriver driver, By condition, int fromSeconds = 10)
+        {
+            WebDriverWait waiter = new WebDriverWait(driver, TimeSpan.FromSeconds(fromSeconds));
+            waiter.IgnoreExceptionTypes(typeof(NoSuchElementException));
+            waiter.Until(d => d.FindElement(condition) != null); 
+        }
+    }
+}
diff --git a/.Net Core/MSRewards/MSRewards.csproj b/.Net Core/MSRewards/MSRewards.csproj
@@ -9,9 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="dein.Colorify" Version="2.6.0" />
     <PackageReference Include="Selenium.Firefox.WebDriver" Version="0.27.0" />
     <PackageReference Include="Selenium.Support" Version="4.0.0-beta1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.0.0-beta1" />
-    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="88.0.705.56" />
+    <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="89.0.774.54" />
   </ItemGroup>
 </Project>