Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 19 deletions

diff --git a/spec/frontend/sidebar/components/lock/issuable_lock_form_spec.js b/spec/frontend/sidebar/components/lock/issuable_lock_form_spec.js
index 5e766e9a41c..d26ef7298ce 100644
--- a/spec/frontend/sidebar/components/lock/issuable_lock_form_spec.js
+++ b/spec/frontend/sidebar/components/lock/issuable_lock_form_spec.js
@@ -29,7 +29,6 @@ describe('IssuableLockForm', () => {
   const findEditForm = () => wrapper.findComponent(EditForm);
   const findSidebarLockStatusTooltip = () =>
     getBinding(findSidebarCollapseIcon().element, 'gl-tooltip');
-  const findIssuableLockClickable = () => wrapper.find('[data-testid="issuable-lock"]');
 
   const initStore = (isLocked) => {
     if (issuableType === ISSUABLE_TYPE_ISSUE) {
@@ -49,7 +48,7 @@ describe('IssuableLockForm', () => {
     store.getters.getNoteableData.discussion_locked = isLocked;
   };
 
-  const createComponent = ({ props = {}, movedMrSidebar = false }) => {
+  const createComponent = ({ props = {} }, movedMrSidebar = false) => {
     wrapper = shallowMount(IssuableLockForm, {
       store,
       provide: {
@@ -170,27 +169,11 @@ describe('IssuableLockForm', () => {
     `('displays $message when merge request is $locked', async ({ locked, message }) => {
       initStore(locked);
 
-      createComponent({ movedMrSidebar: true });
+      createComponent({}, true);
 
       await wrapper.find('.dropdown-item').trigger('click');
 
       expect(toast).toHaveBeenCalledWith(message);
     });
   });
-
-  describe('moved_mr_sidebar flag', () => {
-    describe('when the flag is off', () => {
-      it('does not show the non editable lock status', () => {
-        createComponent({ movedMrSidebar: false });
-        expect(findIssuableLockClickable().exists()).toBe(false);
-      });
-    });
-
-    describe('when the flag is on', () => {
-      it('does not show the non editable lock status', () => {
-        createComponent({ movedMrSidebar: true });
-        expect(findIssuableLockClickable().exists()).toBe(true);
-      });
-    });
-  });
 });