Skip to content

Commit a079656

Browse files
author
Jakub Raczek
authored
Merge pull request #5 from ObjectivityLtd/3.2.8
3.2.8
2 parents 6a80398 + 195bc09 commit a079656

14 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎Ocaramba.ProjectExample.MsTest.NetCore/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.2-sdk-stretch
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1
22
LABEL maintainer "Ocaramba <ocaramba@objectivity.co.uk>"
33
#=========
44
# Midnight Commander, lbzip2

‎Ocaramba.ProjectExample.MsTest.NetCore/Ocaramba.MsTest.NC.vstemplate‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
</Project>
3636
<CustomParameters>
3737
<CustomParameter Name="$Appveyor.TestLogger-version$" Value="2.0.0"/>
38-
<CustomParameter Name="$Microsoft.NET.Test.Sdk-version$" Value="16.2.0"/>
38+
<CustomParameter Name="$Microsoft.NET.Test.Sdk-version$" Value="16.5.0"/>
3939
<CustomParameter Name="$MSTest.TestAdapter-version$" Value="1.4.0"/>
40-
<CustomParameter Name="$MSTest.TestFramework-version$" Value="1.4.0"/>
40+
<CustomParameter Name="$MSTest.TestFramework-version$" Value="2.1.0"/>
4141
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="80.0.3987.10600"/>
4242
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver-version$" Value="0.26.0"/>
4343
<CustomParameter Name="$Selenium.WebDriver.IEDriver-version$" Value="3.150.0"/>
44-
<CustomParameter Name="$Ocaramba-version$" Value="3.2.7"/>
44+
<CustomParameter Name="$Ocaramba-version$" Value="3.2.8"/>
4545
</CustomParameters>
4646
</TemplateContent>
4747
</VSTemplate>

‎Ocaramba.ProjectExample.MsTest.NetCore/appsettings.Linux.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"username": "admin",
2222
"password": "admin",
2323
"UseCurrentDirectory": "true",
24-
"DownloadFolder": "/TestOutput/",
25-
"ScreenShotFolder": "/TestOutput/",
26-
"PageSourceFolder": "/TestOutput/",
24+
"DownloadFolder": "TestOutput",
25+
"ScreenShotFolder": "TestOutput",
26+
"PageSourceFolder": "TestOutput",
2727
"FullDesktopScreenShotEnabled": "false",
2828
"SeleniumScreenShotEnabled": "true",
2929
"GetPageSourceEnabled": "false",

‎Ocaramba.ProjectExample.MsTest.NetCore/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
"username": "admin",
2222
"password": "admin",
2323
"UseCurrentDirectory": "true",
24-
"DownloadFolder": "\\TestOutput",
25-
"ScreenShotFolder": "\\TestOutput",
26-
"PageSourceFolder": "\\TestOutput",
24+
"DownloadFolder": "TestOutput",
25+
"ScreenShotFolder": "TestOutput",
26+
"PageSourceFolder": "TestOutput",
2727
"FullDesktopScreenShotEnabled": "true",
2828
"SeleniumScreenShotEnabled": "true",
2929
"GetPageSourceEnabled": "true",

‎Ocaramba.ProjectExample.MsTest.NetFramework/App.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<add key="password" value="null" />
5050
<!--Downloaded files, screenshots and page source location-->
5151
<add key="UseCurrentDirectory" value="true" />
52-
<add key="DownloadFolder" value="\TestOutput" />
53-
<add key="ScreenShotFolder" value="\TestOutput" />
54-
<add key="PageSourceFolder" value="\TestOutput" />
52+
<add key="DownloadFolder" value="TestOutput" />
53+
<add key="ScreenShotFolder" value="TestOutput" />
54+
<add key="PageSourceFolder" value="TestOutput" />
5555
<!--Screenshots and logging-->
5656
<add key="FullDesktopScreenShotEnabled" value="true" />
5757
<add key="SeleniumScreenShotEnabled" value="true" />

‎Ocaramba.ProjectExample.MsTest.NetFramework/Ocaramba.MsTest.NF.vstemplate‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
<ProjectItem ReplaceParameters="false" TargetFileName="Testsettings.testsettings">Testsettings.testsettings</ProjectItem>
3737
</Project>
3838
<CustomParameters>
39-
<CustomParameter Name="$Ocaramba-version$" Value="3.2.7"/>
39+
<CustomParameter Name="$Ocaramba-version$" Value="3.2.8"/>
4040
<CustomParameter Name="$Selenium.WebDriver-version$" Value="3.141.0"/>
4141
<CustomParameter Name="$Selenium.Support-version$" Value="3.141.0"/>
42-
<CustomParameter Name="$MSTest.TestFramework-version$" Value="1.3.2"/>
42+
<CustomParameter Name="$MSTest.TestFramework-version$" Value="2.1.0"/>
4343
<CustomParameter Name="$NLog-version$" Value="4.6.6"/>
4444
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="80.0.3987.10600"/>
4545
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver-version$" Value="0.26.0"/>

