schizophrenicmaniac commented on code in PR #44963:
URL: https://github.com/apache/superset/pull/44963#discussion_r4205256889
##########
superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx:
##########
@@ -854,6 +855,74 @@ test('shows error indicator with function labels', async
() => {
expect(await screen.findByText(/Metric is required/)).toBeInTheDocument();
});
+const renderAfterInitialQuery = async (initialState: object) => {
+ const triggerQuerySpy = jest.spyOn(chartActions, 'triggerQuery');
+ const store = createStore(initialState, reducerIndex);
+ renderWithRouter({ initialState, store: store as Store });
+ // the mocked chart panel queries on mount; finish it like a real chart would
+ await waitFor(() => expect(triggerQuerySpy).toHaveBeenCalled());
+ act(() => {
+ store.dispatch(chartActions.chartUpdateSucceeded([], 1));
+ });
+ triggerQuerySpy.mockClear();
+ return { store, triggerQuerySpy };
+};
+
+test('Ctrl+Enter runs the query when controls are valid', async () => {
+ const { triggerQuerySpy } = await renderAfterInitialQuery(reduxState);
+
+ await userEvent.keyboard('{Control>}{Enter}{/Control}');
+
+ expect(triggerQuerySpy).toHaveBeenCalledWith(true, 1);
+});
+
+test('Cmd+Enter runs the query when controls are valid', async () => {
+ const { triggerQuerySpy } = await renderAfterInitialQuery(reduxState);
+
+ await userEvent.keyboard('{Meta>}{Enter}{/Meta}');
+
+ expect(triggerQuerySpy).toHaveBeenCalledWith(true, 1);
+});
+
+test('Ctrl+Enter does not run the query when controls have validation errors',
async () => {
Review Comment:
Renamed to Ctrl/Cmd+Enter.
##########
superset-frontend/src/explore/components/ExploreViewContainer/ExploreViewContainer.test.tsx:
##########
@@ -854,6 +855,74 @@ test('shows error indicator with function labels', async
() => {
expect(await screen.findByText(/Metric is required/)).toBeInTheDocument();
});
+const renderAfterInitialQuery = async (initialState: object) => {
+ const triggerQuerySpy = jest.spyOn(chartActions, 'triggerQuery');
+ const store = createStore(initialState, reducerIndex);
+ renderWithRouter({ initialState, store: store as Store });
+ // the mocked chart panel queries on mount; finish it like a real chart would
+ await waitFor(() => expect(triggerQuerySpy).toHaveBeenCalled());
+ act(() => {
+ store.dispatch(chartActions.chartUpdateSucceeded([], 1));
+ });
+ triggerQuerySpy.mockClear();
+ return { store, triggerQuerySpy };
+};
+
+test('Ctrl+Enter runs the query when controls are valid', async () => {
+ const { triggerQuerySpy } = await renderAfterInitialQuery(reduxState);
+
+ await userEvent.keyboard('{Control>}{Enter}{/Control}');
+
+ expect(triggerQuerySpy).toHaveBeenCalledWith(true, 1);
+});
+
+test('Cmd+Enter runs the query when controls are valid', async () => {
+ const { triggerQuerySpy } = await renderAfterInitialQuery(reduxState);
+
+ await userEvent.keyboard('{Meta>}{Enter}{/Meta}');
+
+ expect(triggerQuerySpy).toHaveBeenCalledWith(true, 1);
+});
+
+test('Ctrl+Enter does not run the query when controls have validation errors',
async () => {
+ const { triggerQuerySpy } = await renderAfterInitialQuery({
+ ...reduxState,
+ explore: {
+ ...reduxState.explore,
+ controls: {
+ ...reduxState.explore.controls,
+ metric: {
+ value: '',
+ label: 'Metric',
+ validationErrors: ['Metric is required'],
+ },
+ },
+ },
+ });
+
+ await userEvent.keyboard('{Control>}{Enter}{/Control}');
+ await userEvent.keyboard('{Meta>}{Enter}{/Meta}');
Review Comment:
Renamed both negative tests to Ctrl/Cmd+Enter, and the loading test now
checks Cmd+Enter too.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
