Skip to content

Commit 825305e

Browse files
author
Jakub Raczek
authored
Merge pull request #2 from ObjectivityLtd/1.2
Version 1.2
2 parents 4be9f9f + fa06ba1 commit 825305e

22 files changed

Lines changed: 107 additions & 61 deletions

‎Ocaramba.ProjectExample.MsTest.NetCore/Dockerfile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM microsoft/dotnet:2.2-sdk-stretch
2+
LABEL maintainer "Ocaramba <ocaramba@objectivity.co.uk>"
3+
#=========
4+
# Midnight Commander, lbzip2
5+
#=========
6+
RUN apt-get update && apt-get install -y && apt-get --yes install mc && apt-get --yes install lbzip2
7+
#=========
8+
# Chrome
9+
#=========
10+
RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
11+
RUN dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install
12+
#=========
13+
# Firefox
14+
#=========
15+
RUN wget --no-verbose -O /tmp/firefox.tar.bz2 'https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US' \
16+
&& lbzip2 -d /tmp/firefox.tar.bz2 && tar -C /opt -xvf /tmp/firefox.tar && rm /tmp/firefox.tar && ln -fs /opt/firefox/firefox /usr/bin/firefox \
17+
&& apt-get install libdbus-glib-1-2
18+
ENV ASPNETCORE_ENVIRONMENT Linux

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@
3030
<ProjectItem ReplaceParameters="true" TargetFileName="ProjectBaseConfiguration.cs">ProjectBaseConfiguration.cs</ProjectItem>
3131
<ProjectItem ReplaceParameters="true" TargetFileName="ProjectPageBase.cs">ProjectPageBase.cs</ProjectItem>
3232
<ProjectItem ReplaceParameters="true" TargetFileName="ProjectTestBase.cs">ProjectTestBase.cs</ProjectItem>
33+
<ProjectItem ReplaceParameters="false" TargetFileName="Dockerfile">Dockerfile</ProjectItem>
3334
<ProjectItem ReplaceParameters="true" TargetFileName="Runsettings.runsettings">Runsettings.runsettings</ProjectItem>
3435
</Project>
3536
<CustomParameters>
3637
<CustomParameter Name="$Appveyor.TestLogger-version$" Value="2.0.0"/>
3738
<CustomParameter Name="$Microsoft.NET.Test.Sdk-version$" Value="16.2.0"/>
3839
<CustomParameter Name="$MSTest.TestAdapter-version$" Value="1.4.0"/>
3940
<CustomParameter Name="$MSTest.TestFramework-version$" Value="1.4.0"/>
40-
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="77.0.3865.4000"/>
41-
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver.Win64-version$" Value="0.25.0"/>
41+
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="78.0.3904.10500"/>
42+
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver-version$" Value="0.26.0"/>
4243
<CustomParameter Name="$Selenium.WebDriver.IEDriver-version$" Value="3.150.0"/>
43-
<CustomParameter Name="$Ocaramba-version$" Value="3.2.5"/>
44+
<CustomParameter Name="$Ocaramba-version$" Value="3.2.6"/>
4445
</CustomParameters>
4546
</TemplateContent>
4647
</VSTemplate>

‎Ocaramba.ProjectExample.MsTest.NetCore/Ocaramba.MsTest.NetCore.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
</ItemGroup>
6666
<ItemGroup>
6767
<Compile Include="Properties\AssemblyInfo.cs" />
68+
<None Include="Dockerfile" />
6869
<None Include="Runsettings.runsettings" />
6970
<None Include="Tests\HerokuappTestsMsTest.cs" />
7071
</ItemGroup>

‎Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="MSTest.TestAdapter" Version="$MSTest.TestAdapter-version$" />
1212
<PackageReference Include="MSTest.TestFramework" Version="$MSTest.TestFramework-version$" />
1313
<PackageReference Include="Ocaramba" Version="$Ocaramba-version$" />
14-
<PackageReference Include="Selenium.WebDriver.GeckoDriver.Win64" Version="$Selenium.WebDriver.GeckoDriver.Win64-version$" />
14+
<PackageReference Include="Selenium.WebDriver.GeckoDriver" Version="$Selenium.WebDriver.GeckoDriver-version$" />
1515
<PackageReference Include="Selenium.WebDriver.IEDriver" Version="$Selenium.WebDriver.IEDriver-version$" />
1616
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="$Selenium.WebDriver.ChromeDriver-version$" />
1717
</ItemGroup>
@@ -35,6 +35,9 @@
3535
<None Include="nlog.config">
3636
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
3737
</None>
38+
<None Include="Dockerfile">
39+
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
40+
</None>
3841
</ItemGroup>
3942

