Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

merge dev to master #140

Closed
wants to merge 47 commits into from

2 participants

@adamralph
Owner
adamralph and others added some commits
@adamralph adamralph #92 increment to 2.0.0-alpha01 and clear release notes 978984a
@adamralph adamralph Merge pull request #103 from adamralph/92
#92 increment to 2.0.0-alpha01 and clear release notes
654d8db
@adamralph adamralph Merge pull request #110 from xbehave/master
dev catch up with master
cc3f5e2
@adamralph adamralph Merge pull request #112 from xbehave/master
dev catch up with master
7b57776
@adamralph adamralph Merge pull request #116 from xbehave/master
catch up dev with master
d9473d0
@adamralph adamralph Merge pull request #119 from xbehave/master
catch up dev with master
825fcc7
@adamralph adamralph #121 cleaned up Debug/Release mess 1c5927f
@adamralph adamralph change version to 1.1.0-beta01 797dfe4
@adamralph adamralph Merge pull request #122 from adamralph/121
cleaned up Debug/Release mess
5fc2f12
@adamralph adamralph Merge pull request #124 from xbehave/master
catch up dev with master
278b4d0
@dschenkelman dschenkelman Updated solution with XBehave.Net45.csproj Xbehave.Sdk.Net45.csproj a…
…nd test project XBehave.Features.Net45.csproj.

Also updated rakefile.rb and some linked files to work with conditional compilation.

This is to setup the ground for issue #25
44abc77
@dschenkelman dschenkelman Applied feedback by changing capital letters, updating DEBUG and RELE…
…ASE targets, added missing nuget packages, etc.
ce06eaa
@dschenkelman dschenkelman Updated nuget packages version, build actions, after build events, ca…
…pital letters, etc.
1603960
@dschenkelman dschenkelman Updated reference to XBehave project from Xbehave.Features.Net45.csproj 14e252f
@adamralph adamralph switched to absolute paths for xunit runner params 8bd954f
@adamralph adamralph Merge pull request #125 from adamralph/net45
Added NET 4.5 projects
76a1a83
@dschenkelman dschenkelman # Initial approach to async steps support 52e3a00
@adamralph adamralph Merge pull request #127 from xbehave/master
catch up dev with master
8962181
@dschenkelman dschenkelman Refactored to extract Step.cs and separate AsyncStep.cs and SyncStep.…
…cs. Still need to support method groups with async void signature.
005dfb0
@dschenkelman dschenkelman Introduced AsyncTestSyncContext.cs from XUnit project to support asyn…
…c void methods. Added unit test for it.

Still need to add tests for exceptions.
58189aa
@dschenkelman dschenkelman Test for exceptions of the correct type. 6c6a06c
@dschenkelman dschenkelman Added async support for Given, When, Then, And, But and f methods. 089cce6
@dschenkelman dschenkelman Fixed source analysis issues. c0c46c4
@dschenkelman dschenkelman Fixed issues in unit tests when running with xunit console runner. bc14c94
@dschenkelman dschenkelman Refactoring to simplify Step.cs inheritance hierarchy 08e9a31
@adamralph adamralph Merge pull request #128 from dschenkelman/issues/25
Initial proposal to fix #25.
c62e260
@adamralph adamralph #25 refactor: aligned AsyncStepFeature scenario style, refactored som…
…e scenarios and removed redundant code
6421ba5
@adamralph adamralph #25 refactor: changed AsyncStringExtensions to StringExtensions.Async.cs f18288c
@adamralph adamralph #25 refactor: extracted repeated code in CurrentScenario.EmbellishSte…
…pName()
2d14a48
@adamralph adamralph Merge pull request #129 from adamralph/25-minor-refactorings
#25 minor refactorings
ff9f0de
@adamralph adamralph #25 refactor: change Step to have just abstract Execute() be29c50
@adamralph adamralph #25 red: added AsyncStepFeature.AsyncTaskStepThrowsExceptionWithinTim…
…eout
90ab1dc
@adamralph adamralph #25 green: added a Wait on the task after it runs within the timeout 0135647
@adamralph adamralph Merge pull request #130 from adamralph/25
#25 refactor: change Step to have just abstract Execute()
f22e6cb
@adamralph adamralph #25 refactor: simplified timeouts 4609300
@adamralph adamralph Merge pull request #131 from adamralph/25
#25 refactor: simplified timeouts
9332e14
@adamralph adamralph Merge pull request #134 from xbehave/master
catch up dev with master
30f1f5b
@adamralph adamralph #25 red: added ObjectDisposalFeature.RegisteringManyDisposableObjects…
…InAnAsyncStep
7c3dcc6
@adamralph adamralph #25 green: added step overloads with a step context parameter 51bd3da
@adamralph adamralph #25 refactor: merged Helper into Fluent.Step eaa3d93
@adamralph adamralph Merge pull request #136 from adamralph/25
#25 added step overloads with a step context parameter
91c3d32
@adamralph adamralph added ObjectDisposalFeature.RegisteringManyDisposableObjectsInASingle…
…StepWithATimeout

