Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gherkin parser #1015

Merged
merged 5 commits into from Jan 30, 2018
Merged

Update gherkin parser #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a3044e
add local folder for package feed
Jan 30, 2018
a701fea
add Gherkin package
Jan 30, 2018
083149d
update Gherkin & Json.net packages
Jan 30, 2018
a606a21
update changelog.txt
Jan 30, 2018
5cd30cf
fix nuget dependency
Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .nuget/nuget.config
View file
Open in desktop
@@ -1,5 +1,6 @@
<configuration>
<packageSources>
<add key="localPackages" value="../LocalPackages" />
<add key="Gherkin CI" value="https://ci.appveyor.com/nuget/gherkin-pgwyovw4bucb/" />
<add key="MSBuild.MSBNuGet" value="https://ci.appveyor.com/nuget/msbuild-msbnuget" />
<add key="Nuget.org" value="https://api.nuget.org/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion Installer/NuGetPackages/SpecFlow/SpecFlow.nuspec
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<tags>specflow bdd gherkin cucumber</tags>
<dependencies>
<dependency id="Newtonsoft.Json" version="6.0.1" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="System.ValueTuple" version="4.0.1"/>
</dependencies>
</metadata>
Expand Down
Binary file added LocalPackages/Gherkin.5.0.0.nupkg
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions TechTalk.SpecFlow.Generator/TechTalk.SpecFlow.Generator.csproj
View file
Open in desktop
Expand Up @@ -36,9 +36,11 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
3 changes: 2 additions & 1 deletion TechTalk.SpecFlow.Generator/packages.config
View file
Open in desktop
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Gherkin" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
</packages>
8 changes: 5 additions & 3 deletions TechTalk.SpecFlow.Parser.Compatibility/TechTalk.SpecFlow.Parser.Compatibility.csproj
View file
Open in desktop
Expand Up @@ -32,9 +32,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
3 changes: 2 additions & 1 deletion TechTalk.SpecFlow.Parser.Compatibility/packages.config
View file
Open in desktop
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Gherkin" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
</packages>
8 changes: 5 additions & 3 deletions TechTalk.SpecFlow.Parser/TechTalk.SpecFlow.Parser.csproj
View file
Open in desktop
Expand Up @@ -36,9 +36,11 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down
3 changes: 2 additions & 1 deletion TechTalk.SpecFlow.Parser/packages.config
View file
Open in desktop
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Gherkin" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
</packages>
8 changes: 5 additions & 3 deletions TechTalk.SpecFlow.Reporting/TechTalk.SpecFlow.Reporting.csproj
View file
Open in desktop
Expand Up @@ -38,11 +38,13 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Engine" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
Expand Down
3 changes: 2 additions & 1 deletion TechTalk.SpecFlow.Reporting/packages.config
View file
Open in desktop
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Gherkin" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
</packages>
5 changes: 2 additions & 3 deletions TechTalk.SpecFlow/TechTalk.SpecFlow.csproj
View file
Open in desktop
Expand Up @@ -36,9 +36,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
2 changes: 1 addition & 1 deletion TechTalk.SpecFlow/packages.config
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BoDi.Embedded" version="1.3.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="System.ValueTuple" version="4.3.0" targetFramework="net45" />
</packages>
8 changes: 5 additions & 3 deletions Tests/TechTalk.SpecFlow.GeneratorTests/GeneratorTests.csproj
View file
Open in desktop
Expand Up @@ -52,14 +52,16 @@
<HintPath>..\..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.5.9.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.5.9\lib\net45\Moq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
Expand Down
3 changes: 2 additions & 1 deletion Tests/TechTalk.SpecFlow.GeneratorTests/packages.config
View file
Open in desktop
Expand Up @@ -2,8 +2,9 @@
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="FluentAssertions" version="4.19.0" targetFramework="net45" />
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Gherkin" version="5.0.0" targetFramework="net45" />
<package id="Moq" version="4.5.9" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="NUnit" version="3.2.1" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net45" />
</packages>
10 changes: 4 additions & 6 deletions Tests/TechTalk.SpecFlow.Specs/TechTalk.SpecFlow.Specs.csproj
View file
Open in desktop
Expand Up @@ -49,15 +49,13 @@
<HintPath>..\..\packages\FluentAssertions.4.19.0\lib\net45\FluentAssertions.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Gherkin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\..\packages\Gherkin.4.0.0\lib\net45\Gherkin.dll</HintPath>
<Private>True</Private>
<Reference Include="Gherkin, Version=5.0.0.0, Culture=neutral, PublicKeyToken=86496cfa5b4a5851, processorArchitecture=MSIL">
<HintPath>..\..\packages\Gherkin.5.0.0\lib\net45\Gherkin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions Tests/TechTalk.SpecFlow.Specs/packages.config
View file
Open in desktop
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentAssertions" version="4.19.0" targetFramework="net45" />
<package id="Gherkin" version="4.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net46" />
<package id="Gherkin" version="5.0.0" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
<package id="NUnit" version="3.2.1" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.2.1" targetFramework="net45" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.2.1" targetFramework="net45" />
Expand Down
11 changes: 6 additions & 5 deletions changelog.txt
View file
Open in desktop
@@ -1,23 +1,24 @@
2.3 - 2018-01-30
2.3 - 2018-0?-??
New Features:
+ Expose the current status (result) of the scenario execution in ScenarioContext via ScenarioExecutionStatus property https://github.com/techtalk/SpecFlow/pull/963
+ Allow aliasing of properties or fields on objects mapped from tables via the CreateInstance or CreateSet extensionMethods by utilising the TableAliases attribute https://github.com/techtalk/SpecFlow/pull/969
+ Allow custom XSLT files to include scripts https://github.com/techtalk/SpecFlow/pull/933
+ Allow tuples (with max 7 properties) in CreateSet/CreateInstance https://github.com/techtalk/SpecFlow/pull/951 (http://specflow.org/documentation/SpecFlow-Assist-Helpers/)
+ Add support for MSTest V2 and [DoNotParallelize] attributes https://github.com/techtalk/SpecFlow/pull/996
+ Environment variables are working in the plugin path https://github.com/techtalk/SpecFlow/pull/986
+ Update to latest Gherkin parser https://github.com/techtalk/SpecFlow/pull/1015

Fixes:
+ Meaningful exception is thrown when there are no Examples or Examples are empty in Scenario Outline https://github.com/techtalk/SpecFlow/pull/967
+ "copy" feature in the step definition report is not working in modern browsers https://github.com/techtalk/SpecFlow/issues/958 https://github.com/techtalk/SpecFlow/issues/915
+ Xunit support @ignore on a feature level https://github.com/techtalk/SpecFlow/pull/968
+ Format error message to facilate identification of ambiguous steps https://github.com/techtalk/SpecFlow/issues/994
+ set minimal version of Newtonsoft.Json to 6.0.1
+ Adds fix for .feature files path parsing on macOS / Unix https://github.com/techtalk/SpecFlow/pull/1012

API Changes:
+ GetValue of ValueRetrievers are virtual https://github.com/techtalk/SpecFlow/pull/981


2.2.1 - 2017-09-12

New Features:
Expand Down Expand Up @@ -262,9 +263,9 @@ New features:
@(SpecFlowGeneratedFiles) by the TechTalk.SpecFlow.targets.
+ MsBuild: TechTalk.SpecFlow.targets provides overrideable BeforeUpdateFeatureFilesInProject and AfterUpdateFeatureFilesInProject targets.
+ Cucumber harmonization
+ Allow using [Before]/[After] attributes as synonyms of [BeforeScenario]/[AfterScenario]
+ Allow using [StepDefinition] attribute that matches to given, when or then steps
+ Leading '@' sign can be specified for hooks and [Scope] attribute
+ Allow using [Before]/[After] attributes as synonyms of [BeforeScenario]/[AfterScenario]
+ Allow using [StepDefinition] attribute that matches to given, when or then steps
+ Leading '@' sign can be specified for hooks and [Scope] attribute

Fixed issues:
+ Instances created for context injection are disposed after scenario execution (Issue 22)
Expand Down