Download as
Browse Code »

Commit 71851a7e4e6784105b727ae7fde8fae72343ef3c

Authored by Dmitriy Zaporozhets
1 parent e013cd44
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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
  Diff comments   View file @71851a7
... ... @@ -136,7 +136,7 @@ describe Project do
136 136 end
137 137  
138 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 140 @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
141 141 project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/stable", @key.user)
142 142 @merge_request.reload
... ... @@ -144,7 +144,6 @@ describe Project do
144 144 end
145 145  
146 146 it "should update merge request commits with new one if pushed to source branch" do
147   - @merge_request.last_commit.should == nil
148 147 project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user)
149 148 @merge_request.reload
150 149 @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
... ... @@ -156,10 +155,10 @@ describe Project do
156 155 context 'with namespace' do
157 156 before do
158 157 @group = create :group, name: 'gitlab'
159   - @project = create(:project, name: 'gitlab-ci', namespace: @group)
  158 + @project = create(:project, name: 'gitlabhq', namespace: @group)
160 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 162 it { Project.find_with_namespace('gitlab-ci').should be_nil }
164 163 end
165 164 end
... ...
spec/models/service_spec.rb
  Diff comments   View file @71851a7
... ... @@ -44,7 +44,7 @@ describe Service do
44 44 end
45 45  
46 46 describe :can_test do
47   - it { @testable.should == false }
  47 + it { @testable.should == true }
48 48 end
49 49 end
50 50  
... ...