From 62210cf5f54ed86ed8d30ff757dda84cfcc1407d Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Thu, 17 May 2018 16:50:13 -0400
Subject: [PATCH] fix terms spec

---
 app/assets/stylesheets/framework/header.scss | 6 +++---
 app/views/layouts/header/_default.html.haml  | 2 +-
 app/views/layouts/header/_new_dropdown.haml  | 2 +-
 app/views/layouts/terms.html.haml            | 2 +-
 qa/qa/page/menu/main.rb                      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index e70855130c7..2085e5646ef 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -325,8 +325,8 @@
   fill: currentColor;
 }
 
-.header-user .dropdown-menu-nav,
-.header-new .dropdown-menu-nav {
+.header-user .dropdown-menu,
+.header-new .dropdown-menu {
   margin-top: $dropdown-vertical-offset;
 }
 
@@ -515,7 +515,7 @@
 }
 
 .header-user {
-  .dropdown-menu-nav {
+  .dropdown-menu {
     width: auto;
     min-width: 160px;
     margin-top: 4px;
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 86c976118bb..1bca837a311 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -52,7 +52,7 @@
               = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
                 = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
                 = sprite_icon('angle-down', css_class: 'caret-down')
-              .dropdown-menu-nav.dropdown-menu-right
+              .dropdown-menu.dropdown-menu-right
                 = render 'layouts/header/current_user_dropdown'
           - if header_link?(:admin_impersonation)
             %li.nav-item.impersonation
diff --git a/app/views/layouts/header/_new_dropdown.haml b/app/views/layouts/header/_new_dropdown.haml
index c207b413dd6..db8137cc248 100644
--- a/app/views/layouts/header/_new_dropdown.haml
+++ b/app/views/layouts/header/_new_dropdown.haml
@@ -2,7 +2,7 @@
   = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body' } do
     = sprite_icon('plus-square', size: 16)
     = sprite_icon('angle-down', css_class: 'caret-down')
-  .dropdown-menu.dropdown-menu-nav.dropdown-menu-right
+  .dropdown-menu.dropdown-menu-right
     %ul
       - if @group&.persisted?
         - create_group_project = can?(current_user, :create_projects, @group)
diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml
index 2a6927b9962..a8964b19ba1 100644
--- a/app/views/layouts/terms.html.haml
+++ b/app/views/layouts/terms.html.haml
@@ -29,6 +29,6 @@
                         = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
                           = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
                           = sprite_icon('angle-down', css_class: 'caret-down')
-                        .dropdown-menu-nav.dropdown-menu-right
+                        .dropdown-menu.dropdown-menu-right
                           = render 'layouts/header/current_user_dropdown'
               = yield
diff --git a/qa/qa/page/menu/main.rb b/qa/qa/page/menu/main.rb
index d3562effaab..644fedecc90 100644
--- a/qa/qa/page/menu/main.rb
+++ b/qa/qa/page/menu/main.rb
@@ -10,7 +10,7 @@ module QA
         view 'app/views/layouts/header/_default.html.haml' do
           element :navbar
           element :user_avatar
-          element :user_menu, '.dropdown-menu-nav'
+          element :user_menu, '.dropdown-menu'
         end
 
         view 'app/views/layouts/nav/_dashboard.html.haml' do
@@ -70,7 +70,7 @@ module QA
           within_top_menu do
             click_element :user_avatar
 
-            page.within('.dropdown-menu-nav') do
+            page.within('.dropdown-menu') do
               yield
             end
           end