Update libraries. +semver: minor (#169)

paveliam · Pavel Anihimovsky · web-flow · commit ce2552eb22fb · 2020-04-07T12:02:47.000+03:00
* Update versions of WebDriverManager and Aquality.Selenium.Core

* Fix ConditionalWait getter

* Fix ConditionalWait getter

* Fix ElementFactory

Co-authored-by: Pavel Anihimovsky &lt;p.anihimovsky@a1qa.com&gt;
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj b/Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
@@ -59,11 +59,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aquality.Selenium.Core" Version="0.3.1" />
+    <PackageReference Include="Aquality.Selenium.Core" Version="0.3.9" />
     <PackageReference Include="NLog" Version="4.6.6" />
     <PackageReference Include="Selenium.Support" Version="3.141.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="WebDriverManager" Version="2.5.1" />
+    <PackageReference Include="WebDriverManager" Version="2.9.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/AqualityServices.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/AqualityServices.cs
@@ -36,7 +36,7 @@ public class AqualityServices : AqualityServices<Browser>
         /// <summary>
         /// Gets ConditionalWait object
         /// </summary>
-        public static ConditionalWait ConditionalWait => Get<ConditionalWait>();
+        public static IConditionalWait ConditionalWait => Get<IConditionalWait>();
 
         /// <summary>
         /// Gets and sets thread-safe instance of browser.
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/Browser.cs
@@ -19,7 +19,7 @@ public class Browser : IApplication
         private TimeSpan implicitWaitTimeout;
         private TimeSpan pageLoadTimeout;
         private readonly IBrowserProfile browserProfile;
-        private readonly ConditionalWait conditionalWait;
+        private readonly IConditionalWait conditionalWait;
 
         /// <summary>
         /// Instantiate browser.
@@ -111,6 +111,11 @@ public string CurrentUrl
             }
         }
 
+        /// <summary>
+        /// Checkes whether current SessionId is null or not.
+        /// </summary>
+        public bool IsStarted => Driver?.SessionId != null;
+
         /// <summary>
         /// Quit web browser.
         /// </summary>
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserStartup.cs b/Aquality.Selenium/src/Aquality.Selenium/Browsers/BrowserStartup.cs
@@ -8,8 +8,8 @@
 using Aquality.Selenium.Core.Applications;
 using Aquality.Selenium.Configurations;
 using Aquality.Selenium.Core.Configurations;
-using CoreElementFactory = Aquality.Selenium.Core.Elements.Interfaces.IElementFactory;
-using CoreTimeoutConfiguration = Aquality.Selenium.Core.Configurations.ITimeoutConfiguration;
+using ICoreElementFactory = Aquality.Selenium.Core.Elements.Interfaces.IElementFactory;
+using ICoreTimeoutConfiguration = Aquality.Selenium.Core.Configurations.ITimeoutConfiguration;
 using ILoggerConfiguration = Aquality.Selenium.Core.Configurations.ILoggerConfiguration;
 using ITimeoutConfiguration = Aquality.Selenium.Configurations.ITimeoutConfiguration;
 using TimeoutConfiguration = Aquality.Selenium.Configurations.TimeoutConfiguration;
