Allow for multiple When and Then clauses

[muxa]

For instance

Given a scenario
  When there's one when clause
    And there's another when clause
  Then should check execute both clauses
    And do additional checks

This gives a more granular control, i.e. can create smaller steps and combine them.

[smhabdoli]

I think we can do that by using a stack array, then we can push and pop. what do you think?

[MorganPersson]

First, sorry for the late answer, somehow email notifications where set to off.

If I understand you question correctly that does already work.
For example this works fine:

Scenario: title
    Given text1
        And text2
        And text3
    When action1
    Then stuff1
        And stuff2
    When action2
    Then stuff3
    Then stuff4
        And stuff5