Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 5 deletions

diff --git a/spec/frontend/environments/environment_delete_spec.js b/spec/frontend/environments/environment_delete_spec.js
index b4ecb24cbac..a8c288a3bd8 100644
--- a/spec/frontend/environments/environment_delete_spec.js
+++ b/spec/frontend/environments/environment_delete_spec.js
@@ -1,11 +1,9 @@
-import $ from 'jquery';
+import { GlButton } from '@gitlab/ui';
+
 import { shallowMount } from '@vue/test-utils';
 import DeleteComponent from '~/environments/components/environment_delete.vue';
-import LoadingButton from '~/vue_shared/components/loading_button.vue';
 import eventHub from '~/environments/event_hub';
 
-$.fn.tooltip = () => {};
-
 describe('External URL Component', () => {
   let wrapper;
 
@@ -17,7 +15,7 @@ describe('External URL Component', () => {
     });
   };
 
-  const findButton = () => wrapper.find(LoadingButton);
+  const findButton = () => wrapper.find(GlButton);
 
   beforeEach(() => {
     jest.spyOn(window, 'confirm');