diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 13:23:08 +0300 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-19 13:23:08 +0300 |
commit | 85e50301b4470c862603b7f2c503c336ea7c2210 (patch) | |
tree | 506ace453b35505ce607abd41d8a132424df9acb /spec/models/repository_spec.rb | |
parent | 28f85155f5125131d109629871a3257a471ad5af (diff) | |
parent | cd546a784434a8d1a872bc37e5a0c252b030f73c (diff) |
Merge branch 'master' into rename-repo-files
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index eb71a62ec56..d55fd36548a 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -4,16 +4,17 @@ describe Repository, models: true do include RepoHelpers TestBlob = Struct.new(:name) - let(:repository) { create(:project).repository } + let(:project) { create(:project) } + let(:repository) { project.repository } let(:user) { create(:user) } let(:commit_options) do author = repository.user_to_committer(user) { message: 'Test message', committer: author, author: author } end let(:merge_commit) do - source_sha = repository.find_branch('feature').target - merge_commit_sha = repository.merge(user, source_sha, 'master', commit_options) - repository.commit(merge_commit_sha) + merge_request = create(:merge_request, source_branch: 'feature', target_branch: 'master', source_project: project) + merge_commit_id = repository.merge(user, merge_request, commit_options) + repository.commit(merge_commit_id) end describe '#branch_names_contains' do |