diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-02 10:26:56 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-02 10:26:56 +0200 |
| commit | 37e9e71ea1162fbae13bdc9c41684bdd4ad03b1e (patch) | |
| tree | 8f2cf7dbaa1f5e21d7e1ab3ee23fda864a8215c8 /spec | |
| parent | 5de0b078442da2adc2b0673e3286c7d1a7cb2501 (diff) | |
| download | gitlab-ce-37e9e71ea1162fbae13bdc9c41684bdd4ad03b1e.tar.gz | |
Remove unnecessary fork ci logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/ci/create_project_service_spec.rb | 37 | ||||
| -rw-r--r-- | spec/services/projects/fork_service_spec.rb | 2 |
2 files changed, 1 insertions, 38 deletions
diff --git a/spec/services/ci/create_project_service_spec.rb b/spec/services/ci/create_project_service_spec.rb deleted file mode 100644 index 2de7b0deca7..00000000000 --- a/spec/services/ci/create_project_service_spec.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'spec_helper' - -describe Ci::CreateProjectService do - let(:service) { Ci::CreateProjectService.new } - let(:current_user) { double.as_null_object } - let(:project) { FactoryGirl.create :project } - - describe :execute do - context 'valid params' do - subject { service.execute(current_user, project) } - - it { is_expected.to be_kind_of(Ci::Project) } - it { is_expected.to be_persisted } - end - - context 'without project dump' do - it 'should raise exception' do - expect { service.execute(current_user, '', '') }. - to raise_error(NoMethodError) - end - end - - context "forking" do - let(:ci_origin_project) do - FactoryGirl.create(:ci_project, shared_runners_enabled: true, public: true, allow_git_fetch: true) - end - - subject { service.execute(current_user, project, ci_origin_project) } - - it "uses project as a template for settings and jobs" do - expect(subject.shared_runners_enabled).to be_truthy - expect(subject.public).to be_truthy - expect(subject.allow_git_fetch).to be_truthy - end - end - end -end diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index 18ab333c1d1..a850aa7cbde 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -48,7 +48,7 @@ describe Projects::ForkService do @from_project.build_missing_services @from_project.gitlab_ci_service.update_attributes(active: true) - expect_any_instance_of(Ci::CreateProjectService).to receive(:execute) + expect_any_instance_of(Project).to receive(:enable_ci) fork_project(@from_project, @to_user) end |
