Permalink
Browse files

Merge branch 'master' of github.com:winton/gitcycle

  • Loading branch information...
2 parents c2e6aa9 + deda2fe commit a4fc53ca53d947750a0a5e10ec75acc2f55c046a @tongueroo tongueroo committed Mar 8, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −2 features/discuss.feature
  2. +2 −1 features/steps/gitcycle_steps.rb
View
@@ -1,6 +1,6 @@
Feature: Discuss
-Scenario: No parameters and nothing committed
+Scenario: (Discuss) No parameters and nothing committed
Given a fresh set of repositories
When I cd to the user repo
And I execute gitcycle branch with a new URL or string
@@ -15,7 +15,7 @@ Scenario: No parameters and nothing committed
"""
And redis entries valid
-Scenario: No parameters and something committed
+Scenario: (Discuss) No parameters and something committed
Given a fresh set of repositories
When I cd to the user repo
And I execute gitcycle branch with a new URL or string
@@ -327,7 +327,8 @@ def type(text)
'user' => config['user'],
'source' => collab ? 'some_branch' : 'master'
}
- if @scenario_title == 'No parameters and something committed'
+ if @scenario_title.include?("(Discuss)") && @scenario_title.include?("something committed")
+ should['labels'] = 'Branch - master'
should['issue_url'] = $github_url
end
branch.should == should

0 comments on commit a4fc53c

Please sign in to comment.