Skip to content

Commit 53469c2

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/0.3.1' into production
2 parents c5366e6 + 16dac90 commit 53469c2

File tree

14 files changed

+107
-45
lines changed

14 files changed

+107
-45
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,11 @@ solution: CSF.WebDriverExtras.sln
55
addons:
66
sauce_connect:
77
direct_domains: google.com
8-
apt:
9-
packages:
10-
- mono-xsp4
118

12-
#matrix:
13-
# include:
14-
# - env:
15-
# - SAUCE_USERNAME="craigfowler_screenplay"
16-
# - secure: "ZI+FDrm6aec9HNMS4bbkgUzpeqVwy11flgnqWpYIyG12GzKQmrdXqMoAwD1kimIRNvry4r/z33GhBPDQaHly8edFzlkG4H8ITCyE48qttrVG71j5yYsyk6RLPm28zhcuhmnlalssk9jCsp09YFJ3zRO3Ayj/vboxTkQFhTa8d6nwag+MpfiVZVRdouO3qcKL3lPeWaQECo9hpX8o5MrQDCWprqg7b0ZMgW0vi5bqIFAmKoE/hn+qgp7BUQeVc983D8KClqYBsoJ09crn5ifd3CeCoOzeyczyS/DPrRgOOT63VdllGEQGKQZ78RY1LoloqEbbRI5ibjq7vuc8Er73yzxSbBbnKhG6nHRdfdNwxn2IAtZw86tpNSaKO1u8lprFDLbdCbHu42J6qQx4R8HZcq12Myv1eRYvupQrFv3mDAHK+NWYwCMKvouof50RNnJiFn6zcisvNQXCgG8NWeDBWbszRIwgvmQLsNB/vHCzrHO1bAT4lEYNuFVoUstO8t1r0C7ZVM6Qruuj46J0ZESTo10hUoHCohutdJ0ZAmH4ZxmW57L+BO1eFarkM7hmEZX6fImn0fobNHhSaEy+dNpYa9OS6n4iE6N4teTw20rpZ/AjkLUvJXjMh/YPkQ7M4VvDLqUHh5MPqAbgq3tUEfgPTm+lNy9QibquFwBRsAb3HRU="
17-
# - BROWSER_PLATFORM="Windows 10"
18-
# - BROWSER_NAME="Chrome"
19-
# - env:
20-
# - SAUCE_USERNAME="craigfowler_screenplay"
21-
# - secure: "ZI+FDrm6aec9HNMS4bbkgUzpeqVwy11flgnqWpYIyG12GzKQmrdXqMoAwD1kimIRNvry4r/z33GhBPDQaHly8edFzlkG4H8ITCyE48qttrVG71j5yYsyk6RLPm28zhcuhmnlalssk9jCsp09YFJ3zRO3Ayj/vboxTkQFhTa8d6nwag+MpfiVZVRdouO3qcKL3lPeWaQECo9hpX8o5MrQDCWprqg7b0ZMgW0vi5bqIFAmKoE/hn+qgp7BUQeVc983D8KClqYBsoJ09crn5ifd3CeCoOzeyczyS/DPrRgOOT63VdllGEQGKQZ78RY1LoloqEbbRI5ibjq7vuc8Er73yzxSbBbnKhG6nHRdfdNwxn2IAtZw86tpNSaKO1u8lprFDLbdCbHu42J6qQx4R8HZcq12Myv1eRYvupQrFv3mDAHK+NWYwCMKvouof50RNnJiFn6zcisvNQXCgG8NWeDBWbszRIwgvmQLsNB/vHCzrHO1bAT4lEYNuFVoUstO8t1r0C7ZVM6Qruuj46J0ZESTo10hUoHCohutdJ0ZAmH4ZxmW57L+BO1eFarkM7hmEZX6fImn0fobNHhSaEy+dNpYa9OS6n4iE6N4teTw20rpZ/AjkLUvJXjMh/YPkQ7M4VvDLqUHh5MPqAbgq3tUEfgPTm+lNy9QibquFwBRsAb3HRU="
22-
# - BROWSER_PLATFORM="Windows 10"
23-
# - BROWSER_NAME="Firefox"
24-
# - env:
25-
# - SAUCE_USERNAME="craigfowler_screenplay"
26-
# - secure: "ZI+FDrm6aec9HNMS4bbkgUzpeqVwy11flgnqWpYIyG12GzKQmrdXqMoAwD1kimIRNvry4r/z33GhBPDQaHly8edFzlkG4H8ITCyE48qttrVG71j5yYsyk6RLPm28zhcuhmnlalssk9jCsp09YFJ3zRO3Ayj/vboxTkQFhTa8d6nwag+MpfiVZVRdouO3qcKL3lPeWaQECo9hpX8o5MrQDCWprqg7b0ZMgW0vi5bqIFAmKoE/hn+qgp7BUQeVc983D8KClqYBsoJ09crn5ifd3CeCoOzeyczyS/DPrRgOOT63VdllGEQGKQZ78RY1LoloqEbbRI5ibjq7vuc8Er73yzxSbBbnKhG6nHRdfdNwxn2IAtZw86tpNSaKO1u8lprFDLbdCbHu42J6qQx4R8HZcq12Myv1eRYvupQrFv3mDAHK+NWYwCMKvouof50RNnJiFn6zcisvNQXCgG8NWeDBWbszRIwgvmQLsNB/vHCzrHO1bAT4lEYNuFVoUstO8t1r0C7ZVM6Qruuj46J0ZESTo10hUoHCohutdJ0ZAmH4ZxmW57L+BO1eFarkM7hmEZX6fImn0fobNHhSaEy+dNpYa9OS6n4iE6N4teTw20rpZ/AjkLUvJXjMh/YPkQ7M4VvDLqUHh5MPqAbgq3tUEfgPTm+lNy9QibquFwBRsAb3HRU="
27-
# - BROWSER_PLATFORM="Windows 10"
28-
# - BROWSER_NAME="Internet Explorer"
29-
# - env:
30-
# - SAUCE_USERNAME="craigfowler_screenplay"
31-
# - secure: "ZI+FDrm6aec9HNMS4bbkgUzpeqVwy11flgnqWpYIyG12GzKQmrdXqMoAwD1kimIRNvry4r/z33GhBPDQaHly8edFzlkG4H8ITCyE48qttrVG71j5yYsyk6RLPm28zhcuhmnlalssk9jCsp09YFJ3zRO3Ayj/vboxTkQFhTa8d6nwag+MpfiVZVRdouO3qcKL3lPeWaQECo9hpX8o5MrQDCWprqg7b0ZMgW0vi5bqIFAmKoE/hn+qgp7BUQeVc983D8KClqYBsoJ09crn5ifd3CeCoOzeyczyS/DPrRgOOT63VdllGEQGKQZ78RY1LoloqEbbRI5ibjq7vuc8Er73yzxSbBbnKhG6nHRdfdNwxn2IAtZw86tpNSaKO1u8lprFDLbdCbHu42J6qQx4R8HZcq12Myv1eRYvupQrFv3mDAHK+NWYwCMKvouof50RNnJiFn6zcisvNQXCgG8NWeDBWbszRIwgvmQLsNB/vHCzrHO1bAT4lEYNuFVoUstO8t1r0C7ZVM6Qruuj46J0ZESTo10hUoHCohutdJ0ZAmH4ZxmW57L+BO1eFarkM7hmEZX6fImn0fobNHhSaEy+dNpYa9OS6n4iE6N4teTw20rpZ/AjkLUvJXjMh/YPkQ7M4VvDLqUHh5MPqAbgq3tUEfgPTm+lNy9QibquFwBRsAb3HRU="
32-
# - BROWSER_PLATFORM="Windows 10"
33-
# - BROWSER_NAME="MicrosoftEdge"
34-
# - env:
35-
# - SAUCE_USERNAME="craigfowler_screenplay"
36-
# - secure: "ZI+FDrm6aec9HNMS4bbkgUzpeqVwy11flgnqWpYIyG12GzKQmrdXqMoAwD1kimIRNvry4r/z33GhBPDQaHly8edFzlkG4H8ITCyE48qttrVG71j5yYsyk6RLPm28zhcuhmnlalssk9jCsp09YFJ3zRO3Ayj/vboxTkQFhTa8d6nwag+MpfiVZVRdouO3qcKL3lPeWaQECo9hpX8o5MrQDCWprqg7b0ZMgW0vi5bqIFAmKoE/hn+qgp7BUQeVc983D8KClqYBsoJ09crn5ifd3CeCoOzeyczyS/DPrRgOOT63VdllGEQGKQZ78RY1LoloqEbbRI5ibjq7vuc8Er73yzxSbBbnKhG6nHRdfdNwxn2IAtZw86tpNSaKO1u8lprFDLbdCbHu42J6qQx4R8HZcq12Myv1eRYvupQrFv3mDAHK+NWYwCMKvouof50RNnJiFn6zcisvNQXCgG8NWeDBWbszRIwgvmQLsNB/vHCzrHO1bAT4lEYNuFVoUstO8t1r0C7ZVM6Qruuj46J0ZESTo10hUoHCohutdJ0ZAmH4ZxmW57L+BO1eFarkM7hmEZX6fImn0fobNHhSaEy+dNpYa9OS6n4iE6N4teTw20rpZ/AjkLUvJXjMh/YPkQ7M4VvDLqUHh5MPqAbgq3tUEfgPTm+lNy9QibquFwBRsAb3HRU="
37-
# - BROWSER_PLATFORM="OS X 10.11"
38-
# - BROWSER_NAME="Safari"
39-
# - BROWSER_VERSION="10.0"
9+
env:
10+
global:
11+
- WebDriver_Platform="Windows 10"
12+
- WebDriver_BrowserName="Chrome"
4013

