Commit e1529f92 authored by Matija Čupić's avatar Matija Čupić

Fix references to ee .gitlab-ci.yml spec fixtures

parent 53df44d1
...@@ -128,7 +128,7 @@ describe Gitlab::Ci::Config do ...@@ -128,7 +128,7 @@ describe Gitlab::Ci::Config do
context "when using 'include' directive" do context "when using 'include' directive" do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' } let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' }
let(:local_location) { 'ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' } let(:local_location) { 'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' }
let(:remote_file_content) do let(:remote_file_content) do
<<~HEREDOC <<~HEREDOC
...@@ -361,7 +361,7 @@ describe Gitlab::Ci::Config do ...@@ -361,7 +361,7 @@ describe Gitlab::Ci::Config do
context "when using 'include' directive" do context "when using 'include' directive" do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' } let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' }
let(:local_location) { 'ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' } let(:local_location) { 'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' }
let(:remote_file_content) do let(:remote_file_content) do
<<~HEREDOC <<~HEREDOC
...@@ -594,7 +594,7 @@ describe Gitlab::Ci::Config do ...@@ -594,7 +594,7 @@ describe Gitlab::Ci::Config do
context "when using 'include' directive" do context "when using 'include' directive" do
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' } let(:remote_location) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' }
let(:local_location) { 'ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' } let(:local_location) { 'spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml' }
let(:remote_file_content) do let(:remote_file_content) do
<<~HEREDOC <<~HEREDOC
......
...@@ -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
[ [
'/ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml', '/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.join('ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml')) local_file_content = File.read(Rails.root.join('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
......
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