From bf8013f1a4c5d6274d0b03f55098e3b4d1da3f4d Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 10 Sep 2015 15:56:33 +0200
Subject: [PATCH] Fix most of project specs

---
 spec/factories/ci/runners.rb   |  4 ++--
 spec/models/ci/project_spec.rb | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/factories/ci/runners.rb b/spec/factories/ci/runners.rb
index fec56b438fa..db759eca9ac 100644
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
@@ -27,11 +27,11 @@ FactoryGirl.define do
 
     platform "darwin"
 
-    factory :shared_runner do
+    factory :ci_shared_runner do
       is_shared true
     end
 
-    factory :specific_runner do
+    factory :ci_specific_runner do
       is_shared false
     end
   end
diff --git a/spec/models/ci/project_spec.rb b/spec/models/ci/project_spec.rb
index 5b2a8d09974..1be276a9ef8 100644
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
@@ -27,7 +27,7 @@
 
 require 'spec_helper'
 
-describe Project do
+describe Ci::Project do
   subject { FactoryGirl.build :ci_project }
 
   it { is_expected.to have_many(:commits) }
@@ -57,7 +57,7 @@ describe Project do
       FactoryGirl.create :ci_commit, committed_at: 1.hour.ago, project: newest_project
       FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, project: oldest_project
 
-      expect(Project.ordered_by_last_commit_date).to eq([newest_project, oldest_project, project_without_commits])
+      expect(Ci::Project.ordered_by_last_commit_date).to eq([newest_project, oldest_project, project_without_commits])
     end
   end
 
@@ -71,7 +71,7 @@ describe Project do
       end
 
       it { expect(project.status).to eq('pending') }
-      it { expect(project.last_commit).to be_kind_of(Commit)  }
+      it { expect(project.last_commit).to be_kind_of(Ci::Commit)  }
       it { expect(project.human_status).to eq('pending') }
     end
   end
@@ -125,17 +125,17 @@ describe Project do
 
   describe 'Project.parse' do
     let(:project_dump) { YAML.load File.read(Rails.root.join('spec/support/gitlab_stubs/raw_project.yml')) }
-    let(:parsed_project) { Project.parse(project_dump) }
+    let(:parsed_project) { Ci::Project.parse(project_dump) }
 
 
     it { expect(parsed_project).to be_valid }
-    it { expect(parsed_project).to be_kind_of(Project) }
+    it { expect(parsed_project).to be_kind_of(Ci::Project) }
     it { expect(parsed_project.name).to eq("GitLab / api.gitlab.org") }
     it { expect(parsed_project.gitlab_id).to eq(189) }
     it { expect(parsed_project.gitlab_url).to eq("http://demo.gitlab.com/gitlab/api-gitlab-org") }
 
     it "parses plain hash" do
-      expect(Project.parse(project_dump).name).to eq("GitLab / api.gitlab.org")
+      expect(Ci::Project.parse(project_dump).name).to eq("GitLab / api.gitlab.org")
     end
   end
 
@@ -154,8 +154,8 @@ describe Project do
   describe :search do
     let!(:project) { FactoryGirl.create(:ci_project, name: "foo") }
 
-    it { expect(Project.search('fo')).to include(project) }
-    it { expect(Project.search('bar')).to be_empty }
+    it { expect(Ci::Project.search('fo')).to include(project) }
+    it { expect(Ci::Project.search('bar')).to be_empty }
   end
 
   describe :any_runners do