Fix tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 9449782425f..77467fb3890 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -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 == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
       project.update_merge_requests("8716fc78f3c65bbf7bcf7b574febd583bc5d2812", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "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", "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828", "refs/heads/master", @key.user)
       @merge_request.reload
       @merge_request.last_commit.id.should == "b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
@@ -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
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index b1b837c2263..46b3bf39aeb 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -44,7 +44,7 @@ describe Service do
       end
 
       describe :can_test do
-        it { @testable.should == false }
+        it { @testable.should == true }
       end
     end