Skip to content

Commit 4af551b

Browse files
committed
Merge branch 'master' of https://github.com/Accenture/Ocaramba
2 parents ac1f807 + eaad942 commit 4af551b

File tree

2 files changed

+40
-43
lines changed

2 files changed

+40
-43
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Ocaramba Templates](https://img.shields.io/badge/get-Ocaramba_Templates-green.svg?color=4BC21F)](https://marketplace.visualstudio.com/items?itemName=Ocaramba.Ocaramba1)
77
![Build status](https://github.com/Accenture/Ocaramba/actions/workflows/github-actions.yml/badge.svg)
88
[![BrowserStack Status](https://automate.browserstack.com/badge.svg?badge_key=ZUJWZGNEczFZVFNVWUJvUHJ6Y0pYUTlnSG4rYnhKVXFUeSsrYzlTUEZIZz0tLWxZUStLVnNqWml6bXNpcm1FSUxMQ3c9PQ==--20fde38e51169fe9739fc60ce188f00ecdf0f1fe)](https://automate.browserstack.com/public-build/ZUJWZGNEczFZVFNVWUJvUHJ6Y0pYUTlnSG4rYnhKVXFUeSsrYzlTUEZIZz0tLWxZUStLVnNqWml6bXNpcm1FSUxMQ3c9PQ==--20fde38e51169fe9739fc60ce188f00ecdf0f1fe)
9-
[![Sauce Test Status](https://app.saucelabs.com/buildstatus/jraczek)](https://app.saucelabs.com/u/JRACZEK)
9+
[![Sauce Test Status](https://app.saucelabs.com/buildstatus/jraczek?auth=99f92a548ce2dd8fb1f203910a4d7d0f)](https://app.saucelabs.com/u/jraczek?auth=99f92a548ce2dd8fb1f203910a4d7d0f)
1010

1111
Test Framework was designed in Objectivity to propose a common way how people should create Selenium WebDriver tests.
1212

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
echo '********************************************Downloading Selenium Grid********************************************'
2-
1+
echo '********************************************Downloading Selenium Grid********************************************'
2+
33
$url = $env:seleniumGridUrl
4-
54
$grid = $env:seleniumGridVersion
6-
7-
$output = $PSScriptRoot + ".\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\$grid"
8-
9-
$outputLogs = $PSScriptRoot + ".\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\"
10-
5+
$output = Join-Path $PSScriptRoot "..\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\$grid"
6+
$outputLogs = Join-Path $PSScriptRoot "..\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\"
7+
118
$start_time = Get-Date
129

1310
echo url: $url
@@ -16,56 +13,56 @@ echo output: $output
1613
echo outputLogs: $outputLogs
1714

1815
echo "Downloading Selenium Grid from: $($url) to $($output)"
19-
Invoke-WebRequest -Uri "$($url)" -Out "$($output)"
20-
16+
Invoke-WebRequest -Uri "$($url)" -OutFile "$($output)"
17+
2118
echo "Selenium Grid downloaded to:" $output
22-
19+
2320
echo "Time taken to download $($grid): $((Get-Date).Subtract($start_time).Seconds) second(s)"
24-
25-
echo '******************************************Start Selenium Grid in background****************************************'
26-
27-
$appHub=Start-Process java -ArgumentList '-jar', $output' hub' -RedirectStandardOutput $outputLogs'console_hub.out' -RedirectStandardError $outputLogs'console_hub.err' -passthru
21+
22+
echo '******************************************Start Selenium Grid in background****************************************'
23+
24+
$appHub=Start-Process java -ArgumentList '-jar', $output, 'hub' -RedirectStandardOutput "$outputLogs\console_hub.out" -RedirectStandardError "$outputLogs\console_hub.err" -PassThru
2825

2926
Start-Sleep -s 5
30-
27+
3128
echo "Selenium Grid hub started"
3229

33-
$appNode=Start-Process java -ArgumentList '-jar', $output' node --detect-drivers true' -RedirectStandardOutput $outputLogs'console_node.out' -RedirectStandardError $outputLogs'console_node.err' -passthru
34-
30+
$appNode=Start-Process java -ArgumentList '-jar', $output, 'node --detect-drivers true' -RedirectStandardOutput "$outputLogs\console_node.out" -RedirectStandardError "$outputLogs\console_node.err" -PassThru
31+
3532
Start-Sleep -s 5
36-
33+
3734
echo "Selenium Grid node started"
38-
39-
echo '********************************************Run tests with Selenium Grid ****************************************'
40-
41-
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\" "Ocaramba.Tests.NUnit.dll.config" "//appSettings" "browser|RemoteWebDriverHub" "RemoteWebDriver|http://localhost:4444/wd/hub" -logValues
42-
35+
36+
echo '********************************************Run tests with Selenium Grid ****************************************'
37+
38+
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\" "Ocaramba.Tests.NUnit.dll.config" "//appSettings" "browser|RemoteWebDriverHub" "RemoteWebDriver|http://localhost:4444/wd/hub"
39+
4340
dotnet vstest .\Ocaramba\Ocaramba.Tests.NUnit\bin\Release\net472\Ocaramba.Tests.NUnit.dll /TestCaseFilter:"TestCategory=Grid" /Parallel /Logger:"trx;LogFileName=Ocaramba.Tests.NUnitGrid.xml"
44-
41+
4542
echo '*****************************Run CloudProviderCrossBrowser tests with Selenium Grid****************************'
46-
47-
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net472" "Ocaramba.Tests.CloudProviderCrossBrowser.dll.config" "//appSettings" "RemoteWebDriverHub" "http://localhost:4444/wd/hub" -logValues
48-
43+
44+
.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net472" "Ocaramba.Tests.CloudProviderCrossBrowser.dll.config" "//appSettings" "RemoteWebDriverHub" "http://localhost:4444/wd/hub"
45+
4946
dotnet vstest .\Ocaramba\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net472\Ocaramba.Tests.CloudProviderCrossBrowser.dll /TestCaseFilter:"FullyQualifiedName~Chrome" /Parallel /Logger:"trx;LogFileName=Ocaramba.Tests.CloudProviderCrossBrowserGrid.xml"
50-
47+
5148
if($lastexitcode -ne 0)
52-
{
49+
{
5350
echo 'lastexitcode' $lastexitcode
54-
}
51+
}
5552

5653
echo '*****************************Stop Selenium Grid****************************'
57-
58-
echo "Stop Selenium Grid node"
59-
54+
55+
echo "Stop Selenium Grid node"
56+
6057
Stop-Process -Id $appNode.Id
61-
62-
echo "Stop Selenium Grid hub"
63-
64-
Stop-Process -Id $appHub.Id
58+
59+
echo "Stop Selenium Grid hub"
60+
61+
Stop-Process -Id $appHub.Id
6562

6663
if($lastexitcode -ne 0)
67-
{
64+
{
6865
echo 'lastexitcode' $lastexitcode
69-
}
70-
71-
exit 0
66+
}
67+
68+
exit 0

0 commit comments

Comments
 (0)