Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TESTID-125,126,127,128,129] Saved Query Test Scope #9229

Merged
merged 44 commits into from
Jan 28, 2025
Merged

[TESTID-125,126,127,128,129] Saved Query Test Scope #9229

merged 44 commits into from
Jan 28, 2025

Conversation

ArgusLi
Copy link
Contributor

@ArgusLi ArgusLi commented Jan 21, 2025 •
edited
Loading

Description

Adds a Cypress test suite for Saved Queries Test Scope in the Discover page.

Issues Resolved

Closes #8975, #8977, #8978, #8979, #8980.

Screenshot

saved-queries-1.mp4
saved-queries-2.mp4
saved-queries-3.mp4

Testing the changes

With OSD running, run yarn run cypress open. In E2E specs, you will see 2 new test specs saved_queries.spec.js and saved_queries_old_ui.spec.js. Run saved_queries.spec.js if data.savedQueriesNewUI.enabled: true in the OSD config, else run saved_queries_old_ui.spec.js.

Changelog

  • test: Add cypress integration test for the old and new UI view saved queries.

ArgusLi and others added 27 commits January 8, 2025 21:09
@ArgusLi
add spec for old ui
02bb7d4 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add comment about cleaning up saved queries
af1352d 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add data-test-subj for save query new ui
d6a713b 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add data-test-subj for save query button for new ui
d6e0785 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add data-test-subj for open query button in query management popover
a15bba2 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add new ui spec to test list saved queries
47fe9a7 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Fix DataSource url
49a9352 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Merge branch 'main' into testid-124-list-saved-queries
61112c8
@opensearch-changeset-bot
Changeset file for PR opensearch-project#9166 created/updated
00b3f60
@ArgusLi
Address Justin's comments.
edb8f9f 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Remove final force.
4ae05a4 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Fix final force.
b411dd0 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Move utils to Suchit's suggested location, fix comments
eeb0c63 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Rename specs, change cypress workflow to use new save query ui, merge…
3c2b2ec 
… old ui and new ui commands

Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Merge main
59de88e 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
fix import
6297366 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Load query
bef2e77 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete load query popover and flyout
2cff1df 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Modularize view and load query popover and flyout
2abb5de 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete valid Saved Queries shown across Visualize Pages
454ac70 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete Popover delete saved query
4ecaf80 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add data-test-subj for flyoutbody and delete button.
1746c6f 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete flyout delete saved query
58251de 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Add data-test-subj for saveAsNewQueryCheckbox
3bac756 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete Flyout Update Saved Query
0d98d74 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete Flyout Save as New Saved Query
51e9ce3 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Complete Popout Save as New Saved Query
7061a43 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@angle943
Copy link
Collaborator

@ArgusLi i believe you are having a test failure related to this change: #9150

@ArgusLi
Fix cypress command namespacing.
7e80e64 
Signed-off-by: Argus Li <contactme@chunkeili.com>
angle943
angle943 reviewed Jan 24, 2025
View reviewed changes
...search_dashboards/opensearch_dashboards/apps/query_enhancements/saved_queries_flyout.spec.js Outdated
SAVE_AS_NEW_QUERY_SUFFIX,
validateSaveAsNewQueryMatchingNameHasError,
} from '../../../../../utils/apps/query_enhancements/saved_queries';

Copy link
Collaborator

@angle943 angle943 Jan 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we rename this file to saved_queries.spec.js

@ArgusLi
Rename saved queries spec.
2d2c081 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Merge remote-tracking branch 'origin/main' into discover-tests-saved-…
57c2ade 
…queries

Signed-off-by: Argus Li <contactme@chunkeili.com>
angle943
angle943 reviewed Jan 24, 2025
View reviewed changes
...re_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/saved_queries.spec.js Outdated

