diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-01-23 13:06:44 +0100 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-01-23 13:06:44 +0100 |
commit | 3bcfdf07cd81408105cb912ceb64532688e1e9cd (patch) | |
tree | 65735f276d31c237229dd6d97b6acada1038c6ab /spec | |
parent | c6b9767e74421bae7f0532ce7fab8753863e94f0 (diff) | |
download | gitlab-ce-3bcfdf07cd81408105cb912ceb64532688e1e9cd.tar.gz |
Update last sha of the commit in the test seed repository.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/project_spec.rb | 8 | ||||
-rw-r--r-- | spec/seed_project.tar.gz | bin | 9795746 -> 9825908 bytes |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 373accfe412..4aef70e90fe 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -137,17 +137,17 @@ describe Project do it "should close merge request if last commit from source branch was pushed to target branch" do @merge_request.reloaded_commits - @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" - project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user) + @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba" + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/stable", @key.user) @merge_request.reload @merge_request.merged?.should be_true end it "should update merge request commits with new one if pushed to source branch" do @merge_request.last_commit.should == nil - project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user) + project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/master", @key.user) @merge_request.reload - @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" + @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba" end end diff --git a/spec/seed_project.tar.gz b/spec/seed_project.tar.gz Binary files differindex b098a2c3b64..a2daf383277 100644 --- a/spec/seed_project.tar.gz +++ b/spec/seed_project.tar.gz |