diff --git a/.gitignore b/.gitignore index ac80616..4d13c54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,334 @@ -packages -TestResults +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml TestResult.xml -bin -obj -.vs \ No newline at end of file + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ diff --git a/NUnit-BrowserStack/App.config b/NUnit-BrowserStack/App.config index 2be4596..527239c 100644 --- a/NUnit-BrowserStack/App.config +++ b/NUnit-BrowserStack/App.config @@ -1,4 +1,4 @@ - + @@ -7,17 +7,25 @@
- +
-
-
+ + +
+
+ + + +
+
+ - - + + @@ -25,7 +33,7 @@ - + @@ -39,19 +47,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - - - - - - + + - + + + + + + + + + diff --git a/NUnit-BrowserStack/BrowserStackDesktopNUnitTest.cs b/NUnit-BrowserStack/BrowserStackDesktopNUnitTest.cs new file mode 100644 index 0000000..1eacc7b --- /dev/null +++ b/NUnit-BrowserStack/BrowserStackDesktopNUnitTest.cs @@ -0,0 +1,92 @@ +using NUnit.Framework; +using OpenQA.Selenium; +using OpenQA.Selenium.Remote; +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Configuration; + + +namespace BrowserStack +{ + [TestFixture] + public class BrowserStackDesktopNUnitTest + { + protected IWebDriver driver; + protected string profile; + protected string os; + protected string osVersion; + protected string browserName; + protected string browserVersion; + private Local browserStackLocal; + + public BrowserStackDesktopNUnitTest(string profile, string os, string browserName) //todo replace string with enum + { + this.profile = profile; + this.os = os; + this.browserName = browserName; + } + + [SetUp] + public void Init() + { + var configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None); + NameValueCollection caps = ConfigurationManager.GetSection("capabilities/" + profile) as NameValueCollection; + NameValueCollection environment = ConfigurationManager.GetSection("desktopEnvironments/" + os) as NameValueCollection; + NameValueCollection browser = ConfigurationManager.GetSection("desktopBrowsers/" + browserName) as NameValueCollection; + + DesiredCapabilities capability = new DesiredCapabilities(); + + foreach (string key in caps.AllKeys) + { + capability.SetCapability(key, caps[key]); + } + + foreach (string key in environment.AllKeys) + { + capability.SetCapability(key, environment[key]); + } + + foreach (string key in browser.AllKeys) + { + capability.SetCapability(key, browser[key]); + } + + String username = Environment.GetEnvironmentVariable("BROWSERSTACK_USERNAME"); + if (username == null) + { + username = ConfigurationManager.AppSettings.Get("user"); + } + + String accesskey = Environment.GetEnvironmentVariable("BROWSERSTACK_ACCESS_KEY"); + if (accesskey == null) + { + accesskey = ConfigurationManager.AppSettings.Get("key"); + } + + capability.SetCapability("browserstack.user", username); + capability.SetCapability("browserstack.key", accesskey); + + if (capability.GetCapability("browserstack.local") != null && capability.GetCapability("browserstack.local").ToString() == "true") + { + browserStackLocal = new Local(); + List> bsLocalArgs = new List>() { + new KeyValuePair("key", accesskey) + }; + browserStackLocal.start(bsLocalArgs); + } + + driver = new RemoteWebDriver(new Uri("http://" + ConfigurationManager.AppSettings.Get("server") + "/wd/hub/"), capability); + } + + [TearDown] + public void Cleanup() + { + driver.Quit(); + if (browserStackLocal != null) + { + browserStackLocal.stop(); + } + } + } +} diff --git a/NUnit-BrowserStack/BrowserStackNUnitTest.cs b/NUnit-BrowserStack/BrowserStackNUnitTest.cs deleted file mode 100644 index 384f93d..0000000 --- a/NUnit-BrowserStack/BrowserStackNUnitTest.cs +++ /dev/null @@ -1,81 +0,0 @@ -using NUnit.Framework; -using OpenQA.Selenium; -using OpenQA.Selenium.Remote; -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Configuration; - - -namespace BrowserStack -{ - [TestFixture] - public class BrowserStackNUnitTest - { - protected IWebDriver driver; - protected string profile; - protected string environment; - private Local browserStackLocal; - - public BrowserStackNUnitTest(string profile, string environment) - { - this.profile = profile; - this.environment = environment; - } - - [SetUp] - public void Init() - { - NameValueCollection caps = ConfigurationManager.GetSection("capabilities/" + profile) as NameValueCollection; - NameValueCollection settings = ConfigurationManager.GetSection("environments/" + environment) as NameValueCollection; - - DesiredCapabilities capability = new DesiredCapabilities(); - - foreach (string key in caps.AllKeys) - { - capability.SetCapability(key, caps[key]); - } - - foreach (string key in settings.AllKeys) - { - capability.SetCapability(key, settings[key]); - } - - String username = Environment.GetEnvironmentVariable("BROWSERSTACK_USERNAME"); - if(username == null) - { - username = ConfigurationManager.AppSettings.Get("user"); - } - - String accesskey = Environment.GetEnvironmentVariable("BROWSERSTACK_ACCESS_KEY"); - if (accesskey == null) - { - accesskey = ConfigurationManager.AppSettings.Get("key"); - } - - capability.SetCapability("browserstack.user", username); - capability.SetCapability("browserstack.key", accesskey); - - if (capability.GetCapability("browserstack.local") != null && capability.GetCapability("browserstack.local").ToString() == "true") - { - browserStackLocal = new Local(); - List> bsLocalArgs = new List>() { - new KeyValuePair("key", accesskey) - }; - browserStackLocal.start(bsLocalArgs); - } - - driver = new RemoteWebDriver(new Uri("http://"+ ConfigurationManager.AppSettings.Get("server") +"/wd/hub/"), capability); - } - - [TearDown] - public void Cleanup() - { - driver.Quit(); - if (browserStackLocal != null) - { - browserStackLocal.stop(); - } - } - } -} diff --git a/NUnit-BrowserStack/LocalTest.cs b/NUnit-BrowserStack/LocalTest.cs index 70f80b0..fde8803 100644 --- a/NUnit-BrowserStack/LocalTest.cs +++ b/NUnit-BrowserStack/LocalTest.cs @@ -4,10 +4,10 @@ namespace BrowserStack { - [TestFixture("local", "chrome")] - public class LocalTest : BrowserStackNUnitTest + [TestFixture("local", "windows10", "chrome")] + public class LocalTest : BrowserStackDesktopNUnitTest { - public LocalTest(string profile, string environment) : base(profile, environment) { } + public LocalTest(string profile, string os, string browser) : base(profile, os, browser) { } [Test] public void HealthCheck() diff --git a/NUnit-BrowserStack/NUnit-BrowserStack.csproj b/NUnit-BrowserStack/NUnit-BrowserStack.csproj index a1aa630..42f8f8a 100644 --- a/NUnit-BrowserStack/NUnit-BrowserStack.csproj +++ b/NUnit-BrowserStack/NUnit-BrowserStack.csproj @@ -1,5 +1,7 @@  + + Debug @@ -11,6 +13,8 @@ SingleTest v4.5 512 + + true @@ -33,57 +37,17 @@ - - ..\packages\BrowserStackLocal.1.2.0\lib\net20\BrowserStackLocal.dll - True + + ..\packages\BrowserStackLocal.1.4.0\lib\net20\BrowserStackLocal.dll - - ..\packages\NUnit3TestAdapter.3.4.0\lib\Mono.Cecil.dll - False + + ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - ..\packages\NUnit3TestAdapter.3.4.0\lib\Mono.Cecil.Mdb.dll - False + + ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NUnit3TestAdapter.3.4.0\lib\Mono.Cecil.Pdb.dll - False - - - ..\packages\NUnit3TestAdapter.3.4.0\lib\Mono.Cecil.Rocks.dll - False - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll - False - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll - False - - - ..\packages\NUnit3TestAdapter.3.4.0\lib\nunit.engine.dll - False - - - ..\packages\NUnit3TestAdapter.3.4.0\lib\nunit.engine.api.dll - False - - - ..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll - True - - - ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll - False - - - ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll - False - - - ..\packages\NUnit3TestAdapter.3.4.0\lib\NUnit3.TestAdapter.dll - False + + ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll @@ -95,13 +59,12 @@ - - ..\packages\Selenium.WebDriver.2.53.1\lib\net40\WebDriver.dll - True + + ..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll - + @@ -117,6 +80,13 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + +