fix specs. Stage 7

4 files changed, 25 insertions, 27 deletions

diff --git a/spec/services/ci/create_project_service_spec.rb b/spec/services/ci/create_project_service_spec.rb
index 234a778f8cc..ce5b131f192 100644
--- a/spec/services/ci/create_project_service_spec.rb
+++ b/spec/services/ci/create_project_service_spec.rb
@@ -1,12 +1,10 @@
 require 'spec_helper'
 
 describe Ci::CreateProjectService do
-  let(:service) { CreateProjectService.new }
+  let(:service) { Ci::CreateProjectService.new }
   let(:current_user) { double.as_null_object }
   let(:project_dump) { YAML.load File.read(Rails.root.join('spec/support/gitlab_stubs/raw_project.yml')) }
 
-  before { allow_any_instance_of(Network).to receive_messages(enable_ci: true) }
-
   describe :execute do
     context 'valid params' do
       let(:project) { service.execute(current_user, project_dump, 'http://localhost/projects/:project_id') }
@@ -23,7 +21,7 @@ describe Ci::CreateProjectService do
 
     context "forking" do
       it "uses project as a template for settings and jobs" do
-        origin_project = FactoryGirl.create(:project)
+        origin_project = FactoryGirl.create(:ci_project)
         origin_project.shared_runners_enabled = true
         origin_project.public = true
         origin_project.allow_git_fetch = true
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
index 9082c741ead..d12cd9773dc 100644
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ b/spec/services/ci/create_trigger_request_service_spec.rb
@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe Ci::CreateTriggerRequestService do
-  let(:service) { CreateTriggerRequestService.new }
-  let(:project) { FactoryGirl.create :project }
-  let(:trigger) { FactoryGirl.create :trigger, project: project }
+  let(:service) { Ci::CreateTriggerRequestService.new }
+  let(:project) { FactoryGirl.create :ci_project }
+  let(:trigger) { FactoryGirl.create :ci_trigger, project: project }
 
   describe :execute do
     context 'valid params' do
       subject { service.execute(project, trigger, 'master') }
 
       before do
-        @commit = FactoryGirl.create :commit, project: project
+        @commit = FactoryGirl.create :ci_commit, project: project
       end
 
-      it { expect(subject).to be_kind_of(TriggerRequest) }
+      it { expect(subject).to be_kind_of(Ci::TriggerRequest) }
       it { expect(subject.commit).to eq(@commit) }
     end
 
@@ -27,7 +27,7 @@ describe Ci::CreateTriggerRequestService do
       subject { service.execute(project, trigger, 'master') }
 
       before do
-        FactoryGirl.create :commit_without_jobs, project: project
+        FactoryGirl.create :ci_commit_without_jobs, project: project
       end
 
       it { expect(subject).to be_nil }
@@ -37,13 +37,13 @@ describe Ci::CreateTriggerRequestService do
       subject { service.execute(project, trigger, 'master') }
 
       before do
-        @commit1 = FactoryGirl.create :commit, committed_at: 2.hour.ago, project: project
-        @commit2 = FactoryGirl.create :commit, committed_at: 1.hour.ago, project: project
-        @commit3 = FactoryGirl.create :commit, committed_at: 3.hour.ago, project: project
+        @commit1 = FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, project: project
+        @commit2 = FactoryGirl.create :ci_commit, committed_at: 1.hour.ago, project: project
+        @commit3 = FactoryGirl.create :ci_commit, committed_at: 3.hour.ago, project: project
       end
 
       context 'retries latest one' do
-        it { expect(subject).to be_kind_of(TriggerRequest) }
+        it { expect(subject).to be_kind_of(Ci::TriggerRequest) }
         it { expect(subject).to be_persisted }
         it { expect(subject.commit).to eq(@commit2) }
       end
diff --git a/spec/services/ci/event_service_spec.rb b/spec/services/ci/event_service_spec.rb
index c8c4c45cc31..9b330a90ae2 100644
--- a/spec/services/ci/event_service_spec.rb
+++ b/spec/services/ci/event_service_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Ci::EventService do
-  let(:project) { FactoryGirl.create :project, name: "GitLab / gitlab-shell" }
+  let(:project) { FactoryGirl.create :ci_project, name: "GitLab / gitlab-shell" }
   let(:user)   { double(username: "root", id: 1) }
 
   before do
@@ -10,25 +10,25 @@ describe Ci::EventService do
 
   describe :remove_project do
     it "creates event" do
-      EventService.new.remove_project(user, project)
+      Ci::EventService.new.remove_project(user, project)
 
-      expect(Event.admin.last.description).to eq("Project \"GitLab / gitlab-shell\" has been removed by root")
+      expect(Ci::Event.admin.last.description).to eq("Project \"GitLab / gitlab-shell\" has been removed by root")
     end
   end
 
   describe :create_project do
     it "creates event" do
-      EventService.new.create_project(user, project)
+      Ci::EventService.new.create_project(user, project)
 
-      expect(Event.admin.last.description).to eq("Project \"GitLab / gitlab-shell\" has been created by root")
+      expect(Ci::Event.admin.last.description).to eq("Project \"GitLab / gitlab-shell\" has been created by root")
     end
   end
 
   describe :change_project_settings do
     it "creates event" do
-      EventService.new.change_project_settings(user, project)
+      Ci::EventService.new.change_project_settings(user, project)
 
-      expect(Event.last.description).to eq("User \"root\" updated projects settings")
+      expect(Ci::Event.last.description).to eq("User \"root\" updated projects settings")
     end
   end
 end
diff --git a/spec/services/ci/web_hook_service_spec.rb b/spec/services/ci/web_hook_service_spec.rb
index b893b1f23f2..cebdd145e40 100644
--- a/spec/services/ci/web_hook_service_spec.rb
+++ b/spec/services/ci/web_hook_service_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Ci::WebHookService do
-  let(:project) { FactoryGirl.create :project }
-  let(:commit)  { FactoryGirl.create :commit, project: project }
-  let(:build)   { FactoryGirl.create :build, commit: commit }
-  let(:hook)    { FactoryGirl.create :web_hook, project: project }
+  let(:project) { FactoryGirl.create :ci_project }
+  let(:commit)  { FactoryGirl.create :ci_commit, project: project }
+  let(:build)   { FactoryGirl.create :ci_build, commit: commit }
+  let(:hook)    { FactoryGirl.create :ci_web_hook, project: project }
 
   describe :execute do
     it "should execute successfully" do
       stub_request(:post, hook.url).to_return(status: 200)
-      expect(WebHookService.new.build_end(build)).to be_truthy
+      expect(Ci::WebHookService.new.build_end(build)).to be_truthy
     end
   end
 
@@ -31,6 +31,6 @@ describe Ci::WebHookService do
   end
 
   def build_data(build)
-    WebHookService.new.send :build_data, build
+    Ci::WebHookService.new.send :build_data, build
   end
 end