Commit 71851a7e4e6784105b727ae7fde8fae72343ef3c
1 parent
e013cd44
Exists in
spb-stable
and in
3 other branches
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
4 additions
and
5 deletions
Show diff stats
spec/models/project_spec.rb
| @@ -136,7 +136,7 @@ describe Project do | @@ -136,7 +136,7 @@ describe Project do | ||
| 136 | end | 136 | end |
| 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.reload_code |
| 140 | @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" | 140 | @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" |
| 141 | project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user) | 141 | project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user) |
| 142 | @merge_request.reload | 142 | @merge_request.reload |
| @@ -144,7 +144,6 @@ describe Project do | @@ -144,7 +144,6 @@ describe Project do | ||
| 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 | ||
| 148 | project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user) | 147 | project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user) |
| 149 | @merge_request.reload | 148 | @merge_request.reload |
| 150 | @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" | 149 | @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828" |
| @@ -156,10 +155,10 @@ describe Project do | @@ -156,10 +155,10 @@ describe Project do | ||
| 156 | context 'with namespace' do | 155 | context 'with namespace' do |
| 157 | before do | 156 | before do |
| 158 | @group = create :group, name: 'gitlab' | 157 | @group = create :group, name: 'gitlab' |
| 159 | - @project = create(:project, name: 'gitlab-ci', namespace: @group) | 158 | + @project = create(:project, name: 'gitlabhq', namespace: @group) |
| 160 | end | 159 | end |
| 161 | 160 | ||
| 162 | - it { Project.find_with_namespace('gitlab/gitlab-ci').should == @project } | 161 | + it { Project.find_with_namespace('gitlab/gitlabhq').should == @project } |
| 163 | it { Project.find_with_namespace('gitlab-ci').should be_nil } | 162 | it { Project.find_with_namespace('gitlab-ci').should be_nil } |
| 164 | end | 163 | end |
| 165 | end | 164 | end |
spec/models/service_spec.rb