Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 9 insertions, 8 deletions

diff --git a/spec/frontend/environments/folder/environments_folder_view_spec.js b/spec/frontend/environments/folder/environments_folder_view_spec.js
index f33c8de0094..f55cb851dde 100644
--- a/spec/frontend/environments/folder/environments_folder_view_spec.js
+++ b/spec/frontend/environments/folder/environments_folder_view_spec.js
@@ -1,10 +1,10 @@
+import { GlPagination } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import { removeBreakLine, removeWhitespace } from 'helpers/text_helper';
-import { GlPagination } from '@gitlab/ui';
-import axios from '~/lib/utils/axios_utils';
-import EnvironmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue';
 import EnvironmentTable from '~/environments/components/environments_table.vue';
+import EnvironmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue';
+import axios from '~/lib/utils/axios_utils';
 import { environmentsList } from '../mock_data';
 
 describe('Environments Folder View', () => {
@@ -46,9 +46,10 @@ describe('Environments Folder View', () => {
     wrapper = mount(EnvironmentsFolderViewComponent, { propsData: mockData });
   };
 
-  const findEnvironmentsTabAvailable = () => wrapper.find('.js-environments-tab-available');
+  const findEnvironmentsTabAvailable = () =>
+    wrapper.find('[data-testid="environments-tab-available"]');
 
-  const findEnvironmentsTabStopped = () => wrapper.find('.js-environments-tab-stopped');
+  const findEnvironmentsTabStopped = () => wrapper.find('[data-testid="environments-tab-stopped"]');
 
   beforeEach(() => {
     mock = new MockAdapter(axios);
@@ -88,9 +89,9 @@ describe('Environments Folder View', () => {
     });
 
     it('should render parent folder name', () => {
-      expect(removeBreakLine(removeWhitespace(wrapper.find('.js-folder-name').text()))).toContain(
-        'Environments / review',
-      );
+      expect(
+        removeBreakLine(removeWhitespace(wrapper.find('[data-testid="folder-name"]').text())),
+      ).toContain('Environments / review');
     });
 
     describe('pagination', () => {