File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed
cypress/integration/visualizations Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ function QuerySource(props) {
153153
154154 const doExecuteQuery = useCallback (
155155 ( skipParametersDirtyFlag = false ) => {
156- if ( ! queryFlags . canExecute || ( ! skipParametersDirtyFlag && areParametersDirty ) || isQueryExecuting ) {
156+ if ( ! queryFlags . canExecute || ( ! skipParametersDirtyFlag && ( areParametersDirty || isQueryExecuting ) ) ) {
157157 return ;
158158 }
159159 if ( isDirty || ! isEmpty ( selectedText ) ) {
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ function QueryView(props) {
5959
6060 const doExecuteQuery = useCallback (
6161 ( skipParametersDirtyFlag = false ) => {
62- if ( ! queryFlags . canExecute || ( ! skipParametersDirtyFlag && areParametersDirty ) || isQueryExecuting ) {
62+ if ( ! queryFlags . canExecute || ( ! skipParametersDirtyFlag && ( areParametersDirty || isQueryExecuting ) ) ) {
6363 return ;
6464 }
6565 executeQuery ( ) ;
Original file line number Diff line number Diff line change @@ -96,9 +96,8 @@ describe("Pivot", () => {
9696 cy . visit ( `queries/${ this . queryId } /source#${ visualization . id } ` ) ;
9797 cy . getByTestId ( "ExecuteButton" ) . click ( ) ;
9898
99- cy . getByTestId ( `QueryPageVisualization${ visualization . id } ` )
100- . find ( ".pvtGrandTotal" )
101- . should ( "have.text" , "11" ) ; // assert number of rows is 11
99+ // assert number of rows is 11
100+ cy . getByTestId ( `QueryPageVisualization${ visualization . id } ` ) . contains ( ".pvtGrandTotal" , "11" ) ;
102101
103102 cy . getByTestId ( "QueryEditor" )
104103 . get ( ".ace_text-input" )
@@ -109,9 +108,8 @@ describe("Pivot", () => {
109108 cy . getByTestId ( "SaveButton" ) . click ( ) ;
110109 cy . getByTestId ( "ExecuteButton" ) . click ( ) ;
111110
112- cy . getByTestId ( `QueryPageVisualization${ visualization . id } ` )
113- . find ( ".pvtGrandTotal" )
114- . should ( "have.text" , "12" ) ; // assert number of rows is 12
111+ // assert number of rows is 12
112+ cy . getByTestId ( `QueryPageVisualization${ visualization . id } ` ) . contains ( ".pvtGrandTotal" , "12" ) ;
115113 } ) ;
116114 } ) ;
117115
You can’t perform that action at this time.
0 commit comments