Commit 70a62f99 authored by Dmitriy Zaporozhets (DZ)'s avatar Dmitriy Zaporozhets (DZ)

Merge branch 'speed-up-lint-spec' into 'master'

Use a single repository project and clean up files directly

See merge request gitlab-org/gitlab!68013
parents 0f757067 454801b4
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'spec_helper' require 'spec_helper'
RSpec.describe Gitlab::Ci::Lint do RSpec.describe Gitlab::Ci::Lint do
let(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:lint) { described_class.new(project: project, current_user: user) } let(:lint) { described_class.new(project: project, current_user: user) }
...@@ -89,6 +89,15 @@ RSpec.describe Gitlab::Ci::Lint do ...@@ -89,6 +89,15 @@ RSpec.describe Gitlab::Ci::Lint do
) )
end end
after do
project.repository.delete_file(
project.creator,
'another-gitlab-ci.yml',
message: 'Remove another-gitlab-ci.yml',
branch_name: 'master'
)
end
it 'sets merged_config' do it 'sets merged_config' do
root_config = YAML.safe_load(content, [Symbol]) root_config = YAML.safe_load(content, [Symbol])
included_config = YAML.safe_load(included_content, [Symbol]) included_config = YAML.safe_load(included_content, [Symbol])
......
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