From 4abbdc95c917ea528e77a887be71d85ea820a804 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 10 Jan 2017 10:33:59 +0100 Subject: [PATCH 01/13] Updated NUnit" version="3.6.0" Updated Selenium.Firefox.WebDriver to version 0.13.0 --- .../Objectivity.Test.Automation.Common.csproj | 4 ++-- Objectivity.Test.Automation.Common/packages.config | 2 +- .../Objectivity.Test.Automation.Tests.Features.csproj | 4 ++-- Objectivity.Test.Automation.Tests.Features/packages.config | 2 +- .../Objectivity.Test.Automation.Tests.NUnit.csproj | 4 ++-- Objectivity.Test.Automation.Tests.NUnit/packages.config | 2 +- .../Objectivity.Test.Automation.Tests.PageObjects.csproj | 6 +++--- .../packages.config | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj index a56460265..22fb120a4 100644 --- a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj +++ b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj @@ -173,11 +173,11 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + - - - + + + - - - - - - + + + + + + - - - - + + + + - - + + @@ -44,21 +44,22 @@ - + - + - + - - + + @@ -73,4 +74,4 @@ add key="ChromePluginName.crx" value=""/--> - \ No newline at end of file + diff --git a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj index 7d06fbdf3..d7b7e967e 100644 --- a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj +++ b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj @@ -11,7 +11,7 @@ Properties Objectivity.Test.Automation.Common Objectivity.Test.Automation.Common - v4.0 + v4.5 512 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -35,6 +35,7 @@ false bin\Debug\Objectivity.Test.Automation.Common.XML ..\fxcop-sonarqube.tests.ruleset + false pdbonly @@ -50,6 +51,7 @@ False ..\fxcop-sonarqube.tests.ruleset bin\Release\Objectivity.Test.Automation.Common.XML + false @@ -111,7 +113,7 @@ True - ..\packages\NLog.4.3.5\lib\net40\NLog.dll + ..\packages\NLog.4.3.5\lib\net45\NLog.dll True diff --git a/Objectivity.Test.Automation.Common/packages.config b/Objectivity.Test.Automation.Common/packages.config index 56a16c0e8..37ca20c66 100644 --- a/Objectivity.Test.Automation.Common/packages.config +++ b/Objectivity.Test.Automation.Common/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Objectivity.Test.Automation.Tests.MsTest/App.config b/Objectivity.Test.Automation.Tests.MsTest/App.config index 13377063f..cd7808df1 100644 --- a/Objectivity.Test.Automation.Tests.MsTest/App.config +++ b/Objectivity.Test.Automation.Tests.MsTest/App.config @@ -1,4 +1,4 @@ - +
@@ -9,30 +9,30 @@ - - - + + + - + - - - - - + + + + + - - - - + + + + - - + + @@ -44,21 +44,16 @@ - + - + - + - - + + @@ -73,4 +68,4 @@ add key="ChromePluginName.crx" value=""/--> - \ No newline at end of file + diff --git a/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj b/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj index ac20e01e7..e0da6d6b8 100644 --- a/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj +++ b/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj @@ -9,7 +9,7 @@ Properties Objectivity.Test.Automation.Tests.MsTest Objectivity.Test.Automation.Tests.MsTest - v4.0 + v4.5 512 ..\ @@ -33,6 +33,7 @@ True False ..\fxcop-sonarqube.tests.ruleset + false pdbonly @@ -47,6 +48,7 @@ True False ..\fxcop-sonarqube.tests.ruleset + false true @@ -57,7 +59,7 @@ ..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll - ..\packages\NLog.4.3.5\lib\net40\NLog.dll + ..\packages\NLog.4.3.5\lib\net45\NLog.dll True diff --git a/Objectivity.Test.Automation.Tests.MsTest/packages.config b/Objectivity.Test.Automation.Tests.MsTest/packages.config index 1223c7e4c..b29d75341 100644 --- a/Objectivity.Test.Automation.Tests.MsTest/packages.config +++ b/Objectivity.Test.Automation.Tests.MsTest/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Objectivity.Test.Automation.Tests.NUnit/App.config b/Objectivity.Test.Automation.Tests.NUnit/App.config index 85f5dcda0..22f0ac005 100644 --- a/Objectivity.Test.Automation.Tests.NUnit/App.config +++ b/Objectivity.Test.Automation.Tests.NUnit/App.config @@ -1,4 +1,4 @@ - +
@@ -9,30 +9,30 @@ - - - + + + - + - - - - - + + + + + - - - - + + + + - - + + @@ -44,23 +44,18 @@ - + - + - + - + - - + + @@ -75,4 +70,4 @@ add key="ChromePluginName.crx" value=""/--> - + diff --git a/Objectivity.Test.Automation.Tests.NUnit/Objectivity.Test.Automation.Tests.NUnit.csproj b/Objectivity.Test.Automation.Tests.NUnit/Objectivity.Test.Automation.Tests.NUnit.csproj index d97b5ed22..19cb24e86 100644 --- a/Objectivity.Test.Automation.Tests.NUnit/Objectivity.Test.Automation.Tests.NUnit.csproj +++ b/Objectivity.Test.Automation.Tests.NUnit/Objectivity.Test.Automation.Tests.NUnit.csproj @@ -9,7 +9,7 @@ Properties Objectivity.Test.Automation.Tests.NUnit Objectivity.Test.Automation.Tests.NUnit - v4.0 + v4.5 512 ..\ @@ -33,6 +33,7 @@ True False ..\fxcop-sonarqube.tests.ruleset + false pdbonly @@ -47,17 +48,18 @@ True False ..\fxcop-sonarqube.tests.ruleset + false true - ..\packages\NLog.4.3.5\lib\net40\NLog.dll + ..\packages\NLog.4.3.5\lib\net45\NLog.dll True - ..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll + ..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll True diff --git a/Objectivity.Test.Automation.Tests.NUnit/packages.config b/Objectivity.Test.Automation.Tests.NUnit/packages.config index 86ccff671..74cfe7895 100644 --- a/Objectivity.Test.Automation.Tests.NUnit/packages.config +++ b/Objectivity.Test.Automation.Tests.NUnit/packages.config @@ -1,8 +1,8 @@  - + - + diff --git a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj index 990052504..5e6cb7795 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj +++ b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj @@ -9,7 +9,7 @@ Properties Objectivity.Test.Automation.Tests.PageObjects Objectivity.Test.Automation.Tests.PageObjects - v4.0 + v4.5 512 ..\ @@ -33,6 +33,7 @@ True False ..\fxcop-sonarqube.tests.ruleset + false pdbonly @@ -47,13 +48,14 @@ True False ..\fxcop-sonarqube.tests.ruleset + false true - ..\packages\NLog.4.3.5\lib\net40\NLog.dll + ..\packages\NLog.4.3.5\lib\net45\NLog.dll True diff --git a/Objectivity.Test.Automation.Tests.PageObjects/packages.config b/Objectivity.Test.Automation.Tests.PageObjects/packages.config index fa6c502e4..713db22c4 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/packages.config +++ b/Objectivity.Test.Automation.Tests.PageObjects/packages.config @@ -1,6 +1,6 @@  - + From ccd0941f91d93d984ff6de19bb58eac86fd452e2 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Fri, 17 Feb 2017 08:15:21 +0100 Subject: [PATCH 10/13] Updated Selenium WebDriver to version 3.1.0 --- .../Selenium.shfbproj | 8 ++++---- .../Objectivity.Test.Automation.Common.csproj | 8 ++++---- Objectivity.Test.Automation.Common/packages.config | 4 ++-- .../Objectivity.Test.Automation.Tests.MsTest.csproj | 4 ++-- Objectivity.Test.Automation.Tests.MsTest/packages.config | 2 +- .../Objectivity.Test.Automation.Tests.PageObjects.csproj | 8 ++++---- .../packages.config | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Objectivity.Test.Automation.Common.Documentation/Selenium.shfbproj b/Objectivity.Test.Automation.Common.Documentation/Selenium.shfbproj index 654374bbc..846351e2b 100644 --- a/Objectivity.Test.Automation.Common.Documentation/Selenium.shfbproj +++ b/Objectivity.Test.Automation.Common.Documentation/Selenium.shfbproj @@ -27,10 +27,10 @@ - - - - + + + + 100 OnlyWarningsAndErrors Website diff --git a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj index d7b7e967e..2a90fa15a 100644 --- a/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj +++ b/Objectivity.Test.Automation.Common/Objectivity.Test.Automation.Common.csproj @@ -123,12 +123,12 @@ - - ..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll + + ..\packages\Selenium.WebDriver.3.1.0\lib\net40\WebDriver.dll True - - ..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll + + ..\packages\Selenium.Support.3.1.0\lib\net40\WebDriver.Support.dll True diff --git a/Objectivity.Test.Automation.Common/packages.config b/Objectivity.Test.Automation.Common/packages.config index 37ca20c66..85c39b1f2 100644 --- a/Objectivity.Test.Automation.Common/packages.config +++ b/Objectivity.Test.Automation.Common/packages.config @@ -5,8 +5,8 @@ - - + + diff --git a/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj b/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj index e0da6d6b8..3ca592ba5 100644 --- a/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj +++ b/Objectivity.Test.Automation.Tests.MsTest/Objectivity.Test.Automation.Tests.MsTest.csproj @@ -67,8 +67,8 @@ - - ..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll + + ..\packages\Selenium.WebDriver.3.1.0\lib\net40\WebDriver.dll True diff --git a/Objectivity.Test.Automation.Tests.MsTest/packages.config b/Objectivity.Test.Automation.Tests.MsTest/packages.config index b29d75341..4065d8739 100644 --- a/Objectivity.Test.Automation.Tests.MsTest/packages.config +++ b/Objectivity.Test.Automation.Tests.MsTest/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj index 5e6cb7795..6723b1afc 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj +++ b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj @@ -62,12 +62,12 @@ - - ..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll + + ..\packages\Selenium.WebDriver.3.1.0\lib\net40\WebDriver.dll True - - ..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll + + ..\packages\Selenium.Support.3.1.0\lib\net40\WebDriver.Support.dll True diff --git a/Objectivity.Test.Automation.Tests.PageObjects/packages.config b/Objectivity.Test.Automation.Tests.PageObjects/packages.config index 713db22c4..8ed6c8e97 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/packages.config +++ b/Objectivity.Test.Automation.Tests.PageObjects/packages.config @@ -3,8 +3,8 @@ - - + + From ed23a31e8eae922641465e5b72ffdf6215e9b712 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Fri, 17 Feb 2017 08:49:31 +0100 Subject: [PATCH 11/13] Replaced obsolete ITimeouts.SetPageLoadTimeout(TimeSpan) to the PageLoad property, ITimeouts.SetScriptTimeout(TimeSpan) to the AsynchronousJavaScript property and 'ITimeouts.ImplicitlyWait(TimeSpan)'to the ImplicitWait property --- Objectivity.Test.Automation.Common/DriverContext.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Objectivity.Test.Automation.Common/DriverContext.cs b/Objectivity.Test.Automation.Common/DriverContext.cs index 5490d272f..d92bca9e4 100644 --- a/Objectivity.Test.Automation.Common/DriverContext.cs +++ b/Objectivity.Test.Automation.Common/DriverContext.cs @@ -467,9 +467,9 @@ public void Start() string.Format(CultureInfo.CurrentCulture, "Driver {0} is not supported", BaseConfiguration.TestBrowser)); } - this.driver.Manage().Timeouts().SetPageLoadTimeout(TimeSpan.FromSeconds(BaseConfiguration.LongTimeout)); - this.driver.Manage().Timeouts().SetScriptTimeout(TimeSpan.FromSeconds(BaseConfiguration.ShortTimeout)); - this.driver.Manage().Timeouts().ImplicitlyWait(TimeSpan.FromMilliseconds(BaseConfiguration.ImplicitlyWaitMilliseconds)); + this.driver.Manage().Timeouts().PageLoad = TimeSpan.FromSeconds(BaseConfiguration.LongTimeout); + this.driver.Manage().Timeouts().AsynchronousJavaScript = TimeSpan.FromSeconds(BaseConfiguration.ShortTimeout); + this.driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromMilliseconds(BaseConfiguration.ImplicitlyWaitMilliseconds); this.driver.Manage().Window.Maximize(); } From c5c8df23bfb45a6d7b53a0c082a825dc3ae9a945 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Fri, 17 Feb 2017 09:28:25 +0100 Subject: [PATCH 12/13] Replacing System.Drawing.Imaging.ImageFormat by ScreenshotImageFormat for taking screenshots --- Objectivity.Test.Automation.Common/DriverContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Objectivity.Test.Automation.Common/DriverContext.cs b/Objectivity.Test.Automation.Common/DriverContext.cs index d92bca9e4..2de5f3cb3 100644 --- a/Objectivity.Test.Automation.Common/DriverContext.cs +++ b/Objectivity.Test.Automation.Common/DriverContext.cs @@ -498,7 +498,7 @@ public void SaveScreenshot(ErrorDetail errorDetail, string folder, string title) try { - errorDetail.Screenshot.SaveAsFile(filePath, ImageFormat.Png); + errorDetail.Screenshot.SaveAsFile(filePath, ScreenshotImageFormat.Png); Logger.Error(CultureInfo.CurrentCulture, "Test failed: screenshot saved to {0}.", filePath); Logger.Info(CultureInfo.CurrentCulture, "##teamcity[publishArtifacts '{0}']", filePath); } From 81be6ccbbff6e5c33fc8e67622bd037316dd8cc8 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Fri, 17 Feb 2017 09:48:34 +0100 Subject: [PATCH 13/13] Updated IEDriver to version="3.1.0" --- Objectivity.Test.Automation.Common/packages.config | 2 +- .../Objectivity.Test.Automation.Tests.PageObjects.csproj | 2 +- Objectivity.Test.Automation.Tests.PageObjects/packages.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Objectivity.Test.Automation.Common/packages.config b/Objectivity.Test.Automation.Common/packages.config index 85c39b1f2..6d586215e 100644 --- a/Objectivity.Test.Automation.Common/packages.config +++ b/Objectivity.Test.Automation.Common/packages.config @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj index 6723b1afc..ef99ee020 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj +++ b/Objectivity.Test.Automation.Tests.PageObjects/Objectivity.Test.Automation.Tests.PageObjects.csproj @@ -124,7 +124,7 @@ - + IEDriverServer.exe PreserveNewest diff --git a/Objectivity.Test.Automation.Tests.PageObjects/packages.config b/Objectivity.Test.Automation.Tests.PageObjects/packages.config index 8ed6c8e97..9f676d11d 100644 --- a/Objectivity.Test.Automation.Tests.PageObjects/packages.config +++ b/Objectivity.Test.Automation.Tests.PageObjects/packages.config @@ -6,6 +6,6 @@ - + \ No newline at end of file