Permalink
Browse files

Cucumber feature formatting fixes

  • Loading branch information...
1 parent e6edd98 commit a521d8b4dac0ef8bdc1f374ee09f7674eeb50499 @winton committed Feb 21, 2012
Showing with 76 additions and 76 deletions.
  1. +35 −35 features/branch.feature
  2. +6 −6 features/checkout.feature
  3. +5 −5 features/discuss.feature
  4. +2 −2 features/errors.feature
  5. +10 −10 features/pull.feature
  6. +17 −17 features/qa.feature
  7. +1 −1 features/setup.feature
View
@@ -7,17 +7,17 @@ Scenario: Yes to all (easiest route)
And I give default input
And gitcycle runs
Then output includes
- """
- Your work will eventually merge into 'master'. Is this correct? (y/n)
- Retrieving branch information from gitcycle.
- Would you like to name your branch 'ticket.id'? (y/n)
- Adding remote repo 'config.owner/config.repo'.
- Fetching remote 'config.owner'.
- Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
- Fetching remote 'origin'.
- Pushing 'origin/ticket.id'.
- Sending branch information to gitcycle.
- """
+ """
+ Your work will eventually merge into 'master'. Is this correct? (y/n)
+ Retrieving branch information from gitcycle.
+ Would you like to name your branch 'ticket.id'? (y/n)
+ Adding remote repo 'config.owner/config.repo'.
+ Fetching remote 'config.owner'.
+ Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
+ Fetching remote 'origin'.
+ Pushing 'origin/ticket.id'.
+ Sending branch information to gitcycle.
+ """
And redis entries valid
Scenario: Custom branch name
@@ -29,18 +29,18 @@ Scenario: Custom branch name
And I enter "ticket.id-rename"
And gitcycle runs
Then output includes
- """
- Your work will eventually merge into 'master'. Is this correct? (y/n)
- Retrieving branch information from gitcycle.
- Would you like to name your branch 'ticket.id'? (y/n)
- What would you like to name your branch?
- Adding remote repo 'config.owner/config.repo'.
- Fetching remote 'config.owner'.
- Checking out remote branch 'ticket.id-rename' from 'config.owner/config.repo/master'.
- Fetching remote 'origin'.
- Pushing 'origin/ticket.id-rename'.
- Sending branch information to gitcycle.
- """
+ """
+ Your work will eventually merge into 'master'. Is this correct? (y/n)
+ Retrieving branch information from gitcycle.
+ Would you like to name your branch 'ticket.id'? (y/n)
+ What would you like to name your branch?
+ Adding remote repo 'config.owner/config.repo'.
+ Fetching remote 'config.owner'.
+ Checking out remote branch 'ticket.id-rename' from 'config.owner/config.repo/master'.
+ Fetching remote 'origin'.
+ Pushing 'origin/ticket.id-rename'.
+ Sending branch information to gitcycle.
+ """
And redis entries valid
Scenario: Change source branch
@@ -54,16 +54,16 @@ Scenario: Change source branch
And I enter "y"
And gitcycle runs
Then output includes
- """
- Your work will eventually merge into 'some_branch'. Is this correct? (y/n)
- What branch would you like to eventually merge into?
- Retrieving branch information from gitcycle.
- Would you like to name your branch 'ticket.id'? (y/n)
- Adding remote repo 'config.owner/config.repo'.
- Fetching remote 'config.owner'.
- Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
- Fetching remote 'origin'.
- Pushing 'origin/ticket.id'.
- Sending branch information to gitcycle.
- """
+ """
+ Your work will eventually merge into 'some_branch'. Is this correct? (y/n)
+ What branch would you like to eventually merge into?
+ Retrieving branch information from gitcycle.
+ Would you like to name your branch 'ticket.id'? (y/n)
+ Adding remote repo 'config.owner/config.repo'.
+ Fetching remote 'config.owner'.
+ Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
+ Fetching remote 'origin'.
+ Pushing 'origin/ticket.id'.
+ Sending branch information to gitcycle.
+ """
And redis entries valid
View
@@ -18,10 +18,10 @@ Scenario: Fresh repo
Given a fresh set of repositories
When I cd to the user repo
And I execute gitcycle checkout with the last URL or string
- Then gitcycle runs
- And output includes
- """
- Retrieving branch information from gitcycle.
- Tracking branch 'origin/last_ticket.id'.
- """
+ And gitcycle runs
+ Then output includes
+ """
+ Retrieving branch information from gitcycle.
+ Tracking branch 'origin/last_ticket.id'.
+ """
And current branch is "last_ticket.id"
View
@@ -25,11 +25,11 @@ Scenario: No parameters and something committed
And I execute gitcycle with "discuss"
And gitcycle runs
Then output includes
- """
- Retrieving branch information from gitcycle.
- Creating GitHub pull request.
- Labeling issue as 'Discuss'.
- """
+ """
+ Retrieving branch information from gitcycle.
+ Creating GitHub pull request.
+ Labeling issue as 'Discuss'.
+ """
And output includes "Opening issue" with URL
And URL is a valid issue
And redis entries valid
View
@@ -2,10 +2,10 @@ Feature: Errors
Scenario: No command given
When I execute gitcycle with nothing
- And gitcycle runs
+ And gitcycle runs
Then output includes "No command specified"
Scenario: Non-existent command
When I execute gitcycle with "blah blah"
- And gitcycle runs
+ And gitcycle runs
Then output includes "Command not recognized."
View
@@ -10,14 +10,14 @@ Scenario: Pull changes from upstream
And I execute gitcycle with "pull"
And gitcycle runs
Then output includes
- """
- Retrieving branch information from gitcycle.
- Retrieving repo information from gitcycle.
- Adding remote repo 'config.owner/config.repo'.
- Fetching remote 'config.owner'.
- Merging remote branch 'master' from 'config.owner/config.repo'.
- Adding remote repo 'config.user/config.repo'.
- Fetching remote 'config.user'.
- Merging remote branch 'master' from 'config.user/config.repo'.
- """
+ """
+ Retrieving branch information from gitcycle.
+ Retrieving repo information from gitcycle.
+ Adding remote repo 'config.owner/config.repo'.
+ Fetching remote 'config.owner'.
+ Merging remote branch 'master' from 'config.owner/config.repo'.
+ Adding remote repo 'config.user/config.repo'.
+ Fetching remote 'config.user'.
+ Merging remote branch 'master' from 'config.user/config.repo'.
+ """
And git log should contain the last commit
View
@@ -47,25 +47,25 @@ Scenario: QA issue pass
And gitcycle runs
And I checkout qa_master_config.user
And I execute gitcycle with "qa pass"
- Then gitcycle runs
- And output includes
- """
- Retrieving branch information from gitcycle.
- Checking out branch 'master'.
- Adding remote repo 'config.user/config.repo'.
- Fetching remote 'config.user'.
- Merging remote branch 'ticket.id' from 'config.user/config.repo'.
- Pushing branch 'master'.
- Labeling all issues as 'Pass'.
- """
+ And gitcycle runs
+ Then output includes
+ """
+ Retrieving branch information from gitcycle.
+ Checking out branch 'master'.
+ Adding remote repo 'config.user/config.repo'.
+ Fetching remote 'config.user'.
+ Merging remote branch 'ticket.id' from 'config.user/config.repo'.
+ Pushing branch 'master'.
+ Labeling all issues as 'Pass'.
+ """
Scenario: QA issue list
When I cd to the owner repo
And I checkout master
And I execute gitcycle with "qa"
- Then gitcycle runs
- And output includes
- """
- qa_master_config.user
- issue #issue.id\tconfig.user/last_ticket.id
- """
+ And gitcycle runs
+ Then output includes
+ """
+ qa_master_config.user
+ issue #issue.id\tconfig.user/last_ticket.id
+ """
View
@@ -2,6 +2,6 @@ Feature: Setup
Scenario: Setup
When I execute gitcycle setup
- And gitcycle runs
+ And gitcycle runs
Then output includes "Configuration saved."
And gitcycle.yml should be valid

0 comments on commit a521d8b

Please sign in to comment.