4114
install: Tools/Travis.install.sh
4215

‎CSF.WebDriverExtras.Tests/App.Travis.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<section name="WebDriverFactory" type="CSF.WebDriverExtras.Config.WebDriverFactoryConfigurationSection, CSF.WebDriverExtras"/>
5+
</configSections>
6+
<WebDriverFactory AssemblyQualifiedTypeName="CSF.WebDriverExtras.Factories.SauceConnectDriverFactory, CSF.WebDriverExtras"
7+
EnvironmentVariableSupportEnabled="True">
8+
<FactoryOptions>
9+
<Property Name="RemoteWebDriverAddress" Value="http://ondemand.saucelabs.com/wd/hub" />
10+
</FactoryOptions>
11+
</WebDriverFactory>
12+
</configuration>

‎CSF.WebDriverExtras.Tests/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3+
<configSections>
4+
<section name="WebDriverFactory" type="CSF.WebDriverExtras.Config.WebDriverFactoryConfigurationSection, CSF.WebDriverExtras"/>
5+
</configSections>
6+
<WebDriverFactory AssemblyQualifiedTypeName="CSF.WebDriverExtras.Factories.ChromeDriverFactory, CSF.WebDriverExtras" />
37
<runtime>
48
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
59
<dependentAssembly>

‎CSF.WebDriverExtras.Tests/CSF.WebDriverExtras.Tests.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.WebDriverExtras.Tests</RootNamespace>
99
<AssemblyName>CSF.WebDriverExtras.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.3.0-beta</ReleaseVersion>
11+
<ReleaseVersion>0.3.1-beta</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -54,6 +54,9 @@
5454
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
5555
</Reference>
5656
<Reference Include="System.Drawing" />
57+
<Reference Include="WebDriver.Support">
58+
<HintPath>..\packages\Selenium.Support.3.4.0\lib\net40\WebDriver.Support.dll</HintPath>
59+
</Reference>
5760
</ItemGroup>
5861
<ItemGroup>
5962
<Compile Include="AutoMoqDataAttribute.cs" />
@@ -72,10 +75,12 @@
7275
<Compile Include="Flags\FlagsDefinitionTests.cs" />
7376
<Compile Include="Flags\BrowserFlagsProviderTests.cs" />
7477
<Compile Include="FactoryBuilders\WebDriverFactorySourceIntegrationTests.cs" />
78+
<Compile Include="ConnectToGoogleIntegrationTest.cs" />
7579
</ItemGroup>
7680
<ItemGroup>
7781
<None Include="packages.config" />
7882
<None Include="App.config" />
83+
<None Include="App.Travis.config" />
7984
</ItemGroup>
8085
<ItemGroup>
8186
<ProjectReference Include="..\CSF.WebDriverExtras\CSF.WebDriverExtras.csproj">
@@ -95,4 +100,5 @@
95100
</EmbeddedResource>
96101
</ItemGroup>
97102
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
103+
<Import Project="..\packages\Selenium.WebDriver.ChromeDriver.2.30.0.1\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.2.30.0.1\build\Selenium.WebDriver.ChromeDriver.targets')" />
98104
</Project>

