Skip to content

Commit a6369b5

Browse files
Jakub Raczekraczeja
Jakub Raczek
and
raczeja
authored
Browserstack (#473)
* Update github-actions.yml * Update ExecutingTestsOnLinuxBrowserStackGithubActions.ps1 * Update github-actions.yml * updated packages * fixed asserts * fixed tests * fixed tests * fixed tests * updated * fixed tests * updated apppsetings file * Update github-actions.yml * Update github-actions.yml * Update github-actions.yml * updated packages * Update github-actions.yml * fixex build issue * fixed build issue * Update README.md * Update github-actions.yml * fixed build issues * Update github-actions.yml * Update README.md --------- Co-authored-by: Jakub Raczek <jakub.raczek@accenture.com>
1 parent b22799a commit a6369b5

File tree

58 files changed

+1594
-2226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1594
-2226
lines changed

‎.github/workflows/github-actions.yml

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -157,29 +157,43 @@ jobs:
157157
steps:
158158
- uses: actions/checkout@v4
159159
- run: |
160-
ls
161-
160+
ls
162161
export ASPNETCORE_ENVIRONMENT=Linux
163-
164162
echo $ASPNETCORE_ENVIRONMENT
165-
166163
sed -i '/Documentation/,+5 d' ./Ocaramba.sln
167164
- run: dotnet build ./Ocaramba.sln --configuration ${{ env.buildConfiguration }}
168-
- run: chmod +x ./chromedriver.sh
169-
- run: ./chromedriver.sh
165+
- name: 'BrowserStack Env Setup'
166+
uses: 'browserstack/github-actions/setup-env@master'
167+
with:
168+
username: ${{ secrets.BROWSERSTACKUSER }}
169+
access-key: ${{ secrets.BROWSERSTACKKEY }}
170+
build-name: 'BUILD_INFO'
171+
project-name: 'REPO_NAME'
172+
- name: 'Start BrowserStackLocal Tunnel'
173+
uses: 'browserstack/github-actions/setup-local@master'
174+
with:
175+
local-testing: 'start'
176+
local-logging-level: 'all-logs'
177+
local-identifier: 'random'
170178
- shell: pwsh
171179
if: true
172180
env:
173181
MAPPED_ENV_BROWSERSTACKKEY: ${{ secrets.BROWSERSTACKKEY }}
174182
MAPPED_ENV_BROWSERSTACKUSER: ${{ secrets.BROWSERSTACKUSER }}
175-
MAPPED_ENV_TESTINGBOTKEY: ${{ env.testingbotkey }}
176-
MAPPED_ENV_TESTINGBOTSECRET: ${{ env.testingbotsecret }}
177-
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ env.saucelabsaccessKey }}
178-
MAPPED_ENV_SAUCELABSUSERNAME: ${{ env.saucelabsusername }}
183+
MAPPED_ENV_TESTINGBOTKEY: ${{ secrets.testingbotkey }}
184+
MAPPED_ENV_TESTINGBOTSECRET: ${{ secrets.testingbotsecret }}
185+
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ secrets.saucelabsaccessKey }}
186+
MAPPED_ENV_SAUCELABSUSERNAME: ${{ secrets.saucelabsusername }}
179187
run: ./ExecutingTestsOnLinuxBrowserStackGithubActions.ps1
188+
- name: 'Start BrowserStackLocal Tunnel'
189+
uses: 'browserstack/github-actions/setup-local@master'
190+
with:
191+
local-testing: 'stop'
192+
local-logging-level: 'all-logs'
193+
local-identifier: 'random'
180194
- name: Publish Test Results
181195
uses: EnricoMi/publish-unit-test-result-action/linux@v2
182-
if: false
196+
if: true
183197
with:
184198
files: |
185199
/home/runner/work/**/TestResults/*.xml
@@ -198,13 +212,12 @@ jobs:
198212
name: OcarambaBuild
199213
- run: Expand-Archive -Path OcarambaBuild.zip -DestinationPath ./
200214
- run: ./ExecutingTestsOnWindowsGithubActions1.ps1
201-
- run: Get-ChildItem .\ -Recurse
202215
- name: Publish Test Results
203216
uses: EnricoMi/publish-unit-test-result-action/windows@v2
204217
if: always()
205218
with:
206219
files: ${{ env.TestResultsDirWindows }}\*.trx
207-
check_name: ExecutingTestsOnWindowsGithubActions1
220+
check_name: ExecutingTestsOnWindowsGithubActionsCore1
208221
- name: Zip artifact
209222
run: Compress-Archive -Path D:\a\Ocaramba\Ocaramba\Ocaramba\Ocaramba.Tests.NUnitExtentReports\bin\Release\net8.0\TestOutput -Destination ExtentReports_${{ github.run_id }}.zip
210223
- uses: actions/upload-artifact@v4
@@ -226,14 +239,13 @@ jobs:
226239
name: OcarambaBuild
227240
- run: Expand-Archive -Path OcarambaBuild.zip -DestinationPath ./
228241
- run: ./ExecutingTestsOnWindowsGithubActions2.ps1
229-
- run: Get-ChildItem .\ -Recurse
230242
- name: Publish Test Results
231243
uses: EnricoMi/publish-unit-test-result-action/windows@v2
232244
if: always()
233245
with:
234246
files: |
235247
${{ env.TestResultsDirWindows }}\*.xml
236-
check_name: ExecutingTestsOnWindowsGithubActions2
248+
check_name: ExecutingTestsOnWindowsGithubActionsCore2
237249
test_Stage_RunTestsOnWindowsFramework:
238250
runs-on: windows-latest
239251
needs:
@@ -253,7 +265,7 @@ jobs:
253265
if: always()
254266
with:
255267
files: ${{ env.TestResultsDirWindows }}\*.xml
256-
check_name: ExecutingTestsOnWindowsGithubActions3
268+
check_name: ExecutingTestsOnWindowsGithubActionsNet3
257269
test_Stage_RunTestsOnWindowsBrowserStack:
258270
runs-on: windows-latest
259271
needs:
@@ -269,18 +281,18 @@ jobs:
269281
- run: Expand-Archive -Path OcarambaBuild.zip -DestinationPath ./
270282
- run: ./ExecutingTestsOnWindowsGithubActions4.ps1
271283
env:
272-
MAPPED_ENV_BROWSERSTACKKEY: ${{ env.browserstackkey }}
273-
MAPPED_ENV_BROWSERSTACKUSER: ${{ env.browserstackuser }}
274-
MAPPED_ENV_TESTINGBOTKEY: ${{ env.testingbotkey }}
275-
MAPPED_ENV_TESTINGBOTSECRET: ${{ env.testingbotsecret }}
276-
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ env.saucelabsaccessKey }}
277-
MAPPED_ENV_SAUCELABSUSERNAME: ${{ env.saucelabsusername }}
284+
MAPPED_ENV_BROWSERSTACKKEY: ${{ secrets.BROWSERSTACKKEY }}
285+
MAPPED_ENV_BROWSERSTACKUSER: ${{ secrets.BROWSERSTACKUSER }}
286+
MAPPED_ENV_TESTINGBOTKEY: ${{ secrets.testingbotkey }}
287+
MAPPED_ENV_TESTINGBOTSECRET: ${{ secrets.testingbotsecret }}
288+
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ secrets.saucelabsaccessKey }}
289+
MAPPED_ENV_SAUCELABSUSERNAME: ${{ secrets.saucelabsusername }}
278290
- name: Publish Test Results
279291
uses: EnricoMi/publish-unit-test-result-action/windows@v2
280292
if: always()
281293
with:
282294
files: ${{ env.TestResultsDirWindows }}\*.xml
283-
check_name: ExecutingTestsOnWindowsGithubActions4
295+
check_name: ExecutingTestsOnWindowsGithubActionsBrowserStack4
284296
test_Stage_RunTestsSeleniumGrid:
285297
runs-on: windows-latest
286298
needs:
@@ -301,7 +313,7 @@ jobs:
301313
with:
302314
files: |
303315
${{ env.TestResultsDirWindows }}\*.xml
304-
check_name: ExecutingTestsOnWindowsGithubActions5
316+
check_name: ExecutingTestsOnWindowsGithubActionsSeleniumGrid5
305317
test_Stage_RunTestsOnWindowsSaucelabs:
306318
runs-on: windows-latest
307319
needs:
@@ -317,19 +329,19 @@ jobs:
317329
- run: Expand-Archive -Path OcarambaBuild.zip -DestinationPath ./
318330
- run: ./ExecutingTestsOnWindowsGithubActions6.ps1
319331
env:
320-
MAPPED_ENV_BROWSERSTACKKEY: ${{ env.browserstackkey }}
321-
MAPPED_ENV_BROWSERSTACKUSER: ${{ env.browserstackuser }}
322-
MAPPED_ENV_TESTINGBOTKEY: ${{ env.testingbotkey }}
323-
MAPPED_ENV_TESTINGBOTSECRET: ${{ env.testingbotsecret }}
324-
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ env.saucelabsaccessKey }}
325-
MAPPED_ENV_SAUCELABSUSERNAME: ${{ env.saucelabsusername }}
332+
MAPPED_ENV_BROWSERSTACKKEY: ${{ secrets.BROWSERSTACKKEY }}
333+
MAPPED_ENV_BROWSERSTACKUSER: ${{ secrets.BROWSERSTACKUSER }}
334+
MAPPED_ENV_TESTINGBOTKEY: ${{ secrets.testingbotkey }}
335+
MAPPED_ENV_TESTINGBOTSECRET: ${{ secrets.testingbotsecret }}
336+
MAPPED_ENV_SAUCELABSACCESSKEY: ${{ secrets.saucelabsaccessKey }}
337+
MAPPED_ENV_SAUCELABSUSERNAME: ${{ secrets.saucelabsusername }}
326338
- name: Publish Test Results
327339
uses: EnricoMi/publish-unit-test-result-action/windows@v2
328340
if: always()
329341
with:
330342
files: |
331343
${{ env.TestResultsDirWindows }}\*.xml
332-
check_name: ExecutingTestsOnWindowsGithubActions6
344+
check_name: ExecutingTestsOnWindowsGithubActionsSaucelabs6
333345
release_Stage_PublishNuget:
334346
runs-on: windows-latest
335347
needs:
@@ -363,7 +375,6 @@ jobs:
363375
- uses: actions/download-artifact@v4
364376
with:
365377
name: OcarambaLiteS${{ env.frameworkVersion }}
366-
- run: Get-ChildItem ./ -Recurse
367378
- name: Push Nuget Package
368379
run: dotnet push .\Ocaramba\Ocaramba\Ocaramba.${{ env.frameworkVersion }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
369380
if: (success() && startsWith(github.ref, 'refs/tags/'))

‎ExecutingTestsOnLinuxBrowserStackGithubActions.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ $Env:ASPNETCORE_ENVIRONMENT="Linux"
55

66
echo $Env:ASPNETCORE_ENVIRONMENT
77

8-
Copy-Item -Path .\chromedriver -Destination ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net8.0" -Force
9-
108
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net8.0" "appsettings.Linux.json" "appSettings" "browser" "Chrome" -logValues -json
119

1210
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net8.0" "appsettings.Linux.json" "appSettings" "RemoteWebDriverHub" "https://$($env:MAPPED_ENV_BROWSERSTACKUSER):$($env:MAPPED_ENV_BROWSERSTACKKEY)@hub-cloud.browserstack.com/wd/hub/" -logValues -json

‎Ocaramba.Tests.Angular/App.config

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,24 @@
9999
<add key="EnablePersistentHover" value="false" />
100100
<add key="IntroduceInstabilityByIgnoringProtectedModeSettings" value="true" />
101101
</InternetExplorerPreferences>
102+
<startup>
103+
<supportedRuntime version="v4.7.2" sku=".NETFramework,Version=v4.7.2"/>
104+
</startup>
105+
106+
<runtime>
107+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
108+
<dependentAssembly>
109+
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
110+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="9.0.0.0" />
111+
</dependentAssembly>
112+
<dependentAssembly>
113+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
114+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="9.0.0.0" />
115+
</dependentAssembly>
116+
<dependentAssembly>
117+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
118+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="6.0.0.0" />
119+
</dependentAssembly>
120+
</assemblyBinding>
121+
</runtime>
102122
</configuration>

‎Ocaramba.Tests.Angular/Ocaramba.Tests.Angular.csproj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,22 @@
44
<TargetFrameworks>net8.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net8.0</TargetFrameworks>
66
</PropertyGroup>
7-
87
<ItemGroup>
98
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
10-
119
<PackageReference Include="NLog" Version="5.3.4" />
12-
13-
14-
<PackageReference Include="NUnit" Version="3.13.3" />
10+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
11+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
12+
<PackageReference Include="NUnit" Version="4.2.2" />
1513
<PackageReference Include="NUnit.Runners" Version="3.12.0" />
1614
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
1715
<PrivateAssets>all</PrivateAssets>
1816
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1917
</PackageReference>
20-
<PackageReference Include="Selenium.Support" Version="4.4.0" />
21-
<PackageReference Include="Selenium.WebDriver" Version="4.4.0" />
18+
<PackageReference Include="Selenium.Support" Version="4.27.0" />
19+
<PackageReference Include="Selenium.WebDriver" Version="4.27.0" />
2220
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="131.0.6778.8500" />
2321
<PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="0.35.0" />
2422
</ItemGroup>
25-
2623
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
2724
<Reference Include="System.Configuration" />
2825
<PackageReference Include="EWSoftware.SHFB" Version="2024.9.12" />
@@ -32,7 +29,7 @@
3229

3330
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
3431
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
35-
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.14" />
32+
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
3633
</ItemGroup>
3734

3835
<ItemGroup>

‎Ocaramba.Tests.Angular/Tests/AngularTestNunit.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void AngularPageNavigationTest()
4141
.ClickProtractorApi()
4242
.ClickElementToBeSelected();
4343

44-
Assert.True(protractorApiPage.IsElementToBeSelectedHeaderDisplayed(), "Header is not displayed.");
44+
Assert.That(protractorApiPage.IsElementToBeSelectedHeaderDisplayed(), Is.True, "Header is not displayed.");
4545
}
4646
}
4747
}

0 commit comments

Comments
 (0)