diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 14:37:34 +0200 |
commit | 90c338a49541c95452181af9e0d0bcf9da6c51ad (patch) | |
tree | bdf4633d8e52fde86cdb956d8b6f2681190ff8b7 /spec/services/ci | |
parent | cc4ef4da11d46761ab0ce4fbd6b032a7e01baba9 (diff) | |
download | gitlab-ce-90c338a49541c95452181af9e0d0bcf9da6c51ad.tar.gz |
Move helpers back to original directory
Diffstat (limited to 'spec/services/ci')
-rw-r--r-- | spec/services/ci/create_commit_service_spec.rb | 8 | ||||
-rw-r--r-- | spec/services/ci/create_project_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/create_trigger_request_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/event_service_spec.rb | 6 | ||||
-rw-r--r-- | spec/services/ci/image_for_build_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/register_build_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/ci/web_hook_service_spec.rb | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/spec/services/ci/create_commit_service_spec.rb b/spec/services/ci/create_commit_service_spec.rb index 34e00d5b3c0..cc30b9e83f1 100644 --- a/spec/services/ci/create_commit_service_spec.rb +++ b/spec/services/ci/create_commit_service_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' -describe CreateCommitService do +describe Ci::CreateCommitService do let(:service) { CreateCommitService.new } let(:project) { FactoryGirl.create(:project) } - + describe :execute do context 'valid params' do - let(:commit) do + let(:commit) do service.execute(project, ref: 'refs/heads/master', before: '00000000', @@ -73,7 +73,7 @@ describe CreateCommitService do commits: commits, ci_yaml_file: gitlab_ci_yaml ) - + commit.builds.first.name.should == "staging" end diff --git a/spec/services/ci/create_project_service_spec.rb b/spec/services/ci/create_project_service_spec.rb index 31614968d55..c4b62e4fa9e 100644 --- a/spec/services/ci/create_project_service_spec.rb +++ b/spec/services/ci/create_project_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe CreateProjectService do +describe Ci::CreateProjectService do let(:service) { 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')) } diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb index 41db01c2235..c874697c456 100644 --- a/spec/services/ci/create_trigger_request_service_spec.rb +++ b/spec/services/ci/create_trigger_request_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe CreateTriggerRequestService do +describe Ci::CreateTriggerRequestService do let(:service) { CreateTriggerRequestService.new } let(:project) { FactoryGirl.create :project } let(:trigger) { FactoryGirl.create :trigger, project: project } diff --git a/spec/services/ci/event_service_spec.rb b/spec/services/ci/event_service_spec.rb index f7b9bf58127..b6ad262152d 100644 --- a/spec/services/ci/event_service_spec.rb +++ b/spec/services/ci/event_service_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' -describe EventService do +describe Ci::EventService do let (:project) { FactoryGirl.create :project, name: "GitLab / gitlab-shell" } let (:user) { double(username: "root", id: 1) } before do Event.destroy_all end - + describe :remove_project do it "creates event" do EventService.new.remove_project(user, project) @@ -31,4 +31,4 @@ describe EventService do Event.last.description.should == "User \"root\" updated projects settings" end end -end
\ No newline at end of file +end diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb index 4c7094146bb..dadc919bae1 100644 --- a/spec/services/ci/image_for_build_service_spec.rb +++ b/spec/services/ci/image_for_build_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ImageForBuildService do +describe Ci::ImageForBuildService do let(:service) { ImageForBuildService.new } let(:project) { FactoryGirl.create(:project) } let(:commit) { FactoryGirl.create(:commit, project: project, ref: 'master') } diff --git a/spec/services/ci/register_build_service_spec.rb b/spec/services/ci/register_build_service_spec.rb index b5af777dd1d..6d0ae76a241 100644 --- a/spec/services/ci/register_build_service_spec.rb +++ b/spec/services/ci/register_build_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe RegisterBuildService do +describe Ci::RegisterBuildService do let!(:service) { RegisterBuildService.new } let!(:project) { FactoryGirl.create :project } let!(:commit) { FactoryGirl.create :commit, project: project } diff --git a/spec/services/ci/web_hook_service_spec.rb b/spec/services/ci/web_hook_service_spec.rb index 2bb153942e8..6f882e6fdad 100644 --- a/spec/services/ci/web_hook_service_spec.rb +++ b/spec/services/ci/web_hook_service_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe WebHookService do +describe Ci::WebHookService do let (:project) { FactoryGirl.create :project } let (:commit) { FactoryGirl.create :commit, project: project } let (:build) { FactoryGirl.create :build, commit: commit } |