Commit 3bcfdf07cd81408105cb912ceb64532688e1e9cd
1 parent
c6b9767e
Exists in
spb-stable
and in
3 other branches
Update last sha of the commit in the test seed repository.
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
spec/models/project_spec.rb
@@ -137,17 +137,17 @@ describe Project do | @@ -137,17 +137,17 @@ describe Project do | ||
137 | 137 | ||
138 | it "should close merge request if last commit from source branch was pushed to target branch" do | 138 | it "should close merge request if last commit from source branch was pushed to target branch" do |
139 | @merge_request.reloaded_commits | 139 | @merge_request.reloaded_commits |
140 | - @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" | ||
141 | - project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user) | 140 | + @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba" |
141 | + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/stable", @key.user) | ||
142 | @merge_request.reload | 142 | @merge_request.reload |
143 | @merge_request.merged?.should be_true | 143 | @merge_request.merged?.should be_true |
144 | end | 144 | end |
145 | 145 | ||
146 | it "should update merge request commits with new one if pushed to source branch" do | 146 | it "should update merge request commits with new one if pushed to source branch" do |
147 | @merge_request.last_commit.should == nil | 147 | @merge_request.last_commit.should == nil |
148 | - project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user) | 148 | + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/master", @key.user) |
149 | @merge_request.reload | 149 | @merge_request.reload |
150 | - @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" | 150 | + @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba" |
151 | end | 151 | end |
152 | end | 152 | end |
153 | 153 |
spec/seed_project.tar.gz
No preview for this file type