Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 10 deletions

diff --git a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
index b1d9c854bb7..8c6b3cc464c 100644
--- a/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
+++ b/spec/frontend/vue_merge_request_widget/components/approvals/approvals_summary_spec.js
@@ -17,7 +17,6 @@ import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list
 Vue.use(VueApollo);
 
 describe('MRWidget approvals summary', () => {
-  const originalUserId = gon.current_user_id;
   let wrapper;
 
   const createComponent = (data = approvedByCurrentUser) => {
@@ -30,10 +29,6 @@ describe('MRWidget approvals summary', () => {
 
   const findAvatars = () => wrapper.findComponent(UserAvatarList);
 
-  afterEach(() => {
-    gon.current_user_id = originalUserId;
-  });
-
   describe('when approved', () => {
     beforeEach(async () => {
       createComponent();
diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
index 43ce9b77cd3..fad501ee7f5 100644
--- a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
+++ b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js
@@ -91,7 +91,6 @@ describe('MrWidgetOptions', () => {
     // eslint-disable-next-line @gitlab/vtu-no-explicit-wrapper-destroy
     wrapper.destroy();
     gl.mrWidgetData = {};
-    gon.features = {};
   });
 
   const createComponent = (mrData = mockData, options = {}, data = {}, fullMount = true) => {
@@ -1266,10 +1265,6 @@ describe('MrWidgetOptions', () => {
     });
 
     describe('widget container', () => {
-      afterEach(() => {
-        delete window.gon.features.refactorSecurityExtension;
-      });
-
       it('should not be displayed when the refactor_security_extension feature flag is turned off', () => {
         createComponent();
         expect(findWidgetContainer().exists()).toBe(false);