Commit 3590e3af authored by Sanad Liaquat's avatar Sanad Liaquat

Fix group project template e2e test

parent fe412eaf
......@@ -24,7 +24,9 @@ module QA
end
def wait_for_import_success
has_text?('The project was successfully imported.', wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME)
wait_until(max_duration: 120, sleep_interval: 1) do
has_text?('The project was successfully imported.')
end
end
end
end
......
......@@ -24,6 +24,12 @@ module QA
end
end
def click_settings
within_sidebar do
click_element(:group_settings_item)
end
end
def click_contribution_analytics_item
hover_element(:analytics_link) do
within_submenu(:analytics_sidebar_submenu) do
......
......@@ -6,14 +6,14 @@ module QA
describe 'Project templates' do
before(:all) do
@files = [
{
name: 'file.txt',
content: 'foo'
},
{
name: 'README.md',
content: 'bar'
}
{
name: 'file.txt',
content: 'foo'
},
{
name: 'README.md',
content: 'bar'
}
]
@template_container_group_name = "instance-template-container-group-#{SecureRandom.hex(8)}"
......@@ -54,8 +54,8 @@ module QA
end
create_project_using_template(project_name: 'Project using built-in project template',
namespace: Runtime::Namespace.name,
template_name: built_in)
namespace: Runtime::Namespace.name,
template_name: built_in)
Page::Project::Show.perform(&:wait_for_import_success)
......@@ -96,8 +96,8 @@ module QA
end
create_project_using_template(project_name: 'Project using instance level project template',
namespace: Runtime::Namespace.path,
template_name: @template_project.name)
namespace: Runtime::Namespace.path,
template_name: @template_project.name)
Page::Project::Show.perform(&:wait_for_import_success)
@files.each do |file|
......@@ -106,19 +106,20 @@ module QA
end
end
context 'group level', quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/issues/198690', type: :flaky } do
context 'group level' do
before do
Flow::Login.sign_in
Page::Main::Menu.perform(&:go_to_groups)
Page::Dashboard::Groups.perform { |groups| groups.click_group(Runtime::Namespace.sandbox_name) }
Page::Project::Menu.perform(&:click_settings)
Page::Group::Menu.perform(&:click_settings)
Page::Group::Settings::General.perform do |settings|
settings.choose_custom_project_template("#{@template_container_group_name}")
end
Page::Project::Menu.perform(&:click_settings)
Page::Group::Menu.perform(&:click_settings)
Page::Group::Settings::General.perform do |settings|
expect(settings.current_custom_project_template).to include @template_container_group_name
......@@ -140,8 +141,8 @@ module QA
end
create_project_using_template(project_name: 'Project using group level project template',
namespace: Runtime::Namespace.sandbox_name,
template_name: @template_project.name)
namespace: Runtime::Namespace.sandbox_name,
template_name: @template_project.name)
Page::Project::Show.perform(&:wait_for_import_success)
@files.each do |file|
......
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