Commit d3205773 authored by Tomislav Nikic's avatar Tomislav Nikic

Removing the fix from before

Shifting to browser ui creation until issue is resolved.
This does not break any other tests.
parent a0d10fed
...@@ -382,7 +382,11 @@ export default { ...@@ -382,7 +382,11 @@ export default {
:data-testid="`radio-${value}`" :data-testid="`radio-${value}`"
> >
<div> <div>
<gl-icon :name="icon" /> <gl-icon
data-qa-selector="fork_privacy_button"
:name="icon"
:data-qa-privacy-level="`${value}`"
/>
<span>{{ text }}</span> <span>{{ text }}</span>
</div> </div>
<template #help>{{ help }}</template> <template #help>{{ help }}</template>
......
...@@ -12,6 +12,7 @@ module QA ...@@ -12,6 +12,7 @@ module QA
view 'app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue' do view 'app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue' do
element :fork_namespace_dropdown element :fork_namespace_dropdown
element :fork_project_button element :fork_project_button
element :fork_privacy_button
end end
def fork_project(namespace = Runtime::Namespace.path) def fork_project(namespace = Runtime::Namespace.path)
...@@ -19,6 +20,7 @@ module QA ...@@ -19,6 +20,7 @@ module QA
click_element(:fork_namespace_button, name: namespace) click_element(:fork_namespace_button, name: namespace)
else else
select_element(:fork_namespace_dropdown, namespace) select_element(:fork_namespace_dropdown, namespace)
click_element(:fork_privacy_button, privacy_level: 'public')
click_element(:fork_project_button) click_element(:fork_project_button)
end end
end end
......
...@@ -37,11 +37,7 @@ module QA ...@@ -37,11 +37,7 @@ module QA
namespace_path ||= user.name namespace_path ||= user.name
# Sign out as admin and sign is as the fork user # Sign out as admin and sign is as the fork user
Page::Main::Menu.perform(&:sign_out) Flow::Login.sign_in(as: user)
Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.perform do |login|
login.sign_in_using_credentials(user: user)
end
upstream.visit! upstream.visit!
...@@ -61,9 +57,6 @@ module QA ...@@ -61,9 +57,6 @@ module QA
def fabricate_via_api! def fabricate_via_api!
populate(:upstream, :user) populate(:upstream, :user)
# Remove after Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/343396
Flow::Login.sign_in(as: user) if Specs::Helpers::ContextSelector.dot_com?
@api_client = Runtime::API::Client.new(:gitlab, is_new_session: false, user: user) @api_client = Runtime::API::Client.new(:gitlab, is_new_session: false, user: user)
Runtime::Logger.debug("Forking project #{upstream.name} to namespace #{user.username}...") Runtime::Logger.debug("Forking project #{upstream.name} to namespace #{user.username}...")
...@@ -71,9 +64,6 @@ module QA ...@@ -71,9 +64,6 @@ module QA
wait_until_forked wait_until_forked
populate(:project) populate(:project)
# Remove after Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/343396
Flow::Login.sign_in if Specs::Helpers::ContextSelector.dot_com?
end end
def remove_via_api! def remove_via_api!
......
...@@ -6,7 +6,7 @@ module QA ...@@ -6,7 +6,7 @@ module QA
attr_accessor :fork_branch attr_accessor :fork_branch
attribute :fork do attribute :fork do
Fork.fabricate_via_api! Fork.fabricate_via_browser_ui!
end end
attribute :push do attribute :push do
......
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