Merge pull request #125 from ObjectivityLtd/3.2.8

3.2.8
Accenture · Mar 6, 2020 · 13c5b57 · 13c5b57
2 parents 117b39d + d42a98b
commit 13c5b57
Show file tree

Hide file tree

Showing 93 changed files with 578 additions and 498 deletions.
diff --git a/DockerfileBuild b/DockerfileBuild
@@ -0,0 +1,5 @@
+FROM ocaramba/selenium
+COPY ./ /Ocaramba
+WORKDIR /Ocaramba
+RUN dotnet build Ocaramba.sln
+RUN dotnet vstest Ocaramba.Tests.NUnit/bin/Debug/netcoreapp3.1/Ocaramba.Tests.NUnit.dll
diff --git a/ExecutingTestsOnDocker.ps1 b/ExecutingTestsOnDocker.ps1
@@ -0,0 +1,11 @@
+echo '********************************************Executing tests on Docker********************************************'
+
+docker-switch-linux
+
+docker info
+
+docker pull ocaramba/selenium
+
+docker build -t ocaramba/selenium -f DockerfileBuild .
+
+docker ps -a
diff --git a/ExecutingTestsOnWindows.ps1 b/ExecutingTestsOnWindows.ps1
@@ -43,9 +43,9 @@ echo '********************************************BrowserStack tests************
 
 & nunit3-console.exe .\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\net472\Ocaramba.Tests.CloudProviderCrossBrowser.dll --workers=5
 
-.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\netcoreapp2.2" "appsettings.json" "appSettings" "RemoteWebDriverHub" "http://$($env:browserstackuser):$($env:browserstackkey)@hub-cloud.browserstack.com/wd/hub" $false $true
+.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\netcoreapp3.1" "appsettings.json" "appSettings" "RemoteWebDriverHub" "http://$($env:browserstackuser):$($env:browserstackkey)@hub-cloud.browserstack.com/wd/hub" $false $true
 
-.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\netcoreapp2.2" "appsettings.json" "DriverCapabilities" "build" "Ocaramba.Tests.BrowserStackCrossBrowser$env:appveyor_build_version" $true $true
+.\scripts\set_AppConfig_for_tests.ps1 ".\Ocaramba.Tests.CloudProviderCrossBrowser\bin\Release\netcoreapp3.1" "appsettings.json" "DriverCapabilities" "build" "Ocaramba.Tests.BrowserStackCrossBrowser$env:appveyor_build_version" $true $true
 
 & $OpenCover -target:"dotnet.exe" -mergeoutput -targetargs:"test --configuration Release --no-build --no-restore Ocaramba.Tests.CloudProviderCrossBrowser -maxCpuCount --test-adapter-path:. --logger:Appveyor" -filter:"+[Ocaramba]*" -oldStyle -register -output:opencoverCoverage.xml
 

diff --git a/Ocaramba.Documentation/Content/VersionHistory/VersionHistory.aml b/Ocaramba.Documentation/Content/VersionHistory/VersionHistory.aml
diff --git a/Ocaramba.Documentation/Content/VersionHistory/v1.0.0.0.aml b/Ocaramba.Documentation/Content/VersionHistory/v1.0.0.0.aml
diff --git a/Ocaramba.Documentation/Content/Welcome.aml b/Ocaramba.Documentation/Content/Welcome.aml
@@ -2,54 +2,16 @@
 <topic id="1a79ce39-4d1e-4af4-96d9-a7ad23ef0396" revisionNumber="1">
 	<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
 		<introduction>
-			<para>This is a sample conceptual topic.  You can use this as a starting point for adding more conceptual
-content to your help project.</para>
+			<para>Test Framework was designed in Objectivity to propose common way how people should create Selenium WebDriver tests.</para>
 		</introduction>
 
 		<section>
 			<title>Getting Started</title>
 			<content>
