2 files changed, 20 insertions, 22 deletions
diff --git a/spec/lib/gitlab/ci/config/external/file/local_spec.rb b/spec/lib/gitlab/ci/config/external/file/local_spec.rb
index f5b36ebfa45..a77acb45978 100644
--- a/spec/lib/gitlab/ci/config/external/file/local_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/file/local_spec.rb
@@ -2,11 +2,13 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Ci::Config::External::File::Local do
+RSpec.describe Gitlab::Ci::Config::External::File::Local, feature_category: :pipeline_authoring do
+  include RepoHelpers
+
   let_it_be(:project) { create(:project, :repository) }
   let_it_be(:user) { create(:user) }
 
-  let(:sha) { '12345' }
+  let(:sha) { project.commit.sha }
   let(:variables) { project.predefined_variables.to_runner_variables }
   let(:context) { Gitlab::Ci::Config::External::Context.new(**context_params) }
   let(:params) { { local: location } }
@@ -172,14 +174,17 @@ RSpec.describe Gitlab::Ci::Config::External::File::Local do
       let(:another_location) { 'another-config.yml' }
       let(:another_content) { 'rspec: JOB' }
 
-      before do
-        allow(project.repository).to receive(:blob_data_at).with(sha, location)
-          .and_return(content)
-
-        allow(project.repository).to receive(:blob_data_at).with(sha, another_location)
-          .and_return(another_content)
+      let(:project_files) do
+        {
+          location => content,
+          another_location => another_content
+        }
+      end
 
-        local_file.validate!
+      around(:all) do |example|
+        create_and_delete_files(project, project_files) do
+          example.run
+        end
       end
 
       it 'does expand hash to include the template' do
@@ -196,11 +201,11 @@ RSpec.describe Gitlab::Ci::Config::External::File::Local do
     it {
       is_expected.to eq(
         context_project: project.full_path,
-        context_sha: '12345',
+        context_sha: sha,
         type: :local,
-        location: location,
-        blob: "http://localhost/#{project.full_path}/-/blob/12345/lib/gitlab/ci/templates/existent-file.yml",
-        raw: "http://localhost/#{project.full_path}/-/raw/12345/lib/gitlab/ci/templates/existent-file.yml",
+        location: '/lib/gitlab/ci/templates/existent-file.yml',
+        blob: "http://localhost/#{project.full_path}/-/blob/#{sha}/lib/gitlab/ci/templates/existent-file.yml",
+        raw: "http://localhost/#{project.full_path}/-/raw/#{sha}/lib/gitlab/ci/templates/existent-file.yml",
         extra: {}
       )
     }
diff --git a/spec/lib/gitlab/ci/config/external/mapper_spec.rb b/spec/lib/gitlab/ci/config/external/mapper_spec.rb
index b7e58d4dfa1..9d0e57d4292 100644
--- a/spec/lib/gitlab/ci/config/external/mapper_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/mapper_spec.rb
@@ -2,7 +2,8 @@
 
 require 'spec_helper'
 
-# This will be removed with FF ci_refactoring_external_mapper and moved to below.
+# This will be use with the FF ci_refactoring_external_mapper_verifier in the next MR.
+# It can be removed when the FF is removed.
 RSpec.shared_context 'gitlab_ci_config_external_mapper' do
   include StubRequests
   include RepoHelpers
@@ -466,12 +467,4 @@ end
 
 RSpec.describe Gitlab::Ci::Config::External::Mapper, feature_category: :pipeline_authoring do
   it_behaves_like 'gitlab_ci_config_external_mapper'
-
-  context 'when the FF ci_refactoring_external_mapper is disabled' do
-    before do
-      stub_feature_flags(ci_refactoring_external_mapper: false)
-    end
-
-    it_behaves_like 'gitlab_ci_config_external_mapper'
-  end
 end