‎Ocaramba.ProjectExample.NUnit.NetCore/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM microsoft/dotnet:2.2-sdk-stretch
1+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1
22
LABEL maintainer "Ocaramba <ocaramba@objectivity.co.uk>"
33
#=========
44
# Midnight Commander, lbzip2

‎Ocaramba.ProjectExample.NUnit.NetCore/Ocaramba.NUnit.NC.vstemplate‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
</Project>
4040
<CustomParameters>
4141
<CustomParameter Name="$Appveyor.TestLogger-version$" Value="2.0.0"/>
42-
<CustomParameter Name="$Microsoft.NET.Test.Sdk-version$" Value="16.2.0"/>
42+
<CustomParameter Name="$Microsoft.NET.Test.Sdk-version$" Value="16.5.0"/>
4343
<CustomParameter Name="$NPOI-version$" Value="2.4.1"/>
4444
<CustomParameter Name="$NUnit-version$" Value="3.12.0"/>
45-
<CustomParameter Name="$NUnit3TestAdapter-version$" Value="3.15.1"/>
45+
<CustomParameter Name="$NUnit3TestAdapter-version$" Value="3.16.1"/>
4646
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="80.0.3987.10600"/>
4747
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver-version$" Value="0.26.0"/>
4848
<CustomParameter Name="$Selenium.WebDriver.IEDriver-version$" Value="3.150.0"/>
49-
<CustomParameter Name="$Ocaramba-version$" Value="3.2.7"/>
49+
<CustomParameter Name="$Ocaramba-version$" Value="3.2.8"/>
5050
</CustomParameters>
5151
</TemplateContent>
5252
</VSTemplate>

‎Ocaramba.ProjectExample.NUnit.NetCore/appsettings.Linux.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
"username": "admin",
2222
"password": "admin",
2323
"UseCurrentDirectory": "true",
24-
"DownloadFolder": "/TestOutput/",
25-
"ScreenShotFolder": "/TestOutput/",
26-
"PageSourceFolder": "/TestOutput/",
24+
"DownloadFolder": "TestOutput",
25+
"ScreenShotFolder": "TestOutput",
26+
"PageSourceFolder": "TestOutput",
2727
"FullDesktopScreenShotEnabled": "false",
2828
"SeleniumScreenShotEnabled": "true",
2929
"GetPageSourceEnabled": "false",
3030
"JavaScriptErrorLogging": "false",
3131
"JavaScriptErrorTypes": "SyntaxError,EvalError,ReferenceError,RangeError,TypeError,URIError,Refused to display,Internal Server Error,Cannot read property",
3232
"EnableEventFiringWebDriver": "false",
33-
"DataDrivenFile": "/DataDriven/DataDriven.xml",
34-
"DataDrivenFileCSV": "/DataDriven/TestDataCsv.csv",
35-
"DataDrivenFileXlsx": "/DataDriven/DataDriven.xlsx"
33+
"DataDrivenFile": "DataDriven/DataDriven.xml",
34+
"DataDrivenFileCSV": "DataDriven/TestDataCsv.csv",
35+
"DataDrivenFileXlsx": "DataDriven/DataDriven.xlsx"
3636
},
3737
"FirefoxPreferences": {
3838
},

‎Ocaramba.ProjectExample.NUnit.NetCore/appsettings.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
"username": "admin",
2222
"password": "admin",
2323
"UseCurrentDirectory": "true",
24-
"DownloadFolder": "\\TestOutput",
25-
"ScreenShotFolder": "\\TestOutput",
26-
"PageSourceFolder": "\\TestOutput",
24+
"DownloadFolder": "TestOutput",
25+
"ScreenShotFolder": "TestOutput",
26+
"PageSourceFolder": "TestOutput",
2727
"FullDesktopScreenShotEnabled": "true",
2828
"SeleniumScreenShotEnabled": "true",
2929
"GetPageSourceEnabled": "true",
3030
"JavaScriptErrorLogging": "true",
3131
"JavaScriptErrorTypes": "SyntaxError,EvalError,ReferenceError,RangeError,TypeError,URIError,Refused to display,Internal Server Error,Cannot read property",
3232
"EnableEventFiringWebDriver": "false",
33-
"DataDrivenFile": "\\DataDriven\\DataDriven.xml",
34-
"DataDrivenFileCSV": "\\DataDriven\\TestDataCsv.csv",
35-
"DataDrivenFileXlsx": "\\DataDriven\\DataDriven.xlsx"
33+
"DataDrivenFile": "DataDriven\\DataDriven.xml",
34+
"DataDrivenFileCSV": "DataDriven\\TestDataCsv.csv",
35+
"DataDrivenFileXlsx": "DataDriven\\DataDriven.xlsx"
3636
},
3737
"FirefoxPreferences": {
3838
},

0 commit comments

Comments
 (0)