-				<para>To get started, add a documentation source to the project (a Visual Studio solution, project, or
-assembly and XML comments file).  See the <legacyBold>Getting Started</legacyBold> topics in the Sandcastle Help
-File Builder's help file for more information.  The following default items are included in this project:</para>
-
-				<list class="bullet">
-					<listItem>
-						<para><localUri>ContentLayout.content</localUri> - Use the content layout file to manage the
-conceptual content in the project and define its layout in the table of contents.</para>
-					</listItem>
-
-					<listItem>
-						<para>The <localUri>.\media</localUri> folder - Place images in this folder that you will reference
-from conceptual content using <codeInline>medialLink</codeInline> or <codeInline>mediaLinkInline</codeInline>
-elements.  If you will not have any images in the file, you may remove this folder.</para>
-					</listItem>
-
-					<listItem>
-						<para>The <localUri>.\icons</localUri> folder - This contains a default logo for the help file.  You
-may replace it or remove it and the folder if not wanted.  If removed or if you change the file name, update
-the <ui>Transform Args</ui> project properties page by removing or changing the filename in the
-<codeInline>logoFile</codeInline> transform argument.  Note that unlike images referenced from conceptual topics,
-the logo file should have its <legacyBold>BuildAction</legacyBold> property set to <codeInline>Content</codeInline>.</para>
-					</listItem>
-
-					<listItem>
-						<para>The <localUri>.\Content</localUri> folder - Use this to store your conceptual topics.  You may
-name the files and organize them however you like.  One suggestion is to lay the files out on disk as you have
-them in the content layout file as shown in this project but the choice is yours.  Files can be added via the
-Solution Explorer or from within the content layout file editor.  Files must appear in the content layout file
-in order to be compiled into the help file.</para>
-					</listItem>
-				</list>
-
-				<para>See the <legacyBold>Conceptual Content</legacyBold> topics in the Sandcastle Help File Builder's
-help file for more information.  See the <legacyBold> Sandcastle MAML Guide</legacyBold> for details on Microsoft
-Assistance Markup Language (MAML) which is used to create these topics.</para>
-			</content>
+				<para>
+          To get started visit https://github.com/ObjectivityLtd/Ocaramba/wiki/Getting-started.
+        </para>
+      </content>
 		</section>
-
-		<relatedTopics>
-			<link xlink:href="c011272f-912b-41a6-9e1d-470b465e6239" />
-		</relatedTopics>
 	</developerConceptualDocument>
 </topic>
diff --git a/Ocaramba.Documentation/ContentLayout.content b/Ocaramba.Documentation/ContentLayout.content
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Topics>
-  <Topic id="1a79ce39-4d1e-4af4-96d9-a7ad23ef0396" visible="True" isDefault="true" isSelected="true" title="Welcome to the [TODO: Add project name]">
+  <Topic id="1a79ce39-4d1e-4af4-96d9-a7ad23ef0396" visible="True" isDefault="true" isSelected="true" title="Welcome to the Ocaramba Framework">
     <HelpKeywords>
       <HelpKeyword index="K" term="Welcome" />
     </HelpKeywords>
   </Topic>
-  <Topic id="c011272f-912b-41a6-9e1d-470b465e6239" visible="True" isExpanded="true" title="Version History">
-    <HelpKeywords>
-      <HelpKeyword index="K" term="version, history" />
-    </HelpKeywords>
-    <Topic id="20fa0d6b-ec22-4e03-95ca-b710f5372864" visible="True" title="Version 1.0.0.0">
-      <HelpKeywords>
-        <HelpKeyword index="K" term="version, 1.0.0.0" />
-      </HelpKeywords>
-    </Topic>
-  </Topic>
 </Topics>
diff --git a/Ocaramba.Documentation/Ocaramba.Documentation.shfbproj b/Ocaramba.Documentation/Ocaramba.Documentation.shfbproj
@@ -6,7 +6,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>b0b045e8-f54f-43ad-bff9-8f2935d4653e</ProjectGuid>
+    <ProjectGuid>{cf4b91cd-36f6-47bc-a55d-80998f89c404}</ProjectGuid>
     <SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
     <AssemblyName>Ocaramba.Documentation</AssemblyName>
@@ -27,9 +27,13 @@
       <Argument Key="maxVersionParts" Value="" />
       <Argument Key="defaultLanguage" Value="cs" />
       <Argument Key="includeEnumValues" Value="true" />
-      <Argument Key="baseSourceCodeUrl" Value="https://github.com/ObjectivityLtd/Ocaramba/tree/master/Ocaramba/" />
+      <Argument Key="baseSourceCodeUrl" Value="https://github.com/ObjectivityLtd/Ocaramba/tree/master/OcarambaLite" />
       <Argument Key="requestExampleUrl" Value="https://github.com/ObjectivityLtd/Ocaramba/issues/new" />
     </TransformComponentArguments>
