Download as
Browse Code »

Commit e2b39517003bb2045f63c2653471275cbbbc1c10

Authored by Dmitriy Zaporozhets
1 parent 7f76d6cf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Some test covering merge request update hook

Showing 1 changed file with 28 additions and 0 deletions   Show diff stats
spec/models/project_spec.rb
  Diff comments   View file @e2b3951
... ... @@ -160,6 +160,34 @@ describe Project do
160 160 end
161 161 end
162 162 end
  163 +
  164 + describe :update_merge_requests do
  165 + let(:project) { Factory :project }
  166 +
  167 + before do
  168 + @merge_request = Factory :merge_request,
  169 + :project => project,
  170 + :merged => false,
  171 + :closed => false
  172 + @key = Factory :key, :user_id => project.owner.id
  173 + end
  174 +
  175 + it "should close merge request if last commit from source branch was pushed to target branch" do
  176 + @merge_request.reloaded_commits
  177 + @merge_request.last_commit.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
  178 + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a", "refs/heads/stable", @key.identifier)
  179 + @merge_request.reload
  180 + @merge_request.merged.should be_true
  181 + @merge_request.closed.should be_true
  182 + end
  183 +
  184 + it "should update merge request commits with new one if pushed to source branch" do
  185 + @merge_request.last_commit.should == nil
  186 + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a", "refs/heads/master", @key.identifier)
  187 + @merge_request.reload
  188 + @merge_request.last_commit.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
  189 + end
  190 + end
163 191 end
164 192 # == Schema Information
165 193 #
... ...