From 5b2c873cfdf8d1add7e147c5a72f8a1d0f99f775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Sat, 8 Sep 2018 21:43:42 +0200 Subject: [PATCH] Fix references to ee .gitlab-ci.yml spec fixtures --- spec/lib/gitlab/ci/config_spec.rb | 2 +- spec/lib/gitlab/ci/external/processor_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/lib/gitlab/ci/config_spec.rb b/spec/lib/gitlab/ci/config_spec.rb index baa4793e677..b43aca8a354 100644 --- a/spec/lib/gitlab/ci/config_spec.rb +++ b/spec/lib/gitlab/ci/config_spec.rb @@ -128,7 +128,7 @@ describe Gitlab::Ci::Config do context "when using 'include' directive" do let(:project) { create(:project, :repository) } 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 <<~HEREDOC diff --git a/spec/lib/gitlab/ci/external/processor_spec.rb b/spec/lib/gitlab/ci/external/processor_spec.rb index fc9a0748075..bf355ddb21d 100644 --- a/spec/lib/gitlab/ci/external/processor_spec.rb +++ b/spec/lib/gitlab/ci/external/processor_spec.rb @@ -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(: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 ] end @@ -128,7 +128,7 @@ describe Gitlab::Ci::External::Processor do end 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) WebMock.stub_request(:get, remote_file).to_return(body: remote_file_content) end