Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 8 deletions

diff --git a/spec/frontend/access_tokens/components/access_token_table_app_spec.js b/spec/frontend/access_tokens/components/access_token_table_app_spec.js
index aa7aad8e93e..dd3fc3a9d98 100644
--- a/spec/frontend/access_tokens/components/access_token_table_app_spec.js
+++ b/spec/frontend/access_tokens/components/access_token_table_app_spec.js
@@ -25,7 +25,7 @@ describe('~/access_tokens/components/access_token_table_app', () => {
       expires_soon: true,
       expires_at: null,
       revoked: false,
-      revoke_path: '/-/profile/personal_access_tokens/1/revoke',
+      revoke_path: '/-/user_settings/personal_access_tokens/1/revoke',
       role: 'Maintainer',
     },
     {
@@ -37,7 +37,7 @@ describe('~/access_tokens/components/access_token_table_app', () => {
       expires_soon: false,
       expires_at: new Date().toISOString(),
       revoked: false,
-      revoke_path: '/-/profile/personal_access_tokens/2/revoke',
+      revoke_path: '/-/user_settings/personal_access_tokens/2/revoke',
       role: 'Maintainer',
     },
   ];
@@ -154,7 +154,7 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     expect(button.attributes()).toMatchObject({
       'aria-label': __('Revoke'),
       'data-testid': 'revoke-button',
-      href: '/-/profile/personal_access_tokens/1/revoke',
+      href: '/-/user_settings/personal_access_tokens/1/revoke',
       'data-confirm': sprintf(
         __(
           'Are you sure you want to revoke the %{accessTokenType} "%{tokenName}"? This action cannot be undone.',
@@ -172,7 +172,7 @@ describe('~/access_tokens/components/access_token_table_app', () => {
     expect(cells.at(11).text()).toBe(__('Expired'));
     expect(cells.at(12).text()).toBe('Maintainer');
     button = cells.at(13).findComponent(GlButton);
-    expect(button.attributes('href')).toBe('/-/profile/personal_access_tokens/2/revoke');
+    expect(button.attributes('href')).toBe('/-/user_settings/personal_access_tokens/2/revoke');
     expect(button.props('category')).toBe('tertiary');
   });
 
diff --git a/spec/frontend/comment_templates/components/__snapshots__/list_item_spec.js.snap b/spec/frontend/comment_templates/components/__snapshots__/list_item_spec.js.snap
index 24b2677f497..97b8e1f7fc8 100644
--- a/spec/frontend/comment_templates/components/__snapshots__/list_item_spec.js.snap
+++ b/spec/frontend/comment_templates/components/__snapshots__/list_item_spec.js.snap
@@ -22,7 +22,7 @@ exports[`Comment templates list item component renders list item 1`] = `
         <button
           aria-controls="reference-1"
           aria-labelledby="reference-0"
-          class="btn btn-default btn-default-tertiary btn-md gl-button gl-new-dropdown-icon-only gl-new-dropdown-toggle gl-new-dropdown-toggle-no-caret"
+          class="btn btn-default btn-default-tertiary btn-icon btn-md gl-button gl-new-dropdown-icon-only gl-new-dropdown-toggle gl-new-dropdown-toggle-no-caret"
           data-testid="base-dropdown-toggle"
           id="reference-0"
           type="button"
diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/date_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/date_token_spec.js
index 56a59790210..34d0c7f0566 100644
--- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/date_token_spec.js
+++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/date_token_spec.js
@@ -42,7 +42,7 @@ describe('DateToken', () => {
     findDatepicker().vm.$emit('close');
 
     expect(findGlFilteredSearchToken().emitted()).toEqual({
-      complete: [[]],
+      complete: [['2014-10-13']],
       select: [['2014-10-13']],
     });
   });
diff --git a/spec/frontend/work_items/components/notes/work_item_note_actions_spec.js b/spec/frontend/work_items/components/notes/work_item_note_actions_spec.js
index c820c60fe13..97aed1d548e 100644
--- a/spec/frontend/work_items/components/notes/work_item_note_actions_spec.js
+++ b/spec/frontend/work_items/components/notes/work_item_note_actions_spec.js
@@ -1,4 +1,4 @@
-import { GlButton, GlDisclosureDropdown } from '@gitlab/ui';
+import { GlDisclosureDropdown } from '@gitlab/ui';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
@@ -17,7 +17,7 @@ describe('Work Item Note Actions', () => {
   const showSpy = jest.fn();
 
   const findReplyButton = () => wrapper.findComponent(ReplyButton);
-  const findEditButton = () => wrapper.findComponent(GlButton);
+  const findEditButton = () => wrapper.findByTestId('note-actions-edit');
   const findEmojiButton = () => wrapper.findByTestId('note-emoji-button');
   const findDropdown = () => wrapper.findComponent(GlDisclosureDropdown);
   const findDeleteNoteButton = () => wrapper.findByTestId('delete-note-action');