Merge branch 'master' into reference_relative_links

Conflicts:
	spec/models/project_spec.rb

1 files changed, 7 insertions, 8 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 4aef70e90fe..6837e4c9196 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -128,7 +128,7 @@ describe Project do
   end
 
   describe :update_merge_requests do
-    let(:project) { create(:project_with_code) }
+    let(:project) { create(:project) }
 
     before do
       @merge_request = create(:merge_request, source_project: project, target_project: project)
@@ -136,7 +136,7 @@ describe Project do
     end
 
     it "should close merge request if last commit from source branch was pushed to target branch" do
-      @merge_request.reloaded_commits
+      @merge_request.reload_code
       @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba"
       project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/stable", @key.user)
       @merge_request.reload
@@ -144,7 +144,6 @@ describe Project do
     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", "69b34b7e9ad9f496f0ad10250be37d6265a03bba", "refs/heads/master", @key.user)
       @merge_request.reload
       @merge_request.last_commit.id.should == "69b34b7e9ad9f496f0ad10250be37d6265a03bba"
@@ -156,10 +155,10 @@ describe Project do
     context 'with namespace' do
       before do
         @group = create :group, name: 'gitlab'
-        @project = create(:project, name: 'gitlab-ci', namespace: @group)
+        @project = create(:project, name: 'gitlabhq', namespace: @group)
       end
 
-      it { Project.find_with_namespace('gitlab/gitlab-ci').should == @project }
+      it { Project.find_with_namespace('gitlab/gitlabhq').should == @project }
       it { Project.find_with_namespace('gitlab-ci').should be_nil }
     end
   end
@@ -168,10 +167,10 @@ describe Project do
     context 'with namespace' do
       before do
         @group = create :group, name: 'gitlab'
-        @project = create(:project, name: 'gitlab-ci', namespace: @group)
+        @project = create(:project, name: 'gitlabhq', namespace: @group)
       end
 
-      it { @project.to_param.should == "gitlab/gitlab-ci" }
+      it { @project.to_param.should == "gitlab/gitlabhq" }
     end
   end
 
@@ -237,7 +236,7 @@ describe Project do
   end
 
   describe :open_branches do
-    let(:project) { create(:project_with_code) }
+    let(:project) { create(:project) }
 
     before do
       project.protected_branches.create(name: 'master')