From e701659ba316541833e50d68f14720d17be58f8c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 3 Dec 2020 21:09:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../alerts_settings/alerts_settings_form_spec.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'spec/frontend/alerts_settings') diff --git a/spec/frontend/alerts_settings/alerts_settings_form_spec.js b/spec/frontend/alerts_settings/alerts_settings_form_spec.js index dd7d32c5e75..428c6f93444 100644 --- a/spec/frontend/alerts_settings/alerts_settings_form_spec.js +++ b/spec/frontend/alerts_settings/alerts_settings_form_spec.js @@ -93,16 +93,28 @@ describe('AlertsSettingsFormNew', () => { ).toBe(true); }); - it('disabled the dropdown and shows help text when multi integrations are not supported', async () => { + it('disables the dropdown and shows help text when multi integrations are not supported', async () => { createComponent({ props: { canAddIntegration: false } }); expect(findSelect().attributes('disabled')).toBe('disabled'); expect(findMultiSupportText().exists()).toBe(true); }); + + it('disabled the name input when the selected value is prometheus', async () => { + createComponent(); + const options = findSelect().findAll('option'); + await options.at(2).setSelected(); + + expect( + findFormFields() + .at(0) + .attributes('disabled'), + ).toBe('disabled'); + }); }); describe('submitting integration form', () => { it('allows for create-new-integration with the correct form values for HTTP', async () => { - createComponent({}); + createComponent(); const options = findSelect().findAll('option'); await options.at(1).setSelected(); @@ -128,7 +140,7 @@ describe('AlertsSettingsFormNew', () => { }); it('allows for create-new-integration with the correct form values for PROMETHEUS', async () => { - createComponent({}); + createComponent(); const options = findSelect().findAll('option'); await options.at(2).setSelected(); -- cgit v1.2.3