Skip to content

Commit 4347a94

Browse files
committed
Fix travis configUpdate edge config related to updates.
Lock IE and phantom versions. Extract version and download tests to separate for each config.
1 parent 39bf71f commit 4347a94

14 files changed

+162
-138
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class ChromeConfigTests : ChromeConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+.\d+.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new ChromeConfig());
22+
}
23+
}
24+
}

WebDriverManager.Tests/DriverDownloadTests.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class EdgeConfigTests : EdgeConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+.\d+.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new EdgeConfig());
22+
}
23+
}
24+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class FirefoxConfigTests : FirefoxConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+\.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new FirefoxConfig());
22+
}
23+
}
24+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class InternetExplorerConfigTests : InternetExplorerConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+\.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new InternetExplorerConfig());
22+
}
23+
}
24+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class OperaConfigTests : OperaConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new OperaConfig());
22+
}
23+
}
24+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System.Text.RegularExpressions;
2+
using WebDriverManager.DriverConfigs.Impl;
3+
using Xunit;
4+
5+
namespace WebDriverManager.Tests
6+
{
7+
public class PhantomConfigTests : PhantomConfig
8+
{
9+
[Fact]
10+
public void VersionTest()
11+
{
12+
var version = GetLatestVersion();
13+
var regex = new Regex(@"^\d+\.\d+\.\d+$");
14+
Assert.NotEmpty(version);
15+
Assert.Matches(regex, version);
16+
}
17+
18+
[Fact]
19+
public void DriverDownloadTest()
20+
{
21+
new DriverManager().SetUpDriver(new PhantomConfig());
22+
}
23+
}
24+
}

WebDriverManager.Tests/VersionTests.cs

Lines changed: 0 additions & 45 deletions
This file was deleted.

WebDriverManager.Tests/WebDriverManager.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="2.5.1" />
10+
<PackageReference Include="coverlet.msbuild" Version="2.6.1" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />

WebDriverManager/DriverConfigs/Impl/EdgeConfig.cs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ public virtual string GetName()
1313

1414
public virtual string GetUrl32()
1515
{
16-
return GetUrl();
16+
return "https://az813057.vo.msecnd.net/webdriver/msedgedriver_x86/msedgedriver.exe";
1717
}
1818

1919
public virtual string GetUrl64()
2020
{
21-
return GetUrl32();
21+
return "https://az813057.vo.msecnd.net/webdriver/msedgedriver_x64/msedgedriver.exe";
2222
}
2323

2424
public virtual string GetBinaryName()
2525
{
26-
return "MicrosoftWebDriver.exe";
26+
return "msedgedriver.exe";
2727
}
2828

2929
public virtual string GetLatestVersion()
@@ -42,21 +42,5 @@ public virtual string GetLatestVersion()
4242
return version;
4343
}
4444
}
45-
46-
public virtual string GetUrl()
47-
{
48-
using (var client = new WebClient())
49-
{
50-
var htmlCode =
51-
client.DownloadString("https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver");
52-
var parser = new HtmlParser();
53-
var document = parser.ParseDocument(htmlCode);
54-
var url = document.QuerySelectorAll(".driver-download > a")
55-
.Select(element => element.Attributes.GetNamedItem("href"))
56-
.FirstOrDefault()
57-
?.Value;
58-
return url;
59-
}
60-
}
6145
}
6246
}

0 commit comments

Comments
 (0)