Permalink
Browse files

Pulling target branch before merging passing feature branches in from…

… QA command, QA scenario passing
  • Loading branch information...
winton committed Jan 20, 2012
1 parent 315a5b7 commit 050737eb5b6890631bc7c3a92e130318f0b52fc9
Showing with 21 additions and 22 deletions.
  1. +1 −3 README.md
  2. +17 −17 features/gitcycle.feature
  3. +2 −2 features/steps/gitcycle_steps.rb
  4. +1 −0 lib/gitcycle.rb
View
@@ -101,8 +101,6 @@ Todo
* Make ticket active when starting branch
* Label issues with ticket milestone?
-* Bug with branch rename on Jimmy's machine
-* Need to pull before merging qa pass branch
-* Check for conflict wherever merge happens
+* Check for conflict whenever merge happens
* Instead of detecting CONFLICT, use error status $? != 0
* Add comment on lighthouse with issue URL
View
@@ -158,20 +158,20 @@ Scenario: Reviewed issue w/ parameters
Then gitcycle runs
And output includes "Labeling issues as 'Pending QA'."
-# Scenario: QA issue
-# When I cd to the owner repo
-# And I checkout master
-# And I execute gitcycle with "qa issue.id"
-# Then gitcycle runs
-# And output includes
-# """
-# Retrieving branch information from gitcycle.
-# Deleting old QA branch 'qa_master'.
-# Creating QA branch 'qa_master'.
-# Adding remote repo 'br/gitcycle_test'.
-# Fetching remote branch '200-test-ticket'.
-# Merging remote branch '200-test-ticket' from 'br/gitcycle_test'.
-# Pushing QA branch 'qa_master'.
-# Type 'gitc qa pass' to approve all issues in this branch.
-# Type 'gitc qa fail' to reject all issues in this branch.
-# """
+Scenario: QA issue
+ When I cd to the owner repo
+ And I checkout master
+ And I execute gitcycle with "qa issue.id"
+ Then gitcycle runs
+ And output includes
+ """
+ Retrieving branch information from gitcycle.
+ Deleting old QA branch 'qa_master'.
+ Creating QA branch 'qa_master'.
+ Adding remote repo 'config.user/gitcycle_test'.
+ Fetching remote repo 'config.user'.
+ Merging remote branch 'ticket.id' from 'config.user/gitcycle_test'.
+ Pushing QA branch 'qa_master'.
+ Type 'gitc qa pass' to approve all issues in this branch.
+ Type 'gitc qa fail' to reject all issues in this branch.
+ """
@@ -197,12 +197,12 @@ def type(text)
Then /^output includes$/ do |expected|
expected = gsub_variables(expected)
- @output.include?(expected).should == true
+ @output.gsub(/\n+/, "\n").include?(expected).should == true
end
Then /^output does not include \"([^\"]*)"$/ do |expected|
expected = gsub_variables(expected)
- @output.gsub(/\n+/, "\n").include?(expected).should == false
+ @output.include?(expected).should == false
end
Then /^redis entries valid$/ do
View
@@ -176,6 +176,7 @@ def qa(*issues)
puts "Checking out #{qa_branch['source']}.".green
run("git checkout #{qa_branch['source']}")
+ run("git pull origin #{qa_branch['source']}")
if issues[1..-1].empty?
if issues.first == 'pass'

0 comments on commit 050737e

Please sign in to comment.