Skip to content
Snippets Groups Projects
Commit f1607b48 authored by Ramya Authappan's avatar Ramya Authappan
Browse files

Merge branch 'qa-dequarantine-branch-with-unusual-name-spec' into 'master'

Update and dequarantine branch_with_unusual_name E2E

See merge request !116227



Merged-by: default avatarRamya Authappan <rauthappan@gitlab.com>
Approved-by: default avatarRamya Authappan <rauthappan@gitlab.com>
Co-authored-by: default avatara_mcdonald <amcdonald@gitlab.com>
parents a7e3be03 08e952d1
No related branches found
No related tags found
3 merge requests!118700Remove refactor_vulnerability_filters feature flag,!116602Draft: Resolve "Remove the possibility to set redis_slot in known_events",!116227Update and dequarantine branch_with_unusual_name E2E
Pipeline #823027496 passed
......@@ -13,8 +13,8 @@
- @options && @options.each do |key, value|
= hidden_field_tag key, value, id: nil
.dropdown
= dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: ref, ref_type: @ref_type, refs_url: refs_project_path(@project, sort: 'updated_desc'), field_name: field_name, submit_form_on_click: true, visit: true, qa_selector: "branches_dropdown", testid: "branches-select" }, { toggle_class: "js-project-refs-dropdown" }
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging{ class: ("dropdown-menu-right" if local_assigns[:align_right]), data: { qa_selector: "branches_dropdown_content" } }
= dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: ref, ref_type: @ref_type, refs_url: refs_project_path(@project, sort: 'updated_desc'), field_name: field_name, submit_form_on_click: true, visit: true, testid: "branches-select" }, { toggle_class: "js-project-refs-dropdown" }
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown.dropdown-menu-paging{ class: ("dropdown-menu-right" if local_assigns[:align_right]) }
.dropdown-page-one
= dropdown_title _("Switch branch/tag")
= dropdown_filter _("Search branches and tags")
......
......@@ -9,6 +9,7 @@ class Show < Page::Base
include Page::Component::Breadcrumbs
include Page::Project::SubMenus::Settings
include Page::File::Shared::CommitMessage
include ::QA::Page::Component::Dropdown
prepend Mobile::Page::Project::Show if Runtime::Env.mobile_layout?
view 'app/assets/javascripts/repository/components/preview/index.vue' do
......@@ -68,11 +69,6 @@ class Show < Page::Base
element :web_ide_button
end
view 'app/views/shared/_ref_switcher.html.haml' do
element :branches_dropdown
element :branches_dropdown_content
end
view 'app/views/projects/blob/viewers/_loading.html.haml' do
element :spinner_placeholder
end
......@@ -184,11 +180,8 @@ def project_id
end
def switch_to_branch(branch_name)
find_element(:branches_dropdown).click
within_element(:branches_dropdown_content) do
click_on branch_name
end
expand_select_list
select_item(branch_name)
end
def wait_for_import
......
......@@ -2,10 +2,7 @@
module QA
RSpec.describe 'Create' do
describe 'Branch with unusual name', product_group: :source_code, quarantine: {
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/364565',
type: :bug
} do
describe 'Branch with unusual name', product_group: :source_code do
let(:branch_name) { 'unUsually/named#br--anch' }
let(:project) do
Resource::Project.fabricate_via_api! do |resource|
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment