Commit fff54f93 authored by Dan Davison's avatar Dan Davison

Merge branch 'ml-qa-log-out-after-group-template-test' into 'master'

Log out after the group template test

Closes #34736

See merge request gitlab-org/gitlab!19050
parents e925ee07 49363d90
...@@ -9,25 +9,25 @@ module QA ...@@ -9,25 +9,25 @@ module QA
{ {
type: 'Dockerfile', type: 'Dockerfile',
template: 'custom_dockerfile', template: 'custom_dockerfile',
name: 'Dockerfile/custom_dockerfile.dockerfile', file_path: 'Dockerfile/custom_dockerfile.dockerfile',
content: 'dockerfile template test' content: 'dockerfile template test'
}, },
{ {
type: '.gitignore', type: '.gitignore',
template: 'custom_gitignore', template: 'custom_gitignore',
name: 'gitignore/custom_gitignore.gitignore', file_path: 'gitignore/custom_gitignore.gitignore',
content: 'gitignore template test' content: 'gitignore template test'
}, },
{ {
type: '.gitlab-ci.yml', type: '.gitlab-ci.yml',
template: 'custom_gitlab-ci', template: 'custom_gitlab-ci',
name: 'gitlab-ci/custom_gitlab-ci.yml', file_path: 'gitlab-ci/custom_gitlab-ci.yml',
content: 'gitlab-ci template test' content: 'gitlab-ci template test'
}, },
{ {
type: 'LICENSE', type: 'LICENSE',
template: 'custom_license', template: 'custom_license',
name: 'LICENSE/custom_license.txt', file_path: 'LICENSE/custom_license.txt',
content: 'license template test' content: 'license template test'
} }
] ]
...@@ -46,13 +46,10 @@ module QA ...@@ -46,13 +46,10 @@ module QA
project.initialize_with_readme = true project.initialize_with_readme = true
end end
templates.each do |template| Resource::Repository::Commit.fabricate_via_api! do |commit|
Resource::File.fabricate_via_api! do |file| commit.project = @file_template_project
file.project = @file_template_project commit.commit_message = 'Add CODEOWNERS and test files'
file.name = template[:name] commit.add_files(templates)
file.content = template[:content]
file.commit_message = 'Add test file templates'
end
end end
@project = Resource::Project.fabricate_via_api! do |project| @project = Resource::Project.fabricate_via_api! do |project|
...@@ -66,9 +63,11 @@ module QA ...@@ -66,9 +63,11 @@ module QA
end end
after(:all) do after(:all) do
login unless Page::Main::Menu.perform { |p| p.has_personal_area?(wait: 0) } login unless Page::Main::Menu.perform(&:signed_in?)
remove_group_file_template_if_set remove_group_file_template_if_set
Page::Main::Menu.perform(&:sign_out)
end end
templates.each do |template| templates.each do |template|
......
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