Skip to content

Commit

Permalink
Fix git integrate command to properly create aggregate branch on firs…
Browse files Browse the repository at this point in the history
…t run.
  • Loading branch information
wireframe committed Sep 18, 2014
1 parent 6e527d6 commit 58a70ab
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions spec/thegarage/gitx/cli/integrate_command_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
}
end
let(:cli) { Thegarage::Gitx::Cli::IntegrateCommand.new(args, options, config) }
let(:repo) { cli.send(:repo) }
let(:branch) { double('fake branch', name: 'feature-branch') }

before do
Expand Down Expand Up @@ -38,6 +39,22 @@
should meet_expectations
end
end
context 'when staging branch does not exist remotely' do
before do
expect(repo)
end
it 'does not delete local branch' do
should meet_expectations
end
end
context 'when staging branch does exist remotely' do
before do
expect(repo)
end
it 'deletes local branch' do
should meet_expectations
end
end
context 'when target branch == prototype' do
before do
expect(fake_update_command).to receive(:update)
Expand Down

0 comments on commit 58a70ab

Please sign in to comment.