Commit 7196be85 authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'qa-shl-fix-group-file-template-spec' into 'master'

Recreate project if Readme is missing

Closes #220608

See merge request gitlab-org/gitlab!34840
parents b91d3f8e d2700a47
...@@ -96,7 +96,11 @@ module QA ...@@ -96,7 +96,11 @@ module QA
end end
def has_file?(file_path) def has_file?(file_path)
repository_tree.any? { |file| file[:path] == file_path } response = repository_tree
raise ResourceNotFoundError, "#{response[:message]}" if response.is_a?(Hash) && response.has_key?(:message)
response.any? { |file| file[:path] == file_path }
end end
def api_get_path def api_get_path
......
...@@ -52,6 +52,7 @@ module QA ...@@ -52,6 +52,7 @@ module QA
group.api_client = @api_client group.api_client = @api_client
end end
Support::Retrier.retry_until(retry_on_exception: true) do
@file_template_project = Resource::Project.fabricate_via_api! do |project| @file_template_project = Resource::Project.fabricate_via_api! do |project|
project.group = @group project.group = @group
project.name = 'group-file-template-project' project.name = 'group-file-template-project'
...@@ -62,6 +63,9 @@ module QA ...@@ -62,6 +63,9 @@ module QA
project.api_client = @api_client project.api_client = @api_client
end end
@file_template_project.has_file?("README.md")
end
Resource::Repository::Commit.fabricate_via_api! do |commit| Resource::Repository::Commit.fabricate_via_api! do |commit|
commit.project = @file_template_project commit.project = @file_template_project
commit.commit_message = 'Add group file templates' commit.commit_message = 'Add group file templates'
......
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