Skip to content

feat: Jump selenium from 4.0.0 to 4.4.0 #517

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

Merged
merged 6 commits into from
Sep 12, 2022
Merged

feat: Jump selenium from 4.0.0 to 4.4.0 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c4d85a
Target .NET Framework 4.8
Dor-bl Aug 31, 2022
8c39762
test:Fix ClipboardTests
Dor-bl Sep 10, 2022
a18e9ec
Merge branch 'appium:release/5.0.0' into release/5.0.0
Dor-bl Sep 10, 2022
437b313
Update Selenium from 4.0.0 to 4.4.0.
Dor-bl Sep 12, 2022
0b22e59
Removal of GetDomProperty
Dor-bl Sep 12, 2022
425b0b7
Merge branch 'appium:release/5.0.0' into release/5.0.0
Dor-bl Sep 12, 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 src/Appium.Net/Appium.Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Selenium.Support" Version="4.0.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.0.0" />
<PackageReference Include="Selenium.Support" Version="4.4.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/Appium.Net/Appium/AppiumElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@ public override string GetCssValue(string propertyName) => CacheValue(
() => base.GetCssValue(propertyName)
)?.ToString();

public override string GetProperty(string propertyName) => CacheValue(
//TODO: Add Integrations tests
public string GetProperty(string propertyName) => CacheValue(
"property/" + propertyName,
() => base.GetProperty(propertyName)
() => base.GetDomProperty(propertyName)
)?.ToString();

protected virtual object CacheValue(string key, Func<object> getter)
Expand Down
11 changes: 0 additions & 11 deletions src/Appium.Net/Appium/AppiumOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,6 @@ public void AddAdditionalAppiumOption(string optionName, object optionValue)
this.additionalAppiumOptions[name] = optionValue;
}

/// <summary>
/// Add new capabilities
/// </summary>
/// <param name="capabilityName">Capability name</param>
/// <param name="capabilityValue">Capabilities value, which cannot be null or empty</param>
[Obsolete("Use the the AddAdditionalAppiumOption method for adding additional options")]
public override void AddAdditionalCapability(string capabilityName, object capabilityValue)
{
this.AddAdditionalAppiumOption(capabilityName, capabilityValue);
}

public override void AddAdditionalOption(string optionName, object optionValue)
{
throw new NotImplementedException("Use the the AddAdditionalAppiumOption method for adding additional options");
Expand Down
2 changes: 1 addition & 1 deletion src/Appium.Net/Appium/Service/Options/OptionCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public OptionCollector AddCapabilities(AppiumOptions options)

foreach (var item in result)
{
this.options.AddAdditionalCapability(item.Key, item.Value);
this.options.AddAdditionalAppiumOption(item.Key, item.Value);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/integration/ServerTests/StartingAppLocallyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void CheckThatServiseIsNotRunWhenTheCreatingOfANewSessionIsFailed()
? //it will be a cause of error
Caps.GetAndroidUIAutomatorCaps(Apps.Get("androidApiDemos"))
: Caps.GetAndroidUIAutomatorCaps(Apps.Get("androidApiDemos"));
capabilities.AddAdditionalAppiumOption(MobileCapabilityType.DeviceName, "iPhone Simulator");
capabilities.DeviceName = "iPhone Simulator";
capabilities.AddAdditionalAppiumOption(MobileCapabilityType.PlatformName, MobilePlatform.IOS);

var builder = new AppiumServiceBuilder();
Expand Down