4043
</Project>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"host": "the-internet.herokuapp.com",
55
"browser": "Chrome",
66
"url": "",
7-
"PathToChromeDriverDirectory": "/home/appveyor/.nuget/packages/selenium.webdriver.chromedriver/74.0.3729.6/driver/linux64",
8-
"PathToFirefoxDriverDirectory": "/home/appveyor/.nuget/packages/selenium.webdriver.geckodriver/0.24.0/driver/linux64",
7+
"PathToChromeDriverDirectory": "",
8+
"PathToFirefoxDriverDirectory": "",
99
"PathToInternetExplorerDriverDirectory": "",
1010
"PathToEdgeDriverDirectory": "",
1111
"ChromeBrowserExecutableLocation": "",
@@ -20,33 +20,32 @@
2020
"ImplicitlyWaitMilliseconds": "200",
2121
"username": "admin",
2222
"password": "admin",
23-
"UseCurrentDirectory": "false",
24-
"DownloadFolder": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/TestOutput",
25-
"ScreenShotFolder": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/TestOutput",
26-
"PageSourceFolder": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/TestOutput",
23+
"UseCurrentDirectory": "true",
24+
"DownloadFolder": "/TestOutput/",
25+
"ScreenShotFolder": "/TestOutput/",
26+
"PageSourceFolder": "/TestOutput/",
2727
"FullDesktopScreenShotEnabled": "false",
28-
"SeleniumScreenShotEnabled": "false",
28+
"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",
32-
"EnableEventFiringWebDriver": "false",
33-
"DataDrivenFile": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/DataDriven/DataDriven.xml",
34-
"DataDrivenFileCSV": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/DataDriven/TestDataCsv.csv",
35-
"DataDrivenFileXlsx": "/home/appveyor/projects/ocaramba.templates/Ocaramba.ProjectExample.NUnit.NetCore/bin/Release/netcoreapp2.2/DataDriven/DataDriven.xlsx"
32+
"EnableEventFiringWebDriver": "false"
3633
},
37-
3834
"FirefoxPreferences": {
3935
},
4036
"FirefoxExtensions": {
4137
},
38+
"FirefoxArguments": {
39+
"-headless": ""
40+
},
4241
"ChromePreferences": {
4342
},
4443
"ChromeExtensions": {
4544
},
4645
"DriverCapabilities": {
4746
},
4847
"ChromeArguments": {
49-
"headless": "",
48+
"headless": "",
5049
"no-sandbox": ""
5150
},
5251
"InternetExplorerPreferences": {

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"host": "the-internet.herokuapp.com",
55
"browser": "Firefox",
66
"url": "",
7-
"PathToChromeDriverDirectory": "C:\\projects\\Ocaramba.templates\\Ocaramba.ProjectExample.NUnit.NetCore\\bin\\Release\\netcoreapp2.2",
8-
"PathToFirefoxDriverDirectory": "C:\\projects\\Ocaramba.templates\\Ocaramba.ProjectExample.NUnit.NetCore\\bin\\Release\\netcoreapp2.2",
9-
"PathToInternetExplorerDriverDirectory": "C:\\projects\\Ocaramba.templates\\Ocaramba.ProjectExample.NUnit.NetCore\\bin\\Release\\netcoreapp2.2",
7+
"PathToChromeDriverDirectory": "",
8+
"PathToFirefoxDriverDirectory": "",
9+
"PathToInternetExplorerDriverDirectory": "",
1010
"PathToEdgeDriverDirectory": "",
1111
"ChromeBrowserExecutableLocation": "",
1212
"FireFoxBrowserExecutableLocation": "",
@@ -29,16 +29,14 @@
2929
"GetPageSourceEnabled": "true",
3030
"JavaScriptErrorLogging": "true",
3131
"JavaScriptErrorTypes": "SyntaxError,EvalError,ReferenceError,RangeError,TypeError,URIError,Refused to display,Internal Server Error,Cannot read property",
32-
"EnableEventFiringWebDriver": "false",
33-
"DataDrivenFile": "\\DataDriven\\DataDriven.xml",
34-
"DataDrivenFileCSV": "\\DataDriven\\TestDataCsv.csv",
35-
"DataDrivenFileXlsx": "\\DataDriven\\DataDriven.xlsx"
32+
"EnableEventFiringWebDriver": "false"
3633
},
37-
3834
"FirefoxPreferences": {
3935
},
4036
"FirefoxExtensions": {
4137
},
38+
"FirefoxArguments": {
39+
},
4240
"ChromePreferences": {
4341
},
4442
"ChromeExtensions": {

‎Ocaramba.ProjectExample.MsTest.NetCore/nlog.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<!-- the targets to write to -->
1414
<targets>
1515
<!-- write logs to file -->
16-
<target xsi:type="File" name="allfile" fileName="${basedir}\TestNUnitCore.log"
16+
<target xsi:type="File" name="allfile" fileName="${basedir}/TestNUnitCore.log"
1717
layout="${longdate}|${level}|${callsite}|${message}" />
1818
<target xsi:type="Console" name="consolelog"
1919
layout="${longdate}|${level}|${callsite}|${message}" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<ProjectItem ReplaceParameters="false" TargetFileName="Testsettings.testsettings">Testsettings.testsettings</ProjectItem>
3737
</Project>
3838
<CustomParameters>
39-
<CustomParameter Name="$Ocaramba-version$" Value="3.2.5"/>
39+
<CustomParameter Name="$Ocaramba-version$" Value="3.2.6"/>
4040
<CustomParameter Name="$Selenium.WebDriver-version$" Value="3.141.0"/>
4141
<CustomParameter Name="$Selenium.Support-version$" Value="3.141.0"/>
4242
<CustomParameter Name="$MSTest.TestFramework-version$" Value="1.3.2"/>
4343
<CustomParameter Name="$NLog-version$" Value="4.6.6"/>
44-
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="77.0.3865.4000"/>
45-
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver.Win64-version$" Value="0.25.0"/>
44+
<CustomParameter Name="$Selenium.WebDriver.ChromeDriver-version$" Value="78.0.3904.10500"/>
45+
<CustomParameter Name="$Selenium.WebDriver.GeckoDriver-version$" Value="0.26.0"/>
4646
<CustomParameter Name="$Selenium.WebDriver.IEDriver-version$" Value="3.150.0"/>
4747
</CustomParameters>
4848
</TemplateContent>

‎Ocaramba.ProjectExample.MsTest.NetFramework/ProjectTemplate.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9090
</PropertyGroup>
9191
<Error Condition="!Exists('..\packages\Selenium.WebDriver.IEDriver.$Selenium.WebDriver.IEDriver-version$\build\Selenium.WebDriver.IEDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.IEDriver.$Selenium.WebDriver.IEDriver-version$\build\Selenium.WebDriver.IEDriver.targets'))" />
92-
<Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.Win64.$Selenium.WebDriver.GeckoDriver.Win64-version$\build\Selenium.WebDriver.GeckoDriver.Win64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.Win64.$Selenium.WebDriver.GeckoDriver.Win64-version$\build\Selenium.WebDriver.GeckoDriver.Win64.targets'))" />
92+
<Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.$Selenium.WebDriver.GeckoDriver-version$\build\Selenium.WebDriver.GeckoDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.$Selenium.WebDriver.GeckoDriver-version$\build\Selenium.WebDriver.GeckoDriver.targets'))" />
9393
<Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.$Selenium.WebDriver.ChromeDriver-version$\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.$Selenium.WebDriver.ChromeDriver-version$\build\Selenium.WebDriver.ChromeDriver.targets'))" />
9494
</Target>
95-
<Import Project="..\packages\Selenium.WebDriver.GeckoDriver.Win64.$Selenium.WebDriver.GeckoDriver.Win64-version$\build\Selenium.WebDriver.GeckoDriver.Win64.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.Win64.$Selenium.WebDriver.GeckoDriver.Win64-version$\build\Selenium.WebDriver.GeckoDriver.Win64.targets')" />
95+
<Import Project="..\packages\Selenium.WebDriver.GeckoDriver.$Selenium.WebDriver.GeckoDriver-version$\build\Selenium.WebDriver.GeckoDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.$Selenium.WebDriver.GeckoDriver-version$\build\Selenium.WebDriver.GeckoDriver.targets')" />
9696
<Import Project="..\packages\Selenium.WebDriver.IEDriver.$Selenium.WebDriver.IEDriver-version$\build\Selenium.WebDriver.IEDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.IEDriver.$Selenium.WebDriver.IEDriver-version$\build\Selenium.WebDriver.IEDriver.targets')" />
9797
<Import Project="..\packages\Selenium.WebDriver.ChromeDriver.$Selenium.WebDriver.ChromeDriver-version$\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.$Selenium.WebDriver.ChromeDriver-version$\build\Selenium.WebDriver.ChromeDriver.targets')" />
9898
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<package id="Selenium.Support" version="$Selenium.Support-version$" />
77
<package id="Selenium.WebDriver" version="$Selenium.WebDriver-version$" />
88
<package id="Selenium.WebDriver.ChromeDriver" version="$Selenium.WebDriver.ChromeDriver-version$" targetFramework="net472"/>
9-
<package id="Selenium.WebDriver.GeckoDriver.Win64" version="$Selenium.WebDriver.GeckoDriver.Win64-version$" targetFramework="net472"/>
9+
<package id="Selenium.WebDriver.GeckoDriver" version="$Selenium.WebDriver.GeckoDriver-version$" targetFramework="net472"/>
1010
<package id="Selenium.WebDriver.IEDriver" version="$Selenium.WebDriver.IEDriver-version$" />
1111
</packages>

0 commit comments

Comments
 (0)