Commit 182653a0 authored by Rémy Coutable's avatar Rémy Coutable

Move EE-specific spec files that were not under spec/ee

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 1f32cbbf
...@@ -6,7 +6,7 @@ describe EE::Gitlab::Ci::Config do ...@@ -6,7 +6,7 @@ describe EE::Gitlab::Ci::Config do
let(:gitlab_ci_yml) do let(:gitlab_ci_yml) do
<<~HEREDOC <<~HEREDOC
include: include:
- /spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml - /ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml
- #{remote_location} - #{remote_location}
image: ruby:2.2 image: ruby:2.2
...@@ -38,7 +38,7 @@ describe EE::Gitlab::Ci::Config do ...@@ -38,7 +38,7 @@ describe EE::Gitlab::Ci::Config do
POSTGRES_DB: $CI_ENVIRONMENT_SLUG POSTGRES_DB: $CI_ENVIRONMENT_SLUG
HEREDOC HEREDOC
end end
let(:local_file_content) { File.read("#{Rails.root}/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml") } let(:local_file_content) { File.read(Rails.root.join('ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml')) }
before do before do
allow(project).to receive(:feature_available?).with(:external_files_in_gitlab_ci).and_return(true) allow(project).to receive(:feature_available?).with(:external_files_in_gitlab_ci).and_return(true)
......
...@@ -107,7 +107,7 @@ describe Gitlab::Ci::External::Processor do ...@@ -107,7 +107,7 @@ describe Gitlab::Ci::External::Processor do
let(:remote_file) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' } let(:remote_file) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' }
let(:external_files) do let(:external_files) do
[ [
'/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml', '/ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml',
remote_file remote_file
] ]
end end
...@@ -128,7 +128,7 @@ describe Gitlab::Ci::External::Processor do ...@@ -128,7 +128,7 @@ describe Gitlab::Ci::External::Processor do
end end
before do before do
local_file_content = File.read("#{Rails.root}/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml") local_file_content = File.read(Rails.root.join('ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'))
allow_any_instance_of(Gitlab::Ci::External::File::Local).to receive(:fetch_local_content).and_return(local_file_content) allow_any_instance_of(Gitlab::Ci::External::File::Local).to receive(:fetch_local_content).and_return(local_file_content)
WebMock.stub_request(:get, remote_file).to_return(body: remote_file_content) WebMock.stub_request(:get, remote_file).to_return(body: remote_file_content)
end end
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment