Skip to content

Commit

Permalink
fix(Dashboard): Only apply changes when editing properties (#17392)
Browse files Browse the repository at this point in the history
* Apply only

* Test apply button

* Update Cypress

* Rename test
  • Loading branch information
geido authored and AAfghahi committed Jan 10, 2022
1 parent cc25143 commit eff362f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('Dashboard edit action', () => {

// save edit changes
cy.get('.ant-modal-footer')
.contains('Save')
.contains('Apply')
.click()
.then(() => {
// assert that modal edit window has closed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/
import React from 'react';
import { render, screen } from 'spec/helpers/testing-library';
import { render, screen, waitFor } from 'spec/helpers/testing-library';
import userEvent from '@testing-library/user-event';
import fetchMock from 'fetch-mock';
import { HeaderDropdownProps } from 'src/dashboard/components/Header/types';
Expand Down Expand Up @@ -198,3 +198,12 @@ test('should show the properties modal', async () => {
userEvent.click(screen.getByText('Edit dashboard properties'));
expect(editModeOnProps.showPropertiesModal).toHaveBeenCalledTimes(1);
});

test('should display the Apply button when opening the modal', async () => {
render(setup(editModeOnProps));
await openDropdown();
userEvent.click(screen.getByText('Edit dashboard properties'));
waitFor(() => {
expect(screen.getByRole('button', { name: 'Apply' })).toBeInTheDocument();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ class Header extends React.PureComponent {
);
}
}}
onlyApply
/>
)}

Expand Down

0 comments on commit eff362f

Please sign in to comment.