Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump RestSharp from 105.0.1 to 106.12.0 in /ExtjsWd #10

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Bump RestSharp from 105.0.1 to 106.12.0 in /ExtjsWd #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ee346f4
Update selenium packages + fix compiliation errors on pageobjects (ne…
Aug 10, 2022
0f8ae88
Fix tests - dispose no longer needed? Also updated chromedriver for t…
Aug 10, 2022
0f5ac31
Merge pull request #11 from pratoservices/update-webdriver
YannickLemmens Aug 10, 2022
1f83733
update nuspec
Aug 10, 2022
9618c3a
Merge branch 'master' of https://github.com/pratoservices/extjswebdriver
Aug 10, 2022
2ad40d3
update nuspec
Aug 10, 2022
ecc7a47
typo in dependency
Aug 10, 2022
37ed53b
Remove pagefactory
Aug 11, 2022
72ce1ba
Bump RestSharp from 105.0.1 to 106.12.0 in /ExtjsWd
dependabot[bot] Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ExtjsWd.Test/ExtjsWd.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="WebDriver, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Selenium.WebDriver.3.7.0\lib\net40\WebDriver.dll</HintPath>
<Reference Include="WebDriver, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\ExtjsWd\packages\Selenium.WebDriver.4.4.0\lib\net46\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<Choose>
Expand Down
1 change: 0 additions & 1 deletion ExtjsWd.Test/WebDriverTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ public void ClearChromeDriver()
if (_TestFixture != null)
{
_TestFixture.CleanupChromeDriver();
_TestFixture.Dispose();
_TestFixture = null;
}
}
Expand Down
Binary file modified ExtjsWd.Test/chromedriver.exe
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ExtjsWd.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="net40" />
<package id="Selenium.WebDriver" version="3.7.0" targetFramework="net40" />
<package id="Selenium.WebDriver" version="4.4.0" targetFramework="net461" />
</packages>
3 changes: 0 additions & 3 deletions ExtjsWd/Elements/BaseContainerComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ExtjsWd.js;
using NUnit.Framework;
using OpenQA.Selenium;
using OpenQA.Selenium.Support.PageObjects;
using OpenQA.Selenium.Support.UI;
using System;
using System.Collections;
Expand All @@ -27,8 +26,6 @@ protected BaseContainerComponent(IWebDriver driver, int timeoutInSeconds)
TimeoutInSeconds = timeoutInSeconds;
Driver = driver;
SystemErrorDetectionText = "Systeem fout";

PageFactory.InitElements(driver, this);
}

public int AjaxRequestsBusy
Expand Down
14 changes: 12 additions & 2 deletions ExtjsWd/Elements/BaseElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,19 @@ public string GetCssValue(string propertyName)
return Element.GetCssValue(propertyName);
}

public string GetProperty(string propertyName)
public string GetDomAttribute(string attributeName)
{
return Element.GetProperty(propertyName);
return Element.GetDomAttribute(attributeName);
}

public string GetDomProperty(string propertyName)
{
return Element.GetDomProperty(propertyName);
}

public ISearchContext GetShadowRoot()
{
return Element.GetShadowRoot();
}

public void SendKeys(string text)
Expand Down
8 changes: 4 additions & 4 deletions ExtjsWd/ExtjsWd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Selenium.WebDriver.3.7.0\lib\net40\WebDriver.dll</HintPath>
<Reference Include="WebDriver, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Selenium.WebDriver.4.4.0\lib\net46\WebDriver.dll</HintPath>
</Reference>
<Reference Include="WebDriver.Support, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Selenium.Support.3.7.0\lib\net40\WebDriver.Support.dll</HintPath>
<Reference Include="WebDriver.Support, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\Selenium.Support.4.4.0\lib\net46\WebDriver.Support.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions ExtjsWd/ExtjsWd.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
<description>Description</description>
<dependencies>
<dependency id="NUnit" version="3.9.0" />
<dependency id="RestSharp" version="[105.0.1]" />
<dependency id="Selenium.Support" version="[3.7.0]" />
<dependency id="Selenium.WebDriver" version="[3.7.0]" />
<dependency id="RestSharp" version="105.0.1" />
<dependency id="Selenium.Support" version="3.7.0" />
<dependency id="Selenium.WebDriver" version="3.7.0" />
<dependency id="DotNetSeleniumExtras.PageObjects" version="3.11.0" />
</dependencies>
</metadata>
</package>
6 changes: 3 additions & 3 deletions ExtjsWd/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.11.0" targetFramework="net40" />
<package id="RestSharp" version="105.0.1" targetFramework="net40" />
<package id="Selenium.Support" version="3.7.0" targetFramework="net40" />
<package id="Selenium.WebDriver" version="3.7.0" targetFramework="net40" />
<package id="RestSharp" version="106.12.0" targetFramework="net40" />
<package id="Selenium.Support" version="4.4.0" targetFramework="net461" />
<package id="Selenium.WebDriver" version="4.4.0" targetFramework="net461" />
</packages>