michael-s-molina commented on a change in pull request #13787: URL: https://github.com/apache/superset/pull/13787#discussion_r601353783
########## File path: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx ########## @@ -0,0 +1,189 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import userEvent from '@testing-library/user-event'; +import React from 'react'; +import { render, screen } from 'spec/helpers/testing-library'; +import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric'; +import AdhocMetricEditPopover from '.'; + +const factoryProps = () => ({ + onChange: jest.fn(), + onClose: jest.fn(), + onResize: jest.fn(), + getCurrentTab: jest.fn(), + getCurrentLabel: jest.fn(), + savedMetric: { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + savedMetricsOptions: [ + { + id: 65, + metric_name: 'count', + expression: 'COUNT(*)', + }, + ], + adhocMetric: new AdhocMetric({ isNew: true }), + datasourceType: 'table', + columns: [ + { + id: 1342, + column_name: 'highest_degree_earned', + expression: + "CASE \n WHEN school_degree = 'no high school (secondary school)' THEN 'A. No high school (secondary school)'\n WHEN school_degree = 'some high school' THEN 'B. Some high school'\n WHEN school_degree = 'high school diploma or equivalent (GED)' THEN 'C. High school diploma or equivalent (GED)'\n WHEN school_degree = 'associate''s degree' THEN 'D. Associate''s degree'\n WHEN school_degree = 'some college credit, no degree' THEN 'E. Some college credit, no degree'\n WHEN school_degree = 'bachelor''s degree' THEN 'F. Bachelor''s degree'\n WHEN school_degree = 'trade, technical, or vocational training' THEN 'G. Trade, technical, or vocational training'\n WHEN school_degree = 'master''s degree (non-professional)' THEN 'H. Master''s degree (non-professional)'\n WHEN school_degree = 'Ph.D.' THEN 'I. Ph.D.'\n WHEN school_degree = 'professional degree (MBA, MD, JD, etc.)' THEN 'J. Professional degree (MBA, MD, JD, etc.)'\nEND", + type: 'STRING', + }, + ], +}); + +test('Should render', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(screen.getByTestId('metrics-edit-popover')).toBeVisible(); +}); + +test('Should render correct elements', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + + expect(screen.getByRole('tablist')).toBeVisible(); + + expect(screen.getByRole('tab', { name: 'Custom SQL' })).toBeVisible(); + expect(screen.getByRole('tab', { name: 'Simple' })).toBeVisible(); + expect(screen.getByRole('tab', { name: 'Saved' })).toBeVisible(); + + expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible(); + + expect(screen.getByRole('button', { name: 'Resize' })).toBeVisible(); + expect(screen.getByRole('button', { name: 'Save' })).toBeVisible(); + expect(screen.getByRole('button', { name: 'Close' })).toBeVisible(); +}); + +test('When click on "Close" should call onClose', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(props.onClose).toBeCalledTimes(0); + userEvent.click(screen.getByRole('button', { name: 'Close' })); + expect(props.onClose).toBeCalledTimes(1); +}); + +test('When click on "Save" should call onChange and onClose', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(props.onChange).toBeCalledTimes(0); + expect(props.onClose).toBeCalledTimes(0); + userEvent.click(screen.getByRole('button', { name: 'Save' })); + expect(props.onChange).toBeCalledTimes(1); + expect(props.onChange).toBeCalledWith( + { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + ); + expect(props.onClose).toBeCalledTimes(1); +}); + +test('Should switch to tab:Simple', () => { + const props = factoryProps(); + props.getCurrentTab.mockImplementation(tab => { + props.adhocMetric.expressionType = tab; + }); + render(<AdhocMetricEditPopover {...props} />); + + expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible(); + expect( + screen.queryByRole('tabpanel', { name: 'Simple' }), + ).not.toBeInTheDocument(); + + expect(props.getCurrentTab).toBeCalledTimes(1); + const tab = screen.getByRole('tab', { name: 'Simple' }).parentElement; + if (tab) { + userEvent.click(tab); + } + expect(props.getCurrentTab).toBeCalledTimes(2); + + expect( + screen.queryByRole('tabpanel', { name: 'Saved' }), + ).not.toBeInTheDocument(); + expect(screen.getByRole('tabpanel', { name: 'Simple' })).toBeInTheDocument(); +}); + +test('Should render tab "Simple" correctly', () => { + const props = factoryProps(); + props.getCurrentTab.mockImplementation(tab => { Review comment: Can this piece of code be moved to the factory method? ``` props.getCurrentTab.mockImplementation(tab => { props.adhocMetric.expressionType = tab; }); ``` ########## File path: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx ########## @@ -0,0 +1,189 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import userEvent from '@testing-library/user-event'; +import React from 'react'; +import { render, screen } from 'spec/helpers/testing-library'; +import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric'; +import AdhocMetricEditPopover from '.'; + +const factoryProps = () => ({ Review comment: I think you can use a more standard name for factory methods such as [createProps](https://stackoverflow.com/questions/3368830/how-to-name-factory-like-methods). ########## File path: superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/AdhocMetricEditPopover.test.tsx ########## @@ -0,0 +1,189 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import userEvent from '@testing-library/user-event'; +import React from 'react'; +import { render, screen } from 'spec/helpers/testing-library'; +import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric'; +import AdhocMetricEditPopover from '.'; + +const factoryProps = () => ({ + onChange: jest.fn(), + onClose: jest.fn(), + onResize: jest.fn(), + getCurrentTab: jest.fn(), + getCurrentLabel: jest.fn(), + savedMetric: { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + savedMetricsOptions: [ + { + id: 65, + metric_name: 'count', + expression: 'COUNT(*)', + }, + ], + adhocMetric: new AdhocMetric({ isNew: true }), + datasourceType: 'table', + columns: [ + { + id: 1342, + column_name: 'highest_degree_earned', + expression: + "CASE \n WHEN school_degree = 'no high school (secondary school)' THEN 'A. No high school (secondary school)'\n WHEN school_degree = 'some high school' THEN 'B. Some high school'\n WHEN school_degree = 'high school diploma or equivalent (GED)' THEN 'C. High school diploma or equivalent (GED)'\n WHEN school_degree = 'associate''s degree' THEN 'D. Associate''s degree'\n WHEN school_degree = 'some college credit, no degree' THEN 'E. Some college credit, no degree'\n WHEN school_degree = 'bachelor''s degree' THEN 'F. Bachelor''s degree'\n WHEN school_degree = 'trade, technical, or vocational training' THEN 'G. Trade, technical, or vocational training'\n WHEN school_degree = 'master''s degree (non-professional)' THEN 'H. Master''s degree (non-professional)'\n WHEN school_degree = 'Ph.D.' THEN 'I. Ph.D.'\n WHEN school_degree = 'professional degree (MBA, MD, JD, etc.)' THEN 'J. Professional degree (MBA, MD, JD, etc.)'\nEND", + type: 'STRING', + }, + ], +}); + +test('Should render', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(screen.getByTestId('metrics-edit-popover')).toBeVisible(); +}); + +test('Should render correct elements', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + + expect(screen.getByRole('tablist')).toBeVisible(); + + expect(screen.getByRole('tab', { name: 'Custom SQL' })).toBeVisible(); + expect(screen.getByRole('tab', { name: 'Simple' })).toBeVisible(); + expect(screen.getByRole('tab', { name: 'Saved' })).toBeVisible(); + + expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible(); + + expect(screen.getByRole('button', { name: 'Resize' })).toBeVisible(); + expect(screen.getByRole('button', { name: 'Save' })).toBeVisible(); + expect(screen.getByRole('button', { name: 'Close' })).toBeVisible(); +}); + +test('When click on "Close" should call onClose', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(props.onClose).toBeCalledTimes(0); + userEvent.click(screen.getByRole('button', { name: 'Close' })); + expect(props.onClose).toBeCalledTimes(1); +}); + +test('When click on "Save" should call onChange and onClose', () => { + const props = factoryProps(); + render(<AdhocMetricEditPopover {...props} />); + expect(props.onChange).toBeCalledTimes(0); + expect(props.onClose).toBeCalledTimes(0); + userEvent.click(screen.getByRole('button', { name: 'Save' })); + expect(props.onChange).toBeCalledTimes(1); + expect(props.onChange).toBeCalledWith( + { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + { + id: 64, + metric_name: 'count', + expression: 'COUNT(*)', + }, + ); + expect(props.onClose).toBeCalledTimes(1); +}); + +test('Should switch to tab:Simple', () => { + const props = factoryProps(); + props.getCurrentTab.mockImplementation(tab => { + props.adhocMetric.expressionType = tab; + }); + render(<AdhocMetricEditPopover {...props} />); + + expect(screen.getByRole('tabpanel', { name: 'Saved' })).toBeVisible(); + expect( + screen.queryByRole('tabpanel', { name: 'Simple' }), + ).not.toBeInTheDocument(); + + expect(props.getCurrentTab).toBeCalledTimes(1); + const tab = screen.getByRole('tab', { name: 'Simple' }).parentElement; + if (tab) { Review comment: Is this `if` to resolve typescript? If so, I think the `!` operator is more assertive and clearly states that the tab should not be `null` in this context. As it is written, it appears that the test can have several results. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
