diff options
Diffstat (limited to 'spec/frontend/access_tokens')
4 files changed, 9 insertions, 26 deletions
diff --git a/spec/frontend/access_tokens/components/access_token_table_app_spec.js b/spec/frontend/access_tokens/components/access_token_table_app_spec.js index 2fa14810578..5236f38dc35 100644 --- a/spec/frontend/access_tokens/components/access_token_table_app_spec.js +++ b/spec/frontend/access_tokens/components/access_token_table_app_spec.js @@ -91,24 +91,6 @@ describe('~/access_tokens/components/access_token_table_app', () => { expect(cells.at(0).text()).toBe(noTokensMessage); }); - it('should show a title indicating the amount of tokens', () => { - createComponent(); - - expect(wrapper.find('h5').text()).toBe( - sprintf(__('Active %{accessTokenTypePlural} (%{totalAccessTokens})'), { - accessTokenTypePlural, - totalAccessTokens: defaultActiveAccessTokens.length, - }), - ); - }); - - it('should render information section', () => { - const info = 'This is my information'; - createComponent({ information: info }); - - expect(wrapper.findByTestId('information-section').text()).toBe(info); - }); - describe('table headers', () => { it('should include `Action` column', () => { createComponent(); diff --git a/spec/frontend/access_tokens/components/new_access_token_app_spec.js b/spec/frontend/access_tokens/components/new_access_token_app_spec.js index fb92cc34ce9..d51ac638f0e 100644 --- a/spec/frontend/access_tokens/components/new_access_token_app_spec.js +++ b/spec/frontend/access_tokens/components/new_access_token_app_spec.js @@ -23,6 +23,8 @@ describe('~/access_tokens/components/new_access_token_app', () => { }; const findButtonEl = () => document.querySelector('[type=submit]'); + const findGlAlertError = () => wrapper.findByTestId('error-message'); + const findGlAlertSuccess = () => wrapper.findByTestId('success-message'); const triggerSuccess = async (newToken = 'new token') => { wrapper @@ -57,7 +59,7 @@ describe('~/access_tokens/components/new_access_token_app', () => { it('should render nothing', () => { expect(wrapper.findComponent(InputCopyToggleVisibility).exists()).toBe(false); - expect(wrapper.findComponent(GlAlert).exists()).toBe(false); + expect(findGlAlertError().exists()).toBe(false); }); describe('on success', () => { @@ -65,10 +67,12 @@ describe('~/access_tokens/components/new_access_token_app', () => { const newToken = '12345'; await triggerSuccess(newToken); - expect(wrapper.findComponent(GlAlert).exists()).toBe(false); + expect(findGlAlertError().exists()).toBe(false); + expect(findGlAlertSuccess().exists()).toBe(true); const InputCopyToggleVisibilityComponent = wrapper.findComponent(InputCopyToggleVisibility); expect(InputCopyToggleVisibilityComponent.props('value')).toBe(newToken); + expect(InputCopyToggleVisibilityComponent.props('readonly')).toBe(true); expect(InputCopyToggleVisibilityComponent.props('copyButtonTitle')).toBe( sprintf(__('Copy %{accessTokenType}'), { accessTokenType }), ); @@ -81,7 +85,7 @@ describe('~/access_tokens/components/new_access_token_app', () => { const newToken = '12345'; await triggerSuccess(newToken); - expect(wrapper.findComponent(GlAlert).exists()).toBe(false); + expect(findGlAlertError().exists()).toBe(false); const inputAttributes = wrapper .findByLabelText(sprintf(__('Your new %{accessTokenType}'), { accessTokenType })) @@ -134,7 +138,7 @@ describe('~/access_tokens/components/new_access_token_app', () => { expect(wrapper.findComponent(InputCopyToggleVisibility).exists()).toBe(false); - let GlAlertComponent = wrapper.findComponent(GlAlert); + let GlAlertComponent = findGlAlertError(); expect(GlAlertComponent.props('title')).toBe(__('The form contains the following errors:')); expect(GlAlertComponent.props('variant')).toBe('danger'); let itemEls = wrapper.findAll('li'); diff --git a/spec/frontend/access_tokens/components/token_spec.js b/spec/frontend/access_tokens/components/token_spec.js index f62f7d72e3b..ad92366c3b6 100644 --- a/spec/frontend/access_tokens/components/token_spec.js +++ b/spec/frontend/access_tokens/components/token_spec.js @@ -50,6 +50,7 @@ describe('Token', () => { formInputGroupProps: { id: defaultPropsData.inputId, }, + readonly: true, value: defaultPropsData.token, copyButtonTitle: defaultPropsData.copyButtonTitle, }); diff --git a/spec/frontend/access_tokens/index_spec.js b/spec/frontend/access_tokens/index_spec.js index c1158e0d124..7d4d73b00b2 100644 --- a/spec/frontend/access_tokens/index_spec.js +++ b/spec/frontend/access_tokens/index_spec.js @@ -50,7 +50,6 @@ describe('access tokens', () => { initialActiveAccessTokens, // Default values - information: undefined, noActiveTokensMessage: sprintf(__('This user has no active %{accessTokenTypePlural}.'), { accessTokenTypePlural, }), @@ -59,14 +58,12 @@ describe('access tokens', () => { }); it('mounts the component and provides all values', () => { - const information = 'Additional information'; const noActiveTokensMessage = 'This group has no active access tokens.'; setHTMLFixture( `<div id="js-access-token-table-app" data-access-token-type="${accessTokenType}" data-access-token-type-plural="${accessTokenTypePlural}" data-initial-active-access-tokens=${JSON.stringify(initialActiveAccessTokens)} - data-information="${information}" data-no-active-tokens-message="${noActiveTokensMessage}" data-show-role > @@ -82,7 +79,6 @@ describe('access tokens', () => { accessTokenType, accessTokenTypePlural, initialActiveAccessTokens, - information, noActiveTokensMessage, showRole: true, }); |