Skip to content

Commit

Permalink
Merge pull request #13 from ObjectivityBSS/2.1.14
Browse files Browse the repository at this point in the history
2.1.14
  • Loading branch information
raczeja authored Aug 4, 2016
2 parents c9fbd30 + 97fe10c commit baee76f
Show file tree
Hide file tree
Showing 31 changed files with 612 additions and 500 deletions.
48 changes: 24 additions & 24 deletions .nuspec/Objectivity.Test.Automation.Features.nuspec
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Objectivity.Test.Automation.Common.Features</id>
<version>1.0.0</version>
<title>Objectivity.Test.Automation.Common.Features</title>
<authors>Objectivity Bespoke Software Specialists</authors>
<owners>Objectivity Bespoke Software Specialists</owners>
<licenseUrl>https://github.com/ObjectivityBSS/Test.Automation/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/ObjectivityBSS/Test.Automation</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Template of the framework to automate tests using Objectivity.Test.Automation.Common with Features</description>
<releaseNotes>You can find info about this release here: https://github.com/ObjectivityBSS/Test.Automation/releases</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>selenium webdriver testautomation tests specflow Objectivity.Test.Automation.Common template</tags>
<dependencies>
<dependency id="SpecFlow" version="2.0.0"/>
</dependencies>
</metadata>
<files>
<file src="..\Objectivity.Test.Automation.Tests.Features\ProjectTestBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.Features\App.config" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.PageObjects\ProjectPageBase.cs" target="content" />
</files>
<?xml version="1.0"?>
<package >
<metadata>
<id>Objectivity.Test.Automation.Common.Features</id>
<version>1.0.0</version>
<title>Objectivity.Test.Automation.Common.Features</title>
<authors>Objectivity Bespoke Software Specialists</authors>
<owners>Objectivity Bespoke Software Specialists</owners>
<licenseUrl>https://github.com/ObjectivityBSS/Test.Automation/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/ObjectivityBSS/Test.Automation</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Template of the framework to automate tests using Objectivity.Test.Automation.Common with Features</description>
<releaseNotes>You can find info about this release here: https://github.com/ObjectivityBSS/Test.Automation/releases</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>selenium webdriver testautomation tests specflow Objectivity.Test.Automation.Common template</tags>
<dependencies>
<dependency id="SpecFlow" version="2.1.0"/>
</dependencies>
</metadata>
<files>
<file src="..\Objectivity.Test.Automation.Tests.Features\ProjectTestBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.Features\App.config" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.PageObjects\ProjectPageBase.cs" target="content" />
</files>
</package>
63 changes: 32 additions & 31 deletions .nuspec/Objectivity.Test.Automation.Nunit.nuspec
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Objectivity.Test.Automation.Common.NUnit</id>
<version>1.0.0</version>
<title>Objectivity.Test.Automation.Common.NUnit</title>
<authors>Objectivity Bespoke Software Specialists</authors>
<owners>Objectivity Bespoke Software Specialists</owners>
<licenseUrl>https://github.com/ObjectivityBSS/Test.Automation/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/ObjectivityBSS/Test.Automation</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Framework to automate tests using Objectivity.Test.Automation.Common with NUnit</description>
<releaseNotes>You can find info about this release here: https://github.com/ObjectivityBSS/Test.Automation/releases</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>selenium webdriver testautomation tests nunit Objectivity.Test.Automation.Common</tags>
<dependencies>
<dependency id="NUnit" version="3.2.1" />
<dependency id="NUnit.ConsoleRunner" version="3.2.1" />
<dependency id="NUnit.Runners" version="3.2.1" />
<dependency id="NUnit.Extension.NUnitProjectLoader" version="3.2.1" />
<dependency id="NUnit.Extension.NUnitV2Driver" version="3.2.1" />
<dependency id="NUnit.Extension.NUnitV2ResultWriter" version="3.2.1" />
<dependency id="NUnit.Extension.VSProjectLoader" version="3.2.1" />
</dependencies>
</metadata>
<files>
<file src="..\Objectivity.Test.Automation.Tests.NUnit\ProjectTestBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.NUnit\App.config" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.PageObjects\ProjectPageBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.NUnit\DataDriven\DataDrivenHelper.cs" target="content\DataDriven" />
</files>
<?xml version="1.0"?>
<package >
<metadata>
<id>Objectivity.Test.Automation.Common.NUnit</id>
<version>1.0.0</version>
<title>Objectivity.Test.Automation.Common.NUnit</title>
<authors>Objectivity Bespoke Software Specialists</authors>
<owners>Objectivity Bespoke Software Specialists</owners>
<licenseUrl>https://github.com/ObjectivityBSS/Test.Automation/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/ObjectivityBSS/Test.Automation</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Framework to automate tests using Objectivity.Test.Automation.Common with NUnit</description>
<releaseNotes>You can find info about this release here: https://github.com/ObjectivityBSS/Test.Automation/releases</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>selenium webdriver testautomation tests nunit Objectivity.Test.Automation.Common</tags>
<dependencies>
<dependency id="NUnit" version="3.4.1" />
<dependency id="NUnit.ConsoleRunner" version="3.4.1" />
<dependency id="NUnit.Runners" version="3.4.1" />
<dependency id="NUnit.Extension.NUnitProjectLoader" version="3.4.1" />
<dependency id="NUnit.Extension.NUnitV2Driver" version="3.4.1" />
<dependency id="NUnit.Extension.NUnitV2ResultWriter" version="3.4.1" />
<dependency id="NUnit.Extension.VSProjectLoader" version="3.4.1" />
<dependency id="NUnit.Extension.TeamCityEventListener" version="1.0.1" />
</dependencies>
</metadata>
<files>
<file src="..\Objectivity.Test.Automation.Tests.NUnit\ProjectTestBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.NUnit\App.config" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.PageObjects\ProjectPageBase.cs" target="content" />
<file src="..\Objectivity.Test.Automation.Tests.NUnit\DataDriven\DataDrivenHelper.cs" target="content\DataDriven" />
</files>
</package>
1 change: 1 addition & 0 deletions .nuspec/Objectivity.Test.Automation.Xunit.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<dependency id="xunit.extensibility.core" version="2.1.0" />
<dependency id="xunit.extensibility.execution" version="2.1.0" />
<dependency id="xunit.runner.visualstudio" version="2.1.0" />
<dependency id="xunit.runner.console" version="2.1.0" />
</dependencies>
</metadata>
<files>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@
</configuration>
</PlugInConfig>
</PlugInConfigurations>
<ApiFilter>
<Filter entryType="Namespace" fullName="Objectivity.Test.Automation.Common.Logger" isExposed="False" xmlns="">
<Filter entryType="Class" fullName="Objectivity.Test.Automation.Common.Logger.TestLogger" filterName="TestLogger" isExposed="True" />
</Filter>
</ApiFilter>
<VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected</VisibleItems>
</PropertyGroup>
<PropertyGroup>
<!-- NOTE: Update the version number in the path (YYYY.M.D.R) to match the package version -->
Expand Down Expand Up @@ -110,4 +116,7 @@
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<None Include="Selenium.shfbproj" />
</ItemGroup>
</Project>
210 changes: 105 additions & 105 deletions Objectivity.Test.Automation.Common.Documentation/Selenium.shfbproj
Original file line number Diff line number Diff line change
@@ -1,106 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- 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>
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
<AssemblyName>Objectivity.Test.Automation.Common.Documentation</AssemblyName>
<RootNamespace>Objectivity.Test.Automation.Common.Documentation</RootNamespace>
<Name>Objectivity.Test.Automation.Common.Documentation</Name>
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 4.6</FrameworkVersion>
<OutputPath>HelpSelenium\</OutputPath>
<HtmlHelpName>Objectivity.Test.Automation.Common</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="..\packages\Selenium.WebDriver.2.53.0\lib\net40\WebDriver.dll" />
<DocumentationSource sourceFile="..\packages\Selenium.WebDriver.2.53.0\lib\net40\WebDriver.xml" />
<DocumentationSource sourceFile="..\packages\Selenium.Support.2.53.0\lib\net40\WebDriver.Support.dll" />
<DocumentationSource sourceFile="..\packages\Selenium.Support.2.53.0\lib\net40\WebDriver.Support.xml" /></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>Objectivity.Test.Automation.Common 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.2016.4.9.0\tools\</HtmlHelp1xCompilerPath>
<ComponentPath>..\packages\</ComponentPath>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, TypeParameter, AutoDocumentDispose</MissingTags>
</PropertyGroup>
<PropertyGroup>
<!-- NOTE: Update the version number in the path (YYYY.M.D.R) to match the package version -->
<SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2016.4.9.0\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. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</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" />
<!-- The pre-build and post-build event properties must appear *after* the targets file import in order to be
evaluated correctly. -->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- 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>
<SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual Studio adds them anyway -->
<AssemblyName>Objectivity.Test.Automation.Common.Documentation</AssemblyName>
<RootNamespace>Objectivity.Test.Automation.Common.Documentation</RootNamespace>
<Name>Objectivity.Test.Automation.Common.Documentation</Name>
<!-- SHFB properties -->
<FrameworkVersion>.NET Framework 4.6</FrameworkVersion>
<OutputPath>HelpSelenium\</OutputPath>
<HtmlHelpName>Objectivity.Test.Automation.Common</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="..\packages\Selenium.WebDriver.2.53.1\lib\net40\WebDriver.dll" />
<DocumentationSource sourceFile="..\packages\Selenium.WebDriver.2.53.1\lib\net40\WebDriver.xml" />
<DocumentationSource sourceFile="..\packages\Selenium.Support.2.53.1\lib\net40\WebDriver.Support.dll" />
<DocumentationSource sourceFile="..\packages\Selenium.Support.2.53.1\lib\net40\WebDriver.Support.xml" /></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>Objectivity.Test.Automation.Common 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.2016.4.9.0\tools\</HtmlHelp1xCompilerPath>
<ComponentPath>..\packages\</ComponentPath>
<MissingTags>Summary, Parameter, Returns, AutoDocumentCtors, TypeParameter, AutoDocumentDispose</MissingTags>
</PropertyGroup>
<PropertyGroup>
<!-- NOTE: Update the version number in the path (YYYY.M.D.R) to match the package version -->
<SHFBROOT Condition=" '$(SHFBROOT)' == '' ">$(MSBuildThisFileDirectory)..\packages\EWSoftware.SHFB.2016.4.9.0\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. -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Win32' ">
</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" />
<!-- The pre-build and post-build event properties must appear *after* the targets file import in order to be
evaluated correctly. -->
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
</Project>
6 changes: 6 additions & 0 deletions Objectivity.Test.Automation.Common/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
<add key="url" value="/ObjectivityBSS/Test.Automation" />
<!--<add key="browser" value="Chrome" />-->
<!--<add key="browser" value="InternetExplorer" />-->
<!--<add key="browser" value="Firefox" />-->
<!--<add key="browser" value="FirefoxPortable" />-->
<!--<add key="browser" value="PhantomJs" />-->
<add key="browser" value="Firefox" />
<add key="FireFoxPath" value="\..\..\..\FirefoxPortable\FirefoxPortable.exe" />
<add key="PhantomJsPath" value="\..\..\..\packages\PhantomJS.2.1.1\tools\phantomjs\" />
<!--<add key="proxy" value="127.0.0.1:9999" />-->
<!--Timeouts-->
<add key="longTimeout" value="30" />
<add key="mediumTimeout" value="10" />
Expand Down
Loading

0 comments on commit baee76f

Please sign in to comment.