Fix login tests

hashicorp · Nov 6, 2023 · c0d5bd7 · c0d5bd7
1 parent ee0c342
commit c0d5bd7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs b/ui/packages/consul-acls/app/components/consul/token/selector/index.hbs
@@ -57,7 +57,7 @@
 
     <Hds::Dropdown class="hds-side-nav__dropdown" @listPosition="left" as |dd|>
 
-      <dd.ToggleIcon @icon="user" @text="Account menu" />
+      <dd.ToggleIcon @icon="user" @text="Auth menu" data-test-auth-menu />
       <dd.Interactive
         @href={{href-to
           "settings"
@@ -68,6 +68,7 @@
       />
       <dd.Interactive
         @text="Sign in"
+        data-test-auth-menu-signin
         {{on "click" (optional this.modal.open)}}
       />
     </Hds::Dropdown>
@@ -108,7 +109,7 @@
     </ModalDialog>
 
     <Hds::Dropdown class="hds-side-nav__dropdown" @listPosition="left" as |dd|>
-      <dd.ToggleIcon @icon="user" @text="Account menu" />
+      <dd.ToggleIcon @icon="user" @text="Auth menu" data-test-auth-menu />
       {{#if authDialog.token.AccessorID}}
         <dd.Title @text="Signed in with ACL Token" />
         <dd.Description
@@ -129,6 +130,7 @@
       />
       <dd.Interactive
         @text="Sign out"
+        data-test-auth-menu-signout
         {{on "click" (optional authDialog.logout)}}
       />
     </Hds::Dropdown>

diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs b/ui/packages/consul-ui/app/components/hashicorp-consul/index.hbs
@@ -73,7 +73,7 @@
   </:notifications>
 
   <:side-nav>
-    <Hds::SideNav @isResponsive={{true}} @isCollapsible={{true}} class='consul-side-nav'>
+    <Hds::SideNav @isResponsive={{true}} @isCollapsible={{true}} class='consul-side-nav' data-test-navigation>
       <:header>
         <Hds::SideNav::Header>
           <:logo>

diff --git a/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js b/ui/packages/consul-ui/app/components/hashicorp-consul/pageobject.js
@@ -42,7 +42,8 @@ export default (collection, clickable, attribute, is, authForm, emptyState) => (
       status: attribute('data-test-status', '[data-test-status]'),
     },
   };
-  page.navigation.login = clickable('[data-test-main-nav-auth] button');
+  page.navigation.authMenu = clickable('[data-test-auth-menu]');
+  page.navigation.login = clickable('[data-test-auth-menu-signin]');
   page.navigation.dc = clickable('[data-test-datacenter-menu] button');
   page.navigation.nspace = clickable('[data-test-nspace-menu] button');
   page.navigation.manageNspaces = clickable('[data-test-main-nav-nspaces] a');

diff --git a/ui/packages/consul-ui/tests/acceptance/login.feature b/ui/packages/consul-ui/tests/acceptance/login.feature
@@ -8,6 +8,8 @@ Feature: login
     dc: dc-1
     ---
     Then the url should be /dc-1/acls/tokens
+    And I click ".hds-side-nav__toggle-button"
+    And I click authMenu on the navigation
     And I click login on the navigation
     And I fill in the auth form with yaml
     ---
@@ -39,6 +41,8 @@ Feature: login
     state: state-123456789/abcdefghijklmnopqrstuvwxyz
     code: code-abcdefghijklmnopqrstuvwxyz/123456789
     ---
+    And I click ".hds-side-nav__toggle-button"
+    And I click authMenu on the navigation
     And I click login on the navigation
     And I click "[data-test-tab=tab_sso] button"
     Then the "[name='partition']" input should have the value "default"