-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue #371 split out json validations
- Loading branch information
1 parent
5915f46
commit 14e1233
Showing
19 changed files
with
199 additions
and
402 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
<?xml version="1.0"?> | ||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> | ||
<metadata> | ||
<id>canopy.integration</id> | ||
<version>@build.number@</version> | ||
<authors>@authors@</authors> | ||
<owners>@authors@</owners> | ||
<licenseUrl>https://github.com/lefthandedgoat/canopy/blob/master/license.txt</licenseUrl> | ||
<iconUrl>http://lefthandedgoat.github.io/canopy/canopy_orig.jpg</iconUrl> | ||
<projectUrl>http://lefthandedgoat.github.com/canopy</projectUrl> | ||
<description>@description@</description> | ||
<releaseNotes>@releaseNotes@</releaseNotes> | ||
<tags>@tags@</tags> | ||
<dependencies> | ||
<dependency id="FSharp.Core" version="3.0.2" /> | ||
<dependency id="canopy" version="1.5.0" /> | ||
<dependency id="FSharp.Data" version="2.3.3" /> | ||
</dependencies> | ||
</metadata> | ||
</package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,14 @@ | ||
FRAMEWORK: NET40 | ||
NUGET | ||
remote: https://www.nuget.org/api/v2 | ||
FAKE (4.52) | ||
FAKE (4.61.3) | ||
FSharp.Compiler.Service (2.0.0.6) | ||
FSharp.Core (3.0.2) | ||
FSharp.Data (2.3.3) | ||
Zlib.Portable (>= 1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 | ||
FSharp.Formatting (2.14.4) | ||
FSharp.Compiler.Service (2.0.0.6) | ||
FSharpVSPowerTools.Core (>= 2.3 < 2.4) | ||
FSharpVSPowerTools.Core (2.3) | ||
FSharp.Compiler.Service (>= 2.0.0.3) | ||
NuGet.CommandLine (3.5) | ||
NuGet.CommandLine (4.1) | ||
Selenium.WebDriver (3.4) | ||
Zlib.Portable (1.11) - framework: >= netstandard11, portable-net45+sl5+win8, portable-net45+win8, portable-net45+win8+wp8+wpa81 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// Auto-Generated by FAKE; do not edit | ||
namespace System | ||
open System.Reflection | ||
|
||
[<assembly: AssemblyTitleAttribute("canopy.integration")>] | ||
[<assembly: AssemblyProductAttribute("canopy.integration")>] | ||
[<assembly: AssemblyDescriptionAttribute("F# web testing framework")>] | ||
[<assembly: AssemblyVersionAttribute("1.4.5")>] | ||
[<assembly: AssemblyFileVersionAttribute("1.4.5")>] | ||
do () | ||
|
||
module internal AssemblyVersionInformation = | ||
let [<Literal>] AssemblyTitle = "canopy.integration" | ||
let [<Literal>] AssemblyProduct = "canopy.integration" | ||
let [<Literal>] AssemblyDescription = "F# web testing framework" | ||
let [<Literal>] AssemblyVersion = "1.4.5" | ||
let [<Literal>] AssemblyFileVersion = "1.4.5" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
<PropertyGroup> | ||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
<ProductVersion>8.0.30703</ProductVersion> | ||
<SchemaVersion>2.0</SchemaVersion> | ||
<ProjectGuid>{4303ffac-759e-4764-89ad-ed6a73e2e16d}</ProjectGuid> | ||
<OutputType>Library</OutputType> | ||
<RootNamespace>canopy.integration</RootNamespace> | ||
<AssemblyName>canopy.integration</AssemblyName> | ||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
<Name>canopy.integration</Name> | ||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> | ||
</PropertyGroup> | ||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
<DebugSymbols>true</DebugSymbols> | ||
<DebugType>full</DebugType> | ||
<Optimize>false</Optimize> | ||
<Tailcalls>false</Tailcalls> | ||
<OutputPath>bin\Debug\</OutputPath> | ||
<DefineConstants>DEBUG;TRACE</DefineConstants> | ||
<WarningLevel>3</WarningLevel> | ||
<DocumentationFile>bin\Debug\canopy.integration.XML</DocumentationFile> | ||
</PropertyGroup> | ||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
<DebugType>pdbonly</DebugType> | ||
<Optimize>true</Optimize> | ||
<Tailcalls>true</Tailcalls> | ||
<OutputPath>..\..\bin</OutputPath> | ||
<DefineConstants>TRACE</DefineConstants> | ||
<WarningLevel>3</WarningLevel> | ||
<DocumentationFile>..\..\bin\canopy.integration.XML</DocumentationFile> | ||
</PropertyGroup> | ||
<PropertyGroup> | ||
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion> | ||
</PropertyGroup> | ||
<Choose> | ||
<When Condition="'$(VisualStudioVersion)' == '11.0'"> | ||
<PropertyGroup> | ||
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath> | ||
</PropertyGroup> | ||
</When> | ||
<Otherwise> | ||
<PropertyGroup> | ||
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath> | ||
</PropertyGroup> | ||
</Otherwise> | ||
</Choose> | ||
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" /> | ||
<ItemGroup> | ||
<Compile Include="AssemblyInfo.fs" /> | ||
<None Include="paket.references" /> | ||
<Compile Include="jsonValidator.fs" /> | ||
<Compile Include="csharp.fs" /> | ||
</ItemGroup> | ||
<ItemGroup> | ||
<Reference Include="mscorlib" /> | ||
<Reference Include="System" /> | ||
<Reference Include="System.Core" /> | ||
<Reference Include="System.Drawing" /> | ||
<Reference Include="System.Numerics" /> | ||
<Reference Include="System.Web" /> | ||
<Reference Include="System.Windows.Forms" /> | ||
</ItemGroup> | ||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
Other similar extension points exist, see Microsoft.Common.targets. | ||
<Target Name="BeforeBuild"> | ||
</Target> | ||
<Target Name="AfterBuild"> | ||
</Target> | ||
--> | ||
<Import Project="..\..\.paket\paket.targets" /> | ||
<Choose> | ||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> | ||
<ItemGroup> | ||
<Reference Include="FSharp.Core"> | ||
<HintPath>..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll</HintPath> | ||
<Private>True</Private> | ||
<Paket>True</Paket> | ||
</Reference> | ||
</ItemGroup> | ||
</When> | ||
</Choose> | ||
<Choose> | ||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'"> | ||
<ItemGroup> | ||
<Reference Include="System.Xml.Linq"> | ||
<Paket>True</Paket> | ||
</Reference> | ||
<Reference Include="FSharp.Data"> | ||
<HintPath>..\..\packages\FSharp.Data\lib\net40\FSharp.Data.dll</HintPath> | ||
<Private>True</Private> | ||
<Paket>True</Paket> | ||
</Reference> | ||
</ItemGroup> | ||
</When> | ||
</Choose> | ||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
namespace canopy.csharp | ||
|
||
|
||
|
||
type integration () = | ||
|
||
static member diffJson example actual = | ||
let diff = jsonValidator.diff example actual | ||
let diffString = diff |> List.map (fun d -> match d with | jsonValidator.Missing s -> sprintf "Missing %s" s | jsonValidator.Extra s -> sprintf "Extra %s" s) | ||
ResizeArray<string>(diffString) | ||
|
||
static member validateJson example actual = jsonValidator.validate example actual |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
FSharp.Core | ||
FSharp.Data |
Oops, something went wrong.