// This spec assumes data.savedQueriesNewUI.enabled is true.
export const runSavedQueriesFlyoutUITests = () => {
describe('saved queries flyout UI', () => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets remove flyout UI

@ArgusLi
Remove references to flyout
7e21348 
Signed-off-by: Argus Li <contactme@chunkeili.com>
ananzh
ananzh previously approved these changes Jan 24, 2025
View reviewed changes
@LDrago27 LDrago27 added backport 2.x discover_2.0-test Issues that are specific to the Discover 2.0 testing initiative labels Jan 24, 2025
@ArgusLi
Refactor tests to work with beforeEach and afterEach
d193d64 
Signed-off-by: Argus Li <contactme@chunkeili.com>
@ArgusLi
Merge remote-tracking branch 'origin/main' into discover-tests-saved-…
f791b6e 
…queries
@ArgusLi
Add force to click when loading saved query.
bc5878a 
This removes delay when waiting for toast to disperse.

Signed-off-by: Argus Li <contactme@chunkeili.com>
ananzh
ananzh previously approved these changes Jan 28, 2025
View reviewed changes
@ananzh
Copy link
Member

ananzh commented Jan 28, 2025

Update branch to re-run tests, especially ciGroup 10

@ArgusLi
Fix test issue. Thank you @angle943 for finding a solution.
b162b29 
Issue was caused by Cypress being too fast for the date picker to appear.

Signed-off-by: Argus Li <contactme@chunkeili.com>
@LDrago27 LDrago27 merged commit 969114f into opensearch-project:main Jan 28, 2025
69 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 28, 2025
@github-actions @opensearch-changeset-bot @ananzh
[TESTID-125,126,127,128,129] Saved Query Test Scope (#9229)
67453a5 
* add spec for old ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add comment about cleaning up saved queries

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for save query new ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for save query button for new ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for open query button in query management popover

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add new ui spec to test list saved queries

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix DataSource url

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Changeset file for PR #9166 created/updated

* Address Justin's comments.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove final force.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix final force.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Move utils to Suchit's suggested location, fix comments

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Rename specs, change cypress workflow to use new save query ui, merge old ui and new ui commands

Signed-off-by: Argus Li <contactme@chunkeili.com>

* fix import

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Load query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete load query popover and flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Modularize view and load query popover and flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete valid Saved Queries shown across Visualize Pages

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Popover delete saved query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for flyoutbody and delete button.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete flyout delete saved query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for saveAsNewQueryCheckbox

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Flyout Update Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Flyout Save as New Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Popout Save as New Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Changeset file for PR #9229 created/updated

* Fix merge

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Move data-test-subj changes to another PR.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove savedQueriesNewUI

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Address all comments.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix cypress command namespacing.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Rename saved queries spec.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove references to flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Refactor tests to work with beforeEach and afterEach

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add force to click when loading saved query.

This removes delay when waiting for toast to disperse.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix test issue. Thank you @angle943 for finding a solution.

Issue was caused by Cypress being too fast for the date picker to appear.

Signed-off-by: Argus Li <contactme@chunkeili.com>

---------

Signed-off-by: Argus Li <contactme@chunkeili.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 969114f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jan 28, 2025
Merged
@ananzh ananzh added the v2.19.0 label Jan 28, 2025
@ArgusLi ArgusLi mentioned this pull request Jan 28, 2025
Merged
ananzh added a commit that referenced this pull request Jan 29, 2025
@opensearch-trigger-bot @github-actions
@opensearch-changeset-bot @ananzh
[TESTID-125,126,127,128,129] Saved Query Test Scope (#9229) (#9286)
5bd7a85 
* add spec for old ui



* Add comment about cleaning up saved queries



* Add data-test-subj for save query new ui



* Add data-test-subj for save query button for new ui



* Add data-test-subj for open query button in query management popover



* Add new ui spec to test list saved queries



* Fix DataSource url



* Changeset file for PR #9166 created/updated

* Address Justin's comments.



* Remove final force.



* Fix final force.



* Move utils to Suchit's suggested location, fix comments



* Rename specs, change cypress workflow to use new save query ui, merge old ui and new ui commands



* fix import



* Load query



* Complete load query popover and flyout



* Modularize view and load query popover and flyout



* Complete valid Saved Queries shown across Visualize Pages



* Complete Popover delete saved query



* Add data-test-subj for flyoutbody and delete button.



* Complete flyout delete saved query



* Add data-test-subj for saveAsNewQueryCheckbox



* Complete Flyout Update Saved Query



* Complete Flyout Save as New Saved Query



* Complete Popout Save as New Saved Query



* Changeset file for PR #9229 created/updated

* Fix merge



* Move data-test-subj changes to another PR.



* Remove savedQueriesNewUI



* Address all comments.



* Fix cypress command namespacing.



* Rename saved queries spec.



* Remove references to flyout



* Refactor tests to work with beforeEach and afterEach



* Add force to click when loading saved query.

This removes delay when waiting for toast to disperse.



* Fix test issue. Thank you @angle943 for finding a solution.

Issue was caused by Cypress being too fast for the date picker to appear.



---------




(cherry picked from commit 969114f)

Signed-off-by: Argus Li <contactme@chunkeili.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
ruchidh pushed a commit to ruchidh/OpenSearch-Dashboards that referenced this pull request Jan 30, 2025
@ArgusLi @opensearch-changeset-bot @ananzh
[TESTID-125,126,127,128,129] Saved Query Test Scope (opensearch-proje…
d18ebc0 
…ct#9229)

* add spec for old ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add comment about cleaning up saved queries

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for save query new ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for save query button for new ui

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for open query button in query management popover

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add new ui spec to test list saved queries

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix DataSource url

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Changeset file for PR opensearch-project#9166 created/updated

* Address Justin's comments.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove final force.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix final force.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Move utils to Suchit's suggested location, fix comments

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Rename specs, change cypress workflow to use new save query ui, merge old ui and new ui commands

Signed-off-by: Argus Li <contactme@chunkeili.com>

* fix import

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Load query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete load query popover and flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Modularize view and load query popover and flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete valid Saved Queries shown across Visualize Pages

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Popover delete saved query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for flyoutbody and delete button.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete flyout delete saved query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add data-test-subj for saveAsNewQueryCheckbox

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Flyout Update Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Flyout Save as New Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Complete Popout Save as New Saved Query

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Changeset file for PR opensearch-project#9229 created/updated

* Fix merge

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Move data-test-subj changes to another PR.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove savedQueriesNewUI

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Address all comments.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix cypress command namespacing.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Rename saved queries spec.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Remove references to flyout

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Refactor tests to work with beforeEach and afterEach

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Add force to click when loading saved query.

This removes delay when waiting for toast to disperse.

Signed-off-by: Argus Li <contactme@chunkeili.com>

* Fix test issue. Thank you @angle943 for finding a solution.

Issue was caused by Cypress being too fast for the date picker to appear.

Signed-off-by: Argus Li <contactme@chunkeili.com>

---------

Signed-off-by: Argus Li <contactme@chunkeili.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
Signed-off-by: Ubuntu <ubuntu@ip-172-31-47-220.us-west-2.compute.internal>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@angle943 angle943 angle943 approved these changes

@LDrago27 LDrago27 LDrago27 approved these changes

@ananzh ananzh ananzh approved these changes

@kavilla kavilla Awaiting requested review from kavilla kavilla is a code owner

@AMoo-Miki AMoo-Miki Awaiting requested review from AMoo-Miki AMoo-Miki is a code owner

@ashwin-pc ashwin-pc Awaiting requested review from ashwin-pc ashwin-pc is a code owner

@joshuarrrr joshuarrrr Awaiting requested review from joshuarrrr joshuarrrr is a code owner

@abbyhu2000 abbyhu2000 Awaiting requested review from abbyhu2000 abbyhu2000 is a code owner

@zengyan-amazon zengyan-amazon Awaiting requested review from zengyan-amazon zengyan-amazon is a code owner

@zhongnansu zhongnansu Awaiting requested review from zhongnansu zhongnansu is a code owner

@manasvinibs manasvinibs Awaiting requested review from manasvinibs manasvinibs is a code owner

@ZilongX ZilongX Awaiting requested review from ZilongX ZilongX is a code owner

@Flyingliuhub Flyingliuhub Awaiting requested review from Flyingliuhub Flyingliuhub is a code owner

@curq curq Awaiting requested review from curq curq is a code owner

@bandinib-amzn bandinib-amzn Awaiting requested review from bandinib-amzn bandinib-amzn is a code owner

@SuZhou-Joe SuZhou-Joe Awaiting requested review from SuZhou-Joe SuZhou-Joe is a code owner

@ruanyl ruanyl Awaiting requested review from ruanyl ruanyl is a code owner

@BionIT BionIT Awaiting requested review from BionIT BionIT is a code owner

@xinruiba xinruiba Awaiting requested review from xinruiba xinruiba is a code owner

@zhyuanqi zhyuanqi Awaiting requested review from zhyuanqi zhyuanqi is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@virajsanghvi virajsanghvi Awaiting requested review from virajsanghvi virajsanghvi is a code owner

@sejli sejli Awaiting requested review from sejli sejli is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@huyaboo huyaboo Awaiting requested review from huyaboo huyaboo is a code owner

Assignees
No one assigned
Labels
backport 2.x discover_2.0-test Issues that are specific to the Discover 2.0 testing initiative repeat-contributor v2.19.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Saved Queries] TESTID-125: Loading a Saved query with filters, time range , query
4 participants
@ArgusLi @ananzh @angle943 @LDrago27