DT-1144: Update Support Destination URLs #2768
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| /* eslint-disable no-undef */ | ||
|
|
||
| import React from 'react'; | ||
| import {mount} from 'cypress/react18'; | ||
| import {SupportRequestModal} from '../../../src/components/modals/SupportRequestModal'; | ||
| import {Storage} from '../../../src/libs/storage'; | ||
|
|
||
| const mockUser = { | ||
| displayName: 'Display Name', | ||
| email: '[email protected]' | ||
| }; | ||
|
|
||
| const handler = () => { | ||
| }; | ||
|
|
||
| describe('Support Request Modal Tests', () => { | ||
|
|
||
| beforeEach(() => { | ||
| cy.viewport(500, 500); | ||
| cy.initApplicationConfig(); | ||
| }); | ||
|
|
||
| describe('When a user is logged in:', () => { | ||
| beforeEach(() => { | ||
| cy.stub(Storage, 'userIsLogged').returns(true); | ||
| cy.stub(Storage, 'getCurrentUser').returns(mockUser); | ||
| }); | ||
|
|
||
| it('Renders form correctly', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // These fields should exist | ||
| cy.get('[data-cy="closeButton"]').should('exist'); | ||
| cy.get('[data-cy="supportForm"]').should('exist'); | ||
| cy.get('[data-cy="supportFormEmail"]').should('not.exist'); | ||
| cy.get('[data-cy="supportFormName"]').should('not.exist'); | ||
| cy.get('[data-cy="supportFormType"]').should('exist'); | ||
| cy.get('[data-cy="supportFormSubject"]').should('exist'); | ||
| cy.get('[data-cy="supportFormDescription"]').should('exist'); | ||
| cy.get('[data-cy="supportFormAttachment"]').should('exist'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormCancel"]').should('not.be.disabled'); | ||
| }); | ||
|
|
||
| it('Submits properly', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // Ensure that all required fields are filled out before submit becomes available | ||
| cy.get('[data-cy="supportFormType"]').select('bug'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormSubject"]').type('Subject'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormDescription"]').type('Description'); | ||
| // Form is complete: | ||
| cy.get('[data-cy="supportFormSubmit"]').should('not.be.disabled'); | ||
| cy.get('[data-cy="supportFormCancel"]').should('not.be.disabled'); | ||
| cy.intercept({method: 'POST', url: '**/support/request'}, {statusCode: 201}).as('request'); | ||
| cy.intercept({method: 'POST', url: '**/support/upload'}, {statusCode: 201, body: {'token': 'token_string'}}).as('upload'); | ||
| // {force: true} is necessary here due to the surrounding div that covers the input. | ||
| cy.get('[data-cy="supportFormAttachment"]').selectFile(['cypress/fixtures/example.json'], {force: true}); | ||
| cy.get('[data-cy="supportFormSubmit"]').click(); | ||
| cy.wait(['@request', '@upload']).then((interceptions) => { | ||
| assert(interceptions.length === 2); | ||
| }); | ||
| }); | ||
|
|
||
| }); | ||
|
|
||
| describe('When a user is NOT logged in:', () => { | ||
| beforeEach(() => { | ||
| cy.stub(Storage, 'userIsLogged').returns(false); | ||
| cy.stub(Storage, 'getCurrentUser').returns(undefined); | ||
| }); | ||
|
|
||
| it('Renders form correctly', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // These fields should exist | ||
| cy.get('[data-cy="closeButton"]').should('exist'); | ||
| cy.get('[data-cy="supportForm"]').should('exist'); | ||
| cy.get('[data-cy="supportFormEmail"]').should('exist'); | ||
| cy.get('[data-cy="supportFormName"]').should('exist'); | ||
| cy.get('[data-cy="supportFormType"]').should('exist'); | ||
| cy.get('[data-cy="supportFormSubject"]').should('exist'); | ||
| cy.get('[data-cy="supportFormDescription"]').should('exist'); | ||
| cy.get('[data-cy="supportFormAttachment"]').should('exist'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormCancel"]').should('not.be.disabled'); | ||
| }); | ||
|
|
||
| it('Submits properly', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // Ensure that all required fields are filled out before submit becomes available | ||
| cy.get('[data-cy="supportFormName"]').type('Name'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormType"]').select('bug'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormSubject"]').type('Subject'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormDescription"]').type('Description'); | ||
| cy.get('[data-cy="supportFormSubmit"]').should('be.disabled'); | ||
| cy.get('[data-cy="supportFormEmail"]').type(mockUser.email); | ||
| // Form is complete: | ||
| cy.get('[data-cy="supportFormSubmit"]').should('not.be.disabled'); | ||
| cy.get('[data-cy="supportFormCancel"]').should('not.be.disabled'); | ||
| cy.intercept({method: 'POST', url: '**/support/request'}, {statusCode: 201}).as('request'); | ||
| cy.intercept({method: 'POST', url: '**/support/upload'}, {statusCode: 201, body: {'token': 'token_string'}}).as('upload'); | ||
| // {force: true} is necessary here due to the surrounding div that covers the input. | ||
| cy.get('[data-cy="supportFormAttachment"]').selectFile(['cypress/fixtures/example.json'], {force: true}); | ||
| cy.get('[data-cy="supportFormSubmit"]').click(); | ||
| cy.wait(['@request', '@upload']).then((interceptions) => { | ||
| assert(interceptions.length === 2); | ||
| }); | ||
| }); | ||
|
|
||
| }); | ||
|
|
||
| describe('File Attachments', () => { | ||
| beforeEach(() => { | ||
| cy.stub(Storage, 'userIsLogged').returns(false); | ||
| cy.stub(Storage, 'getCurrentUser').returns(undefined); | ||
| }); | ||
| it('Single attachment displayed', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // {force: true} is necessary here due to the surrounding div that covers the input. | ||
| cy.get('[data-cy="supportFormAttachment"]').selectFile(['cypress/fixtures/example.json'], {force: true}); | ||
| const container = cy.get('[data-cy="supportFormAttachmentContainer"]'); | ||
| expect(container.contains('example.json')); | ||
| }); | ||
|
|
||
| it('Multiple attachments displayed', () => { | ||
| mount(<SupportRequestModal | ||
| onCloseRequest={handler} | ||
| onOKRequest={handler} | ||
| url={'url'} | ||
| showModal={true} | ||
| />); | ||
| // {force: true} is necessary here due to the surrounding div that covers the input. | ||
| cy.get('[data-cy="supportFormAttachment"]').selectFile(['cypress/fixtures/example.json', 'cypress/fixtures/dataset-registration-schema_v1.json'], {force: true}); | ||
| const container = cy.get('[data-cy="supportFormAttachmentContainer"]'); | ||
| expect(container.contains('2 files selected')); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,36 @@ | ||
| import {getApiUrl} from '../ajax'; | ||
| import axios from 'axios'; | ||
|
|
||
| export const Support = { | ||
|
|
||
| createTicket: (name, type, email, subject, description, attachmentToken, url) => { | ||
| return { | ||
| name: name, | ||
| type: type.toUpperCase(), | ||
| email: email, | ||
| subject: subject, | ||
|
There was a problem hiding this comment. what was the purpose of these fields? There was a problem hiding this comment. @raejohanek They are custom field identifiers defined in the Zendesk admin portal that describe the fields displayed in their UI. These were copied over to the API layer here: https://github.com/DataBiosphere/consent/pull/2448/files#diff-310d0997bfbaf3ef54cfda5d6fdd932c172581d9e7e4b38d2a0a44c7f037c91aR48 |
||
| description: description, | ||
| url: url, | ||
| uploads: attachmentToken | ||
| }; | ||
| }, | ||
|
|
||
| createSupportRequest: async (ticket) => { | ||
| const url = `${await getApiUrl()}/support/request`; | ||
| return await axios.post(url, ticket, {headers: {'Content-Type': 'application/json'}}).catch( | ||
| function (error) { | ||
| return Promise.reject(error.response); | ||
| } | ||
| ); | ||
| }, | ||
|
|
||
| uploadAttachment: async (file) => { | ||
| const url = `${await getApiUrl()}/support/upload`; | ||
| return await axios.post(url, file, {headers: {'Content-Type': 'application/binary'}}).catch( | ||
| function (error) { | ||
| return Promise.reject(error.response); | ||
| } | ||
| ); | ||
| }, | ||
|
|
||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drive-by fix: unused method.