+    <DocumentationSources>
+      <DocumentationSource sourceFile="..\OcarambaLite\OcarambaLite.csproj" xmlns="" />
+      <DocumentationSource sourceFile="..\Ocaramba\Ocaramba.csproj" />
+    </DocumentationSources>
     <HelpFileFormat>Website</HelpFileFormat>
     <SyntaxFilters>C#</SyntaxFilters>
     <PresentationStyle>VS2013</PresentationStyle>
@@ -54,6 +58,7 @@
     <SdkLinkTarget>Blank</SdkLinkTarget>
     <MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, TypeParameter, AutoDocumentDispose</MissingTags>
     <DocumentationSources>
+      <DocumentationSource sourceFile="..\OcarambaLite\OcarambaLite.csproj" />
       <DocumentationSource sourceFile="..\Ocaramba\Ocaramba.csproj" />
     </DocumentationSources>
     <VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, NonBrowsable</VisibleItems>
@@ -63,18 +68,14 @@
       </Filter>
     </ApiFilter>
     <PlugInConfigurations>
-      <PlugInConfig id="Additional Reference Links" enabled="True" xmlns="">
+      <PlugInConfig id="Additional Reference Links" enabled="True">
         <configuration>
           <targets>
             <target htmlSdkLinkType="None" helpViewerSdkLinkType="Id" websiteSdkLinkType="None" helpFileProject="Selenium.shfbproj" />
           </targets>
         </configuration>
       </PlugInConfig>
     </PlugInConfigurations>
-  </PropertyGroup>
-    <PropertyGroup>
-    <!-- NOTE: Update the version number in the path (YYYY.M.D.R) to match the package version -->
-    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(UserProfile).nuget\packages\ewsoftware.shfb\2019.6.24\tools</SHFBROOT>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in order for Visual Studio to perform
 			 the build.  The others are optional common platform types that may appear. -->
@@ -94,16 +95,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
   </PropertyGroup>
-
   <ItemGroup>
     <Folder Include="Content" />
-    <Folder Include="Content\VersionHistory" />
     <Folder Include="icons" />
     <Folder Include="media" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Content\VersionHistory\v1.0.0.0.aml" />
-    <None Include="Content\VersionHistory\VersionHistory.aml" />
     <None Include="Content\Welcome.aml" />
     <None Include="Selenium.shfbproj" />
   </ItemGroup>
@@ -124,4 +121,4 @@
     </PostBuildEvent>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/Ocaramba.Documentation/Selenium.shfbproj b/Ocaramba.Documentation/Selenium.shfbproj
@@ -1,64 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Import the common properties to support NuGet restore -->
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <!-- A framework version is required for NuGet restore.  This can be any valid version -->
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <!-- The configuration and platform will be used to determine which assemblies to include from solution and
 				 project documentation sources -->
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2911b385-a412-48d1-8e17-ededb98d353c}</ProjectGuid>
+    <ProjectGuid>{2936388a-a8cb-470a-914c-6b82201fc316}</ProjectGuid>
     <SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
-    <AssemblyName>Ocaramba.Documentation</AssemblyName>
-    <RootNamespace>Ocaramba.Documentation</RootNamespace>
-    <Name>Ocaramba.Documentation</Name>
+    <AssemblyName>Documentation</AssemblyName>
+    <RootNamespace>Documentation</RootNamespace>
+    <Name>Documentation</Name>
     <!-- SHFB properties -->
-    <FrameworkVersion>.NET Framework 4.6</FrameworkVersion>
-    <OutputPath>HelpSelenium\</OutputPath>
-    <HtmlHelpName>Ocaramba</HtmlHelpName>
+    <FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
+    <OutputPath>.\Help\</OutputPath>
+    <HtmlHelpName>Documentation</HtmlHelpName>
     <Language>en-US</Language>
-    <TransformComponentArguments>
-      <Argument Key="logoFile" Value="Help.png" xmlns="" />
-      <Argument Key="logoHeight" Value="" xmlns="" />
-      <Argument Key="logoWidth" Value="" xmlns="" />
-      <Argument Key="logoAltText" Value="" xmlns="" />
-      <Argument Key="logoPlacement" Value="left" xmlns="" />
-      <Argument Key="logoAlignment" Value="left" xmlns="" />
-      <Argument Key="maxVersionParts" Value="" xmlns="" />
-    </TransformComponentArguments>
     <DocumentationSources>