@@ -24,9 +24,9 @@ public override IServiceCollection ConfigureServices(IServiceCollection services
             settings = settings ?? GetSettings();
             base.ConfigureServices(services, applicationProvider, settings);
             services.AddTransient<IElementFactory, ElementFactory>();
-            services.AddTransient<CoreElementFactory, ElementFactory>();
+            services.AddTransient<ICoreElementFactory, ElementFactory>();
             services.AddSingleton<ITimeoutConfiguration>(serviceProvider => new TimeoutConfiguration(settings));
-            services.AddSingleton<CoreTimeoutConfiguration>(serviceProvider => new TimeoutConfiguration(settings));
+            services.AddSingleton<ICoreTimeoutConfiguration>(serviceProvider => new TimeoutConfiguration(settings));
             services.AddSingleton<IBrowserProfile>(serviceProvider => new BrowserProfile(settings));
             services.AddSingleton<ILocalizationManager>(serviceProvider => new LocalizationManager(serviceProvider.GetRequiredService<ILoggerConfiguration>(), serviceProvider.GetRequiredService<Logger>(), Assembly.GetExecutingAssembly()));
             services.AddTransient(serviceProvider => AqualityServices.BrowserFactory);
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/MouseActions.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Actions/MouseActions.cs
@@ -18,9 +18,9 @@ public class MouseActions
         private readonly IElement element;
         private readonly string elementType;
         private readonly ILocalizedLogger logger;
-        private readonly ElementActionRetrier elementActionsRetrier;
+        private readonly IElementActionRetrier elementActionsRetrier;
 
-        public MouseActions(IElement element, string elementType, ILocalizedLogger logger, ElementActionRetrier elementActionsRetrier)
+        public MouseActions(IElement element, string elementType, ILocalizedLogger logger, IElementActionRetrier elementActionsRetrier)
         {
             this.element = element;
             this.elementType = elementType;
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/Element.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/Element.cs
@@ -9,9 +9,10 @@
 using Aquality.Selenium.Core.Localization;
 using Aquality.Selenium.Core.Waitings;
 using CoreElement = Aquality.Selenium.Core.Elements.Element;
-using CoreElementFactory = Aquality.Selenium.Core.Elements.Interfaces.IElementFactory;
-using CoreElementFinder = Aquality.Selenium.Core.Elements.Interfaces.IElementFinder;
-using CoreElementStateProvider = Aquality.Selenium.Core.Elements.Interfaces.IElementStateProvider;
+using ICoreElementFactory = Aquality.Selenium.Core.Elements.Interfaces.IElementFactory;
+using ICoreElementFinder = Aquality.Selenium.Core.Elements.Interfaces.IElementFinder;
+using ICoreElementStateProvider = Aquality.Selenium.Core.Elements.Interfaces.IElementStateProvider;
+using Aquality.Selenium.Core.Configurations;
 
 namespace Aquality.Selenium.Elements
 {
@@ -24,7 +25,7 @@ protected Element(By locator, string name, ElementState state) : base(locator, n
         {
         }
 
-        public override CoreElementStateProvider State => new ElementStateProvider(Locator, ConditionalWait, Finder);
+        public override ICoreElementStateProvider State => new ElementStateProvider(Locator, ConditionalWait, Finder);
 
         protected IBrowserProfile BrowserProfile => AqualityServices.Get<IBrowserProfile>();
 
@@ -36,19 +37,21 @@ protected Element(By locator, string name, ElementState state) : base(locator, n
 
         protected override IApplication Application => AqualityServices.Browser;
 
-        protected override ElementActionRetrier ActionRetrier => AqualityServices.Get<ElementActionRetrier>();
+        protected override IElementActionRetrier ActionRetrier => AqualityServices.Get<IElementActionRetrier>();
 
-        protected override CoreElementFactory Factory => CustomFactory;
+        protected override ICoreElementFactory Factory => CustomFactory;
 
         protected virtual IElementFactory CustomFactory => AqualityServices.Get<IElementFactory>();
 
-        protected override CoreElementFinder Finder => AqualityServices.Get<CoreElementFinder>();
+        protected override ICoreElementFinder Finder => AqualityServices.Get<ICoreElementFinder>();
+
+        protected override IElementCacheConfiguration CacheConfiguration => AqualityServices.Get<IElementCacheConfiguration>();
 
         protected override ILocalizedLogger LocalizedLogger => AqualityServices.LocalizedLogger;
 
         protected ILocalizationManager LocalizationManager => AqualityServices.Get<ILocalizationManager>();
 
-        protected override ConditionalWait ConditionalWait => AqualityServices.ConditionalWait;
+        protected override IConditionalWait ConditionalWait => AqualityServices.ConditionalWait;
 
         public void ClickAndWait()
         {
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementFactory.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementFactory.cs
@@ -17,7 +17,7 @@ namespace Aquality.Selenium.Elements
     /// </summary>
     public class ElementFactory : CoreFactory, IElementFactory
     {
-        public ElementFactory(ConditionalWait conditionalWait, IElementFinder elementFinder, ILocalizationManager localizationManager) 
+        public ElementFactory(IConditionalWait conditionalWait, IElementFinder elementFinder, ILocalizationManager localizationManager) 
             : base(conditionalWait, elementFinder, localizationManager)
         {
         }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementStateProvider.cs b/Aquality.Selenium/src/Aquality.Selenium/Elements/ElementStateProvider.cs
@@ -7,7 +7,7 @@ namespace Aquality.Selenium.Elements
 {
     public class ElementStateProvider : CoreElementStateProvider
     {
-        public ElementStateProvider(By elementLocator, ConditionalWait conditionalWait, IElementFinder elementFinder) 
+        public ElementStateProvider(By elementLocator, IConditionalWait conditionalWait, IElementFinder elementFinder) 
             : base(elementLocator, conditionalWait, elementFinder)
         {
         }
diff --git a/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json b/Aquality.Selenium/src/Aquality.Selenium/Resources/settings.json
@@ -82,5 +82,8 @@
   },
   "logger": {
     "language": "en"
+  },
+  "elementCache": {
+    "isEnabled": false
   }
 }
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/AutomationPractice/Forms/ProductForm.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/AutomationPractice/Forms/ProductForm.cs
@@ -9,7 +9,7 @@ namespace Aquality.Selenium.Tests.Integration.TestApp.AutomationPractice.Forms
     internal class ProductForm : Form
     {
         private static readonly By ProductsLocator = By.Id("product");
-        public IList<ILabel> LblsProductView => ElementFactory.FindElements(By.XPath("//li[contains(@id,'thumbnail_')]//a"), ElementFactory.GetLabel);
+        public IList<ILabel> LblsProductView => ElementFactory.FindElements<ILabel>(By.XPath("//li[contains(@id,'thumbnail_')]//a"));
         public ITextBox TxtQuantity => ElementFactory.GetTextBox(By.Id("quantity_wanted"), "Quantity");
         
         public ProductForm() : base(ProductsLocator, "Product")
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/AddRemoveElementsForm.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/AddRemoveElementsForm.cs
@@ -12,7 +12,7 @@ public AddRemoveElementsForm() : base(By.XPath("//h3[contains(.,'Add/Remove Elem
 
         public IButton AddButton => ElementFactory.GetButton(By.XPath("//button[contains(@onclick,'addElement')]"), "Add element");
 
-        public IList<IButton> ListOfDeleteButtons => ElementFactory.FindElements(By.XPath("//button[contains(@class,'added-manually')]"), ElementFactory.GetButton);
+        public IList<IButton> ListOfDeleteButtons => ElementFactory.FindElements<IButton>(By.XPath("//button[contains(@class,'added-manually')]"));
 
         protected override string UrlPart => "add_remove_elements/";
     }
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/InfiniteScrollForm.cs b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/InfiniteScrollForm.cs
@@ -15,7 +15,7 @@ public InfiniteScrollForm() : base(By.XPath("//div[@id='content' and .//h3[conta
 
         protected override string UrlPart => "infinite_scroll";
 
-        public IList<ILabel> ExampleLabels => ElementFactory.FindElements(By.XPath("//div[contains(@class,'jscroll-added')]"), ElementFactory.GetLabel);
+        public IList<ILabel> ExampleLabels => ElementFactory.FindElements<ILabel>(By.XPath("//div[contains(@class,'jscroll-added')]"));
 
         public ILabel LastExampleLabel => ExampleLabels.Last();
 
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.azure.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.azure.json
@@ -73,5 +73,8 @@
   },
   "logger": {
     "language": "en"
+  },
+  "elementCache": {
+    "isEnabled": false
   }
 }
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.json
@@ -72,5 +72,8 @@
   },
   "logger": {
     "language": "en"
+  },
+  "elementCache": {
+    "isEnabled": false
   }
 }
diff --git a/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json b/Aquality.Selenium/tests/Aquality.Selenium.Tests/Resources/settings.local.json
@@ -76,5 +76,8 @@
   },
   "logger": {
     "language": "en"
+  },
+  "elementCache": {
+    "isEnabled": false
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Aquality.Selenium.Elements`
`17`	`17`	`/// </summary>`
`18`	`18`	`public class ElementFactory : CoreFactory, IElementFactory`
`19`	`19`	`{`
`20`		`- public ElementFactory(ConditionalWait conditionalWait, IElementFinder elementFinder, ILocalizationManager localizationManager)`
	`20`	`+ public ElementFactory(IConditionalWait conditionalWait, IElementFinder elementFinder, ILocalizationManager localizationManager)`
`21`	`21`	`: base(conditionalWait, elementFinder, localizationManager)`
`22`	`22`	`{`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Aquality.Selenium.Elements`
`7`	`7`	`{`
`8`	`8`	`public class ElementStateProvider : CoreElementStateProvider`
`9`	`9`	`{`
`10`		`- public ElementStateProvider(By elementLocator, ConditionalWait conditionalWait, IElementFinder elementFinder)`
	`10`	`+ public ElementStateProvider(By elementLocator, IConditionalWait conditionalWait, IElementFinder elementFinder)`
`11`	`11`	`: base(elementLocator, conditionalWait, elementFinder)`
`12`	`12`	`{`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,5 +82,8 @@`
`82`	`82`	`},`
`83`	`83`	`"logger": {`
`84`	`84`	`"language": "en"`
	`85`	`+ },`
	`86`	`+ "elementCache": {`
	`87`	`+ "isEnabled": false`
`85`	`88`	`}`
`86`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Aquality.Selenium.Tests.Integration.TestApp.AutomationPractice.Forms`
`9`	`9`	`internal class ProductForm : Form`
`10`	`10`	`{`
`11`	`11`	`private static readonly By ProductsLocator = By.Id("product");`
`12`		`- public IList<ILabel> LblsProductView => ElementFactory.FindElements(By.XPath("//li[contains(@id,'thumbnail_')]//a"), ElementFactory.GetLabel);`
	`12`	`+ public IList<ILabel> LblsProductView => ElementFactory.FindElements<ILabel>(By.XPath("//li[contains(@id,'thumbnail_')]//a"));`
`13`	`13`	`public ITextBox TxtQuantity => ElementFactory.GetTextBox(By.Id("quantity_wanted"), "Quantity");`
`14`	`14`
`15`	`15`	`public ProductForm() : base(ProductsLocator, "Product")`