‎CSF.WebDriverExtras.Tests/ConnectToGoogleIntegrationTest.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System;
2+
using NUnit.Framework;
3+
using OpenQA.Selenium.Support.UI;
4+
5+
namespace CSF.WebDriverExtras.Tests
6+
{
7+
[TestFixture,Explicit,Category("Browser"),Description("Connect a web driver to Google")]
8+
public class ConnectToGoogleIntegrationTest
9+
{
10+
[Test,Description("The web driver can read the title from the Google home page")]
11+
public void Can_read_Google_window_title()
12+
{
13+
// Arrange
14+
var scenarioName = "Connect a web driver to Google: The web driver can read the title from the Google home page";
15+
var driverFactory = GetWebDriverFactory.FromConfiguration();
16+
string result;
17+
18+
// Act
19+
using(var webDriver = driverFactory.CreateWebDriver(scenarioName: scenarioName))
20+
{
21+
webDriver.Navigate().GoToUrl("https://google.com/");
22+
var wait = new WebDriverWait(webDriver, TimeSpan.FromSeconds(2))
23+
.Until(ExpectedConditions.TitleContains("Google"));
24+
result = webDriver.Title;
25+
}
26+
27+
// Assert
28+
Assert.That(result, Contains.Substring("Google"));
29+
}
30+
}
31+
}

‎CSF.WebDriverExtras.Tests/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
<package id="CSF.Configuration" version="1.1.0" targetFramework="net45" />
88
<package id="Moq" version="4.7.25" targetFramework="net45" />
99
<package id="NUnit" version="3.7.1" targetFramework="net45" />
10+
<package id="Selenium.Support" version="3.4.0" targetFramework="net45" />
1011
<package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
12+
<package id="Selenium.WebDriver.ChromeDriver" version="2.30.0.1" targetFramework="net45" />
1113
</packages>

‎CSF.WebDriverExtras.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ Global
2323
GlobalSection(NestedProjects) = preSolution
2424
EndGlobalSection
2525
GlobalSection(MonoDevelopProperties) = preSolution
26-
version = 0.3.0-beta
26+
version = 0.3.1-beta
2727
EndGlobalSection
2828
EndGlobal

‎CSF.WebDriverExtras/CSF.WebDriverExtras.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.WebDriverExtras</RootNamespace>
99
<AssemblyName>CSF.WebDriverExtras</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.3.0-beta</ReleaseVersion>
11+
<ReleaseVersion>0.3.1-beta</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>

‎CSF.WebDriverExtras/CSF.WebDriverExtras.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CSF.WebDriverExtras</id>
5-
<version>0.3.0-beta</version>
5+
<version>0.3.1-beta</version>
66
<title>CSF.WebDriverExtras</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>

‎CSF.WebDriverExtras/Factories/SauceConnectDriverFactory.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,12 @@ public override IWebDriver CreateWebDriver(IDictionary<string, object> requested
4444
IGetsBrowserFlags flagsProvider,
4545
string scenarioName)
4646
{
47-
var caps = requestedCapabilities;
47+
var requestedCaps = requestedCapabilities ?? new Dictionary<string,object>();
4848

4949
if(scenarioName != null)
50-
{
51-
caps = caps ?? new Dictionary<string,object>();
52-
caps[ScenarioNameCapabilityName] = scenarioName;
53-
}
50+
requestedCaps[ScenarioNameCapabilityName] = scenarioName;
5451

55-
return base.CreateWebDriver(requestedCapabilities, options, flagsProvider, scenarioName);
52+
return base.CreateWebDriver(requestedCaps, options, flagsProvider, scenarioName);
5653
}
5754

5855
/// <summary>

0 commit comments

Comments
 (0)