-      <DocumentationSource sourceFile="..\Ocaramba\bin\Debug\net472\WebDriver.dll" />
-<DocumentationSource sourceFile="..\Ocaramba\bin\Debug\net472\WebDriver.Support.dll" /></DocumentationSources>
-    <SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
-    <BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
-    <HelpFileFormat>Website</HelpFileFormat>
-    <IndentHtml>False</IndentHtml>
-    <KeepLogFile>False</KeepLogFile>
-    <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
-    <CleanIntermediates>True</CleanIntermediates>
-    <HelpFileVersion>1.0.0.0</HelpFileVersion>
-    <MaximumGroupParts>2</MaximumGroupParts>
-    <NamespaceGrouping>False</NamespaceGrouping>
-    <SyntaxFilters>C#</SyntaxFilters>
-    <SdkLinkTarget>Blank</SdkLinkTarget>
-    <RootNamespaceContainer>False</RootNamespaceContainer>
-    <PresentationStyle>VS2013</PresentationStyle>
-    <Preliminary>False</Preliminary>
-    <NamingMethod>Guid</NamingMethod>
-    <HelpTitle>Ocaramba Framework</HelpTitle>
-    <ContentPlacement>AboveNamespaces</ContentPlacement>
-    <FooterText>Objectivity Bespoke Software Specialists</FooterText>
-    <HeaderText>Framework to automate tests using Selenium WebDriver</HeaderText>
-    <FeedbackEMailAddress>TestAutomationGroup%40objectivity.co.uk</FeedbackEMailAddress>
-    <CopyrightHref>http://www.objectivity.co.uk/</CopyrightHref>
-    <HtmlHelp1xCompilerPath>..\packages\EWSoftware.SHFB.2019.4.14\tools\</HtmlHelp1xCompilerPath>
-    <ComponentPath>..\packages\</ComponentPath>
-    <MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, TypeParameter, AutoDocumentDispose</MissingTags>
-    <WarnOnMissingSourceContext>True</WarnOnMissingSourceContext>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- NOTE: Update the version number in the path (YYYY.M.D.R) to match the package version -->
-    <SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(UserProfile).nuget\packages\ewsoftware.shfb\2019.6.24\tools</SHFBROOT>
+      <DocumentationSource sourceFile="..\OcarambaLite\bin\Debug\net472\WebDriver.dll" />
+<DocumentationSource sourceFile="..\OcarambaLite\bin\Debug\net472\WebDriver.Support.dll" /></DocumentationSources>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in order for Visual Studio to perform
 			 the build.  The others are optional common platform types that may appear. -->
@@ -78,18 +43,17 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Win32' ">
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="icons" />
-    <Folder Include="media" />
-  </ItemGroup>
-  <ItemGroup>
-    <ContentLayout Include="ContentLayout.content" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="icons\Help.png" />
-  </ItemGroup>
-  <!-- Import the SHFB build targets -->
-  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" />
+  <!-- Uncomment this to use the NuGet packages when SHFB is not installed locally, e.g. in the CI build pipeline.
+			Update the package versions to the latest releases.
+	<ItemGroup>
+		<PackageReference Include="EWSoftware.SHFB" Version="2019.9.15" />
+		<PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0" />
+	</ItemGroup>
+	-->
+  <!-- Import the common build targets during NuGet restore because before the packages are being installed, $(SHFBROOT) is not set yet -->
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />
+  <!-- Import the SHFB build targets during build -->
+  <Import Project="$(SHFBROOT)\SandcastleHelpFileBuilder.targets" Condition="'$(MSBuildRestoreSessionId)' == ''" />
   <!-- The pre-build and post-build event properties must appear *after* the targets file import in order to be
 			 evaluated correctly. -->
   <PropertyGroup>

diff --git a/Ocaramba.Documentation/packages.config b/Ocaramba.Documentation/packages.config
diff --git a/Ocaramba.Tests.Angular/App.config b/Ocaramba.Tests.Angular/App.config
@@ -55,9 +55,9 @@
     <add key="password" value="admin" />
     <!--Downloaded files, screenshots and page source location-->
     <add key="UseCurrentDirectory" value="true" />
-    <add key="DownloadFolder" value="\TestOutput" />
-    <add key="ScreenShotFolder" value="\TestOutput" />
-    <add key="PageSourceFolder" value="\TestOutput" />
+    <add key="DownloadFolder" value="TestOutput" />
+    <add key="ScreenShotFolder" value="TestOutput" />
+    <add key="PageSourceFolder" value="TestOutput" />
     <!--Screenshots and logging-->
     <add key="FullDesktopScreenShotEnabled" value="true" />
     <add key="SeleniumScreenShotEnabled" value="true" />