Permalink
Browse files

More todos, making scenarios prettier

  • Loading branch information...
1 parent 050737e commit fd4769ae0d00031fdbe4e51d6e3b3f795765a7d9 @winton committed Jan 20, 2012
Showing with 19 additions and 11 deletions.
  1. +3 −1 README.md
  2. +14 −8 features/gitcycle.feature
  3. +1 −1 features/steps/gitcycle_steps.rb
  4. +1 −1 lib/gitcycle.rb
View
@@ -103,4 +103,6 @@ Todo
* Label issues with ticket milestone?
* Check for conflict whenever merge happens
* Instead of detecting CONFLICT, use error status $? != 0
-* Add comment on lighthouse with issue URL
+* Add comment on lighthouse with issue URL
+* Need to make sure when a branch is created, it is always from the pristine remote version, not local
+* Add conflict check when calling "qa pass [ticket]"
View
@@ -25,14 +25,20 @@ Scenario: Feature branch w/ custom branch name
And I enter "n"
And I enter "ticket.id-rename"
Then gitcycle runs
- And output includes "Retrieving branch information from gitcycle."
- And output includes "Your work will eventually merge into 'master'. Is this correct?"
- And output includes "Would you like to name your branch 'ticket.id'?"
- And output includes "What would you like to name your branch?"
- And output includes "Creating 'ticket.id-rename' from 'master'."
- And output includes "Checking out branch 'ticket.id-rename'."
- And output includes "Pushing 'ticket.id-rename'."
- And output includes "Sending branch information to gitcycle."
+ And output includes
+ """
+ Retrieving branch information from gitcycle.
+ Your work will eventually merge into 'master'. Is this correct? (y/n)
+ Adding remote repo 'br/gitcycle_test'.
+ Fetching remote repo 'br'.
+ Checking out remote branch 'master' from 'br/gitcycle_test'.
+ Would you like to name your branch 'ticket.id'? (y/n)
+ What would you like to name your branch?
+ Creating 'ticket.id-rename' from 'master'.
+ Checking out branch 'ticket.id-rename'.
+ Pushing 'ticket.id-rename'.
+ Sending branch information to gitcycle.
+ """
And redis entries valid
Scenario: Feature branch
@@ -87,7 +87,7 @@ def run_gitcycle(cmd)
@gitcycle = Gitcycle.new
@gitcycle.stub(:puts) do |str|
str = str.gsub(/\e\[\d{1,2}m/, '')
- @output << str
+ @output << "#{str}\n"
puts str
end
if cmd
View
@@ -92,7 +92,7 @@ def create_branch(url_or_title)
end
unless branch['exists']
- puts "Pushing '#{name}'.".green
+ puts "Pushing '#{name}'.\n".green
run("git push origin #{name}")
puts "Sending branch information to gitcycle.".green

0 comments on commit fd4769a

Please sign in to comment.