Skip to content

Commit

Permalink
Make conflict test more explicit
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeweaver committed Feb 13, 2016
1 parent 6c3e87a commit 36ec2f6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions spec/lib/git/git_conflict_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
end

it 'cannot be created without conflicting files' do
expect { Git::GitConflict.new('repository_name', 'branch_a', 'branch_b', nil) }.to raise_exception(ArgumentError)
expect { Git::GitConflict.new('repository_name', 'branch_a', 'branch_b', []) }.to raise_exception(ArgumentError)
expect { Git::GitConflict.new('repository_name', 'branch_a', 'branch_b', nil) }.to raise_exception(ArgumentError, 'Must specify conflicting file list')
expect { Git::GitConflict.new('repository_name', 'branch_a', 'branch_b', []) }.to raise_exception(ArgumentError, 'Must specify conflicting file list')
end

it 'implements equality operator' do
Expand Down

0 comments on commit 36ec2f6

Please sign in to comment.