Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-12-15 03:12:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-12-15 03:12:58 +0300
commit45465a1f217b65ee3b11870175f363afaf912eb9 (patch)
tree0f4103ad51619ed03fc47cc28e32df3fb57b5c0c /qa
parent046498496e140f96beb63ff45ec9b0bb9acdbdd3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/main/menu.rb4
-rw-r--r--qa/qa/page/project/show.rb4
-rw-r--r--qa/qa/page/sub_menus/common.rb8
3 files changed, 4 insertions, 12 deletions
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index a1bb1475a0c..8fd3a8ca52f 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -39,10 +39,6 @@ module QA
element 'menu-item-link'
end
- view 'app/views/layouts/header/_new_dropdown.html.haml' do
- element 'new-menu-toggle'
- end
-
view 'app/helpers/nav/new_dropdown_helper.rb' do
element 'global-new-group-link'
element 'global-new-project-link'
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 6106e582b2f..36c14054188 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -22,10 +22,6 @@ module QA
element 'file-tree-table'
end
- view 'app/views/layouts/header/_new_dropdown.html.haml' do
- element 'new-menu-toggle'
- end
-
view 'app/views/projects/_last_push.html.haml' do
element 'create-merge-request-button'
end
diff --git a/qa/qa/page/sub_menus/common.rb b/qa/qa/page/sub_menus/common.rb
index 5196957c0b3..0457d1f29fc 100644
--- a/qa/qa/page/sub_menus/common.rb
+++ b/qa/qa/page/sub_menus/common.rb
@@ -12,6 +12,10 @@ module QA
element 'super-sidebar'
end
+ view 'app/assets/javascripts/super_sidebar/components/create_menu.vue' do
+ element 'new-menu-toggle'
+ end
+
view 'app/assets/javascripts/super_sidebar/components/menu_section.vue' do
element 'menu-section-button'
element 'menu-section'
@@ -20,10 +24,6 @@ module QA
view 'app/assets/javascripts/super_sidebar/components/nav_item.vue' do
element 'nav-item-link'
end
-
- view 'app/views/layouts/header/_new_dropdown.html.haml' do
- element 'new-menu-toggle'
- end
end
end