closes #135
0733dd4
@adamralph adamralph Merge pull request #137 from adamralph/135
added ObjectDisposalFeature.RegisteringManyDisposableObjectsInASingleSte...
8255437
@adamralph adamralph #104 changed to version 1.1.0 and cleared release notes 737fbfc
@adamralph adamralph Merge pull request #138 from adamralph/104
#104 changed to version 1.1.0 and cleared release notes
94449c9
@adamralph adamralph #104 addressed all CA violations 7d37e03
@adamralph adamralph Merge pull request #139 from adamralph/104
#104 addressed all CA violations
44b1260
@adamralph
Owner

dev has uncompleted issues

@adamralph adamralph closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 9, 2013
  1. @adamralph
  2. @adamralph

    Merge pull request #103 from adamralph/92

    adamralph authored
    #92 increment to 2.0.0-alpha01 and clear release notes
Commits on Oct 13, 2013
  1. @adamralph

    Merge pull request #110 from xbehave/master

    adamralph authored
    dev catch up with master
Commits on Nov 10, 2013
  1. @adamralph

    Merge pull request #112 from xbehave/master

    adamralph authored
    dev catch up with master
Commits on Dec 15, 2013
  1. @adamralph

    Merge pull request #116 from xbehave/master

    adamralph authored
    catch up dev with master
Commits on Dec 27, 2013
  1. @adamralph

    Merge pull request #119 from xbehave/master

    adamralph authored
    catch up dev with master
Commits on Dec 28, 2013
  1. @adamralph
  2. @adamralph
  3. @adamralph

    Merge pull request #122 from adamralph/121

    adamralph authored
    cleaned up Debug/Release mess
  4. @adamralph

    Merge pull request #124 from xbehave/master

    adamralph authored
    catch up dev with master
  5. @dschenkelman

    Updated solution with XBehave.Net45.csproj Xbehave.Sdk.Net45.csproj a…

    dschenkelman authored
    …nd test project XBehave.Features.Net45.csproj.
    
    Also updated rakefile.rb and some linked files to work with conditional compilation.
    
    This is to setup the ground for issue #25
  6. @dschenkelman

    Applied feedback by changing capital letters, updating DEBUG and RELE…

    dschenkelman authored
    …ASE targets, added missing nuget packages, etc.
Commits on Dec 30, 2013
  1. @dschenkelman
Commits on Dec 31, 2013
  1. @dschenkelman
Commits on Jan 4, 2014
  1. @adamralph
  2. @adamralph

    Merge pull request #125 from adamralph/net45

    adamralph authored
    Added NET 4.5 projects
Commits on Jan 7, 2014
  1. @dschenkelman
Commits on Jan 9, 2014
  1. @adamralph

    Merge pull request #127 from xbehave/master

    adamralph authored
    catch up dev with master
Commits on Jan 11, 2014
  1. @dschenkelman

    Refactored to extract Step.cs and separate AsyncStep.cs and SyncStep.…

    dschenkelman authored
    …cs. Still need to support method groups with async void signature.
Commits on Jan 12, 2014
  1. @dschenkelman

    Introduced AsyncTestSyncContext.cs from XUnit project to support asyn…

    dschenkelman authored
    …c void methods. Added unit test for it.
    
    Still need to add tests for exceptions.
Commits on Jan 13, 2014
  1. @dschenkelman
  2. @dschenkelman
Commits on Jan 17, 2014
  1. @dschenkelman
Commits on Jan 25, 2014
  1. @dschenkelman
  2. @dschenkelman
Commits on Jan 26, 2014
  1. @adamralph

    Merge pull request #128 from dschenkelman/issues/25

    adamralph authored
    Initial proposal to fix #25.
  2. @adamralph

    #25 refactor: aligned AsyncStepFeature scenario style, refactored som…

    adamralph authored
    …e scenarios and removed redundant code
  3. @adamralph
  4. @adamralph
  5. @adamralph
  6. @adamralph
  7. @adamralph
  8. @adamralph
  9. @adamralph

    Merge pull request #130 from adamralph/25

    adamralph authored
    #25 refactor: change Step to have just abstract Execute()
  10. @adamralph
  11. @adamralph

    Merge pull request #131 from adamralph/25

    adamralph authored
    #25 refactor: simplified timeouts
Commits on Feb 8, 2014
  1. @adamralph

    Merge pull request #134 from xbehave/master

    adamralph authored
    catch up dev with master
Commits on Mar 3, 2014
  1. @adamralph
  2. @adamralph
  3. @adamralph
  4. @adamralph

    Merge pull request #136 from adamralph/25

    adamralph authored
    #25 added step overloads with a step context parameter
  5. @adamralph
  6. @adamralph

    Merge pull request #137 from adamralph/135

    adamralph authored
    added ObjectDisposalFeature.RegisteringManyDisposableObjectsInASingleSte...
  7. @adamralph
  8. @adamralph

    Merge pull request #138 from adamralph/104

    adamralph authored
    #104 changed to version 1.1.0 and cleared release notes
  9. @adamralph
  10. @adamralph

    Merge pull request #139 from adamralph/104

    adamralph authored
    #104 addressed all CA violations
Something went wrong with that request. Please try again.