Skip to content

Commit fe3d14c

Browse files
authored
Update to Appium 5.1.0, Selenium 4.23.0 (#58) +semver:feature
* Update to Appium 5.1.0, Selenium 4.23.0 +semver:feature use .NET 8 / 4.8 instead of .NET standard * Update downloads tab name in tests after recent Chrome update * Stabilize Chrome tests, add retry to pipeline and update SonarQube task configurations
1 parent e2bb72c commit fe3d14c

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

Aquality.WinAppDriver/src/Aquality.WinAppDriver/Actions/MouseActions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void Click(int? x = null, int? y = null, MouseButton? button = null, ILis
9090
{
9191
parameters.Add("interClickDelayMs", interClickDelay?.TotalMilliseconds);
9292
}
93-
Point cursor;
93+
Point cursor = default;
9494
if (x == null || y == null)
9595
{
9696
cursor = Coordinates;
@@ -142,7 +142,7 @@ public void Hover(int startX, int startY, int? endX = null, int? endY = null, IL
142142
public void Scroll(int delta, int? x = null, int? y = null, ScrollDirection direction = ScrollDirection.Vertical, IList<ModifierKey> modifierKeys = null)
143143
{
144144
var parameters = ResolveParameters(modifierKeys);
145-
Point cursor;
145+
Point cursor = default;
146146
if (x == null || y == null)
147147
{
148148
cursor = Coordinates;

Aquality.WinAppDriver/src/Aquality.WinAppDriver/Aquality.WinAppDriver.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net48;net8.0</TargetFrameworks>
55

66
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
77
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -45,8 +45,8 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.2" />
49-
<PackageReference Include="Aquality.Selenium.Core" Version="3.0.6" />
48+
<PackageReference Include="Appium.WebDriver" Version="5.1.0" />
49+
<PackageReference Include="Aquality.Selenium.Core" Version="3.0.12" />
5050
</ItemGroup>
5151

5252
</Project>

Aquality.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Aquality.WinAppDriver.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

Aquality.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Forms/Chrome/ChromeNavigationPanel.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using Aquality.WinAppDriver.Actions;
1+
using Aquality.Selenium.Core.Configurations;
2+
using Aquality.WinAppDriver.Actions;
3+
using Aquality.WinAppDriver.Applications;
24
using Aquality.WinAppDriver.Elements.Interfaces;
35
using Aquality.WinAppDriver.Forms;
46
using OpenQA.Selenium;
@@ -32,7 +34,7 @@ public void DontSignIn()
3234
public void ClosePopUps()
3335
{
3436
State.WaitForExist();
35-
if (NoThanksButton.State.IsExist)
37+
if (!NoThanksButton.State.WaitForNotDisplayed())
3638
{
3739
NoThanksButton.Click();
3840
NoThanksButton.State.WaitForNotDisplayed();

Aquality.WinAppDriver/tests/Aquality.WinAppDriver.Tests/Forms/Chrome/MultipleWindowsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class MultipleWindowsTest : TestWithCustomApplication
1616
: Path.Combine(ProgramFiles, AppPathRelativeFromProgramFiles);
1717

1818
private static string NewTabName => $"New Tab{TabNamePostfix}";
19-
private static string DownloadsTabName => $"Downloads{TabNamePostfix}";
19+
private static string DownloadsTabName => $"Download history{TabNamePostfix}";
2020

2121
private const string TabNamePostfix = " - Google Chrome";
2222

azure-pipelines.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ stages:
1515
displayName: Analyse code with SonarQube
1616

1717
steps:
18-
- task: SonarCloudPrepare@1
18+
- task: SonarCloudPrepare@2
1919
displayName: 'Prepare SonarCloud analysis'
2020
inputs:
2121
SonarCloud: 'SonarCloud'
2222
organization: 'aqualityautomation'
23+
scannerMode: 'MSBuild'
2324
projectKey: 'aquality-automation_aquality-winappdriver-dotnet'
2425
projectName: 'aquality-winappdriver-dotnet'
2526
projectVersion: '$(Build.BuildNumber)'
@@ -33,12 +34,16 @@ stages:
3334
projects: Aquality.WinAppDriver/Aquality.WinAppDriver.sln
3435
arguments: -c $(buildConfiguration)
3536

36-
- task: SonarCloudAnalyze@1
37+
- task: SonarCloudAnalyze@2
3738
displayName: 'Run SonarCloud code analysis'
3839
continueOnError: true
40+
inputs:
41+
jdkversion: 'JAVA_HOME_17_X64'
3942

40-
- task: SonarCloudPublish@1
43+
- task: SonarCloudPublish@2
4144
displayName: 'Publish SonarCloud quality gate results'
45+
inputs:
46+
pollingTimeoutSec: '300'
4247

4348
- job: tests
4449
displayName: Run tests
@@ -96,6 +101,7 @@ stages:
96101
97102
- task: DotNetCoreCLI@2
98103
displayName: 'Run tests'
104+
retryCountOnTaskFailure: 1
99105
inputs:
100106
command: 'test'
101107
projects: '**/*Tests*/*.csproj'
@@ -139,4 +145,4 @@ stages:
139145
command: 'push'
140146
packagesToPush: '$(Build.ArtifactStagingDirectory)/**/Aquality.WinAppDriver*.nupkg;!$(Build.ArtifactStagingDirectory)/**/Aquality.WinAppDriver*.symbols.nupkg'
141147
nuGetFeedType: 'external'
142-
publishFeedCredentials: 'NuGet'
148+
publishFeedCredentials: 'NuGet'

0 commit comments

Comments
 (0)