Skip to content

Commit 7699a35

Browse files
rosolkorosolko
committed
Add ability to use phantom beta version binary. Disable edge and opera tests due appveyor limitation. Update selenium to 3.2.0 version.
1 parent e658c40 commit 7699a35

File tree

11 files changed

+26
-43
lines changed

11 files changed

+26
-43
lines changed

‎IntegrationTests/BrowserTests/BrowserTests.cs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ public class BrowserData : IEnumerable<object[]>
1414
private readonly List<object[]> _data = new List<object[]>
1515
{
1616
new object[] {new ChromeConfig(), DriverType.Chrome},
17-
new object[] {new EdgeConfig(), DriverType.Edge},
17+
// new object[] {new EdgeConfig(), DriverType.Edge},
1818
new object[] {new FirefoxConfig(), DriverType.Firefox},
1919
new object[] {new InternetExplorerConfig(), DriverType.InternetExplorer},
20-
new object[] {new OperaConfig(), DriverType.Opera},
20+
// new object[] {new OperaConfig(), DriverType.Opera},
2121
new object[] {new PhantomConfig(), DriverType.Phantom}
2222
};
2323

@@ -39,14 +39,7 @@ public class BrowserTests : IDisposable
3939
[Theory, ClassData(typeof(BrowserData)), Trait("Category", "Browser")]
4040
protected void BrowserTest(IDriverConfig driverConfig, DriverType driverType)
4141
{
42-
if (driverType == DriverType.Phantom)
43-
{
44-
new DriverManager().SetUpDriver(driverConfig, "2.1.1");
45-
}
46-
else
47-
{
48-
new DriverManager().SetUpDriver(driverConfig);
49-
}
42+
new DriverManager().SetUpDriver(driverConfig);
5043
_webDriver = new DriverCreator().Create(driverType);
5144
_webDriver.Navigate().GoToUrl("https://www.google.com/ncr");
5245
Assert.True(_webDriver.Title.Contains("Google"));

‎IntegrationTests/IntegrationTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<Reference Include="System.Data" />
3939
<Reference Include="System.Runtime" />
4040
<Reference Include="System.Xml" />
41-
<Reference Include="WebDriver, Version=3.2.0.0, Culture=neutral, PublicKeyToken=null">
42-
<HintPath>..\packages\Selenium.WebDriver.3.2.0\lib\net40\WebDriver.dll</HintPath>
41+
<Reference Include="WebDriver, Version=3.3.0.0, Culture=neutral, PublicKeyToken=null">
42+
<HintPath>..\packages\Selenium.WebDriver.3.3.0\lib\net40\WebDriver.dll</HintPath>
4343
</Reference>
4444
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
4545
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>

‎IntegrationTests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following

‎IntegrationTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Selenium.WebDriver" version="3.2.0" targetFramework="net45" />
3+
<package id="Selenium.WebDriver" version="3.3.0" targetFramework="net462" />
44
<package id="xunit" version="2.2.0" targetFramework="net462" />
55
<package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
66
<package id="xunit.assert" version="2.2.0" targetFramework="net462" />

‎WebDriverManager/DriverConfigs/Impl/ChromeConfig.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ public string GetLatestVersion()
3434
{
3535
using (var content = response.GetResponseStream())
3636
{
37-
if (content == null)
38-
throw new ArgumentNullException(
39-
$"Can't get content from URL: {url}");
37+
if (content == null) throw new ArgumentNullException($"Can't get content from URL: {url}");
4038
using (var reader = new StreamReader(content))
4139
{
4240
var version = reader.ReadToEnd().Trim();

‎WebDriverManager/DriverConfigs/Impl/EdgeConfig.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ public string GetLatestVersion()
3131
{
3232
using (var client = new WebClient())
3333
{
34-
var htmlCode = client.DownloadString(
35-
"https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
34+
var htmlCode = client.DownloadString("https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
3635
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
3736
var document = parser.Parse(htmlCode);
38-
var version = document
39-
.QuerySelectorAll("[class='driver-download'] p")
37+
var version = document.QuerySelectorAll("[class='driver-download'] p")
4038
.Select(element => element.TextContent)
4139
.FirstOrDefault()
4240
?.Split(' ')[1]
@@ -49,12 +47,10 @@ private static string GetUrl()
4947
{
5048
using (var client = new WebClient())
5149
{
52-
var htmlCode = client.DownloadString(
53-
"https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
50+
var htmlCode = client.DownloadString("https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
5451
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
5552
var document = parser.Parse(htmlCode);
56-
var url = document
57-
.QuerySelectorAll("[class='driver-download'] a")
53+
var url = document.QuerySelectorAll("[class='driver-download'] a")
5854
.Select(element => element.Attributes.GetNamedItem("href"))
5955
.FirstOrDefault()
6056
?.Value;

‎WebDriverManager/DriverConfigs/Impl/FirefoxConfig.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public string GetUrl32()
1919

2020
public string GetUrl64()
2121
{
22-
return
23-
"https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-win64.zip";
22+
return "https://github.com/mozilla/geckodriver/releases/download/v<version>/geckodriver-v<version>-win64.zip";
2423
}
2524

2625
public string GetBinaryName()
@@ -35,8 +34,7 @@ public string GetLatestVersion()
3534
var htmlCode = client.DownloadString("https://github.com/mozilla/geckodriver/releases");
3635
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
3736
var document = parser.Parse(htmlCode);
38-
var version = document
39-
.QuerySelectorAll("[class='release-title'] a")
37+
var version = document.QuerySelectorAll("[class='release-title'] a")
4038
.Select(element => element.TextContent)
4139
.FirstOrDefault()
4240
?.Remove(0, 1);

‎WebDriverManager/DriverConfigs/Impl/InternetExplorerConfig.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public string GetLatestVersion()
3636
var htmlCode = client.DownloadString("http://www.seleniumhq.org/download");
3737
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
3838
var document = parser.Parse(htmlCode);
39-
var version = document
40-
.QuerySelectorAll("#mainContent > p:nth-child(10)")
39+
var version = document.QuerySelectorAll("#mainContent > p:nth-child(10)")
4140
.Select(element => element.TextContent)
4241
.FirstOrDefault()
4342
?.Split(' ')[2];

‎WebDriverManager/DriverConfigs/Impl/OperaConfig.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ public string GetName()
1414

1515
public string GetUrl32()
1616
{
17-
return
18-
"https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win32.zip";
17+
return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win32.zip";
1918
}
2019

2120
public string GetUrl64()
2221
{
23-
return
24-
"https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win64.zip";
22+
return "https://github.com/operasoftware/operachromiumdriver/releases/download/v<version>/operadriver_win64.zip";
2523
}
2624

2725
public string GetBinaryName()
@@ -36,8 +34,7 @@ public string GetLatestVersion()
3634
var htmlCode = client.DownloadString("https://github.com/operasoftware/operachromiumdriver/releases");
3735
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
3836
var document = parser.Parse(htmlCode);
39-
var version = document
40-
.QuerySelectorAll("[class='release-title'] a")
37+
var version = document.QuerySelectorAll("[class='release-title'] a")
4138
.Select(element => element.TextContent)
4239
.FirstOrDefault();
4340
return version;

‎WebDriverManager/DriverConfigs/Impl/PhantomConfig.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ public string GetLatestVersion()
3434
var htmlCode = client.DownloadString("https://bitbucket.org/ariya/phantomjs/downloads");
3535
var parser = new HtmlParser(Configuration.Default.WithDefaultLoader());
3636
var document = parser.Parse(htmlCode);
37-
var version = document
38-
.QuerySelectorAll("tr[class='iterable-item'] td[class='name'] a")
37+
var version = document.QuerySelectorAll("tr[class='iterable-item'] td[class='name'] a")
3938
.Select(element => element.TextContent)
40-
.FirstOrDefault()
41-
?.Split('-')[1];
39+
.FirstOrDefault();
40+
version = version != null && version.Contains("beta")
41+
? $"{version.Split('-')[1]}-{version.Split('-')[2]}"
42+
: version?.Split('-')[1];
4243
return version;
4344
}
4445
}

0 commit comments

Comments
 (0)