Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

2 files changed, 0 insertions, 22 deletions

diff --git a/spec/frontend/integrations/edit/components/integration_form_spec.js b/spec/frontend/integrations/edit/components/integration_form_spec.js
index df855674804..c015fd0b9e0 100644
--- a/spec/frontend/integrations/edit/components/integration_form_spec.js
+++ b/spec/frontend/integrations/edit/components/integration_form_spec.js
@@ -207,27 +207,6 @@ describe('IntegrationForm', () => {
 
         expect(findJiraTriggerFields().exists()).toBe(true);
       });
-
-      describe('featureFlag jiraIssuesIntegration is false', () => {
-        it('does not render JiraIssuesFields', () => {
-          createComponent({
-            customStateProps: { type: 'jira' },
-            featureFlags: { jiraIssuesIntegration: false },
-          });
-
-          expect(findJiraIssuesFields().exists()).toBe(false);
-        });
-      });
-
-      describe('featureFlag jiraIssuesIntegration is true', () => {
-        it('renders JiraIssuesFields', () => {
-          createComponent({
-            customStateProps: { type: 'jira' },
-            featureFlags: { jiraIssuesIntegration: true },
-          });
-          expect(findJiraIssuesFields().exists()).toBe(true);
-        });
-      });
     });
 
     describe('triggerEvents is present', () => {
diff --git a/spec/frontend/integrations/integration_settings_form_spec.js b/spec/frontend/integrations/integration_settings_form_spec.js
index 348b942703f..cbb2ef380ba 100644
--- a/spec/frontend/integrations/integration_settings_form_spec.js
+++ b/spec/frontend/integrations/integration_settings_form_spec.js
@@ -7,7 +7,6 @@ jest.mock('~/vue_shared/plugins/global_toast');
 
 describe('IntegrationSettingsForm', () => {
   const FIXTURE = 'services/edit_service.html';
-  preloadFixtures(FIXTURE);
 
   beforeEach(() => {
     loadFixtures(FIXTURE);