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

change casing to folder structures to be compliant with our rules #9194

Closed
wants to merge 5 commits into from
Closed

change casing to folder structures to be compliant with our rules #9194

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf5d041
change casing to folder structures to be compliant with our rules
angle943 Jan 15, 2025
e65b6b3
fix paths that references old path
angle943 Jan 15, 2025
6e1cb49
add a cypress log to a baffling flakiness
angle943 Jan 16, 2025
7354008
Merge branch 'main' into change-directory-casing-for-tests
angle943 Jan 16, 2025
1cdaca8
revert the cy.log
angle943 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/apps/query_enhancements/a_check.spec.js → ...s/apps/query_enhancements/a_check.spec.js
View file
Open in desktop
File renamed without changes.
0 ...ery_enhancements/dataset_selector.spec.js → ...ery_enhancements/dataset_selector.spec.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ancements/field_display_filtering.spec.js → ...ancements/field_display_filtering.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
END_TIME,
DATASET_CONFIGS,
} from '../../../../../utils/apps/constants';
import * as dataExplorer from '../../../../../integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/utils/field_display_filtering.js';
import * as dataExplorer from '../../../../../integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/utils/field_display_filtering.js';
import { SECONDARY_ENGINE, BASE_PATH } from '../../../../../utils/constants';
import { NEW_SEARCH_BUTTON } from '../../../../../utils/dashboards/data_explorer/elements.js';

Expand Down
0 ...s/apps/query_enhancements/queries.spec.js → ...s/apps/query_enhancements/queries.spec.js
View file
Open in desktop
File renamed without changes.
0 ...pps/query_enhancements/s3_dataset.spec.js → ...pps/query_enhancements/s3_dataset.spec.js
View file
Open in desktop
File renamed without changes.
0 ...s/query_enhancements/saved_search.spec.js → ...s/query_enhancements/saved_search.spec.js
View file
Open in desktop
File renamed without changes.
0 ...ncements/utils/field_display_filtering.js → ...ncements/utils/field_display_filtering.js
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions .../query_enhancements/utils/saved_search.js → .../query_enhancements/utils/saved_search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ export const generateAllTestConfigurations = () => {
* @param {QueryEnhancementLanguage} language - query language
*/
export const setDatePickerDatesAndSearchIfRelevant = (language) => {
cy.log(`setDatePickerDatesAndSearchIfRelevant with language: ${language}`);
if (language !== QueryLanguages.SQL.name) {
cy.setTopNavDate(START_TIME, END_TIME);
}
Expand Down
0 .../with-security/check_advanced_settings.js → .../with_security/check_advanced_settings.js
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

unrelated to this PR. but we should avoid having duplicate files. we should do the current way of having a single file that does a conditional based on cypress env variables. example: https://github.com/opensearch-project/opensearch-dashboards-functional-test/blob/57db1eb9a3e4bd72372963a9ceee8c4a153bc13d/cypress/integration/plugins/security/tenants_spec.js#L11

Copy link
Member

Choose a reason for hiding this comment

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

this way we reduce the amount of files for local development and if we need to modify these tests we just neeed to do it once

Copy link
Member

Choose a reason for hiding this comment

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

Hey @kavilla, @AMoo-Miki is currently adding and testing this logic based on his future CI/CD. example:

OpenSearch-Dashboards/cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/dataset_selector.spec.js

Line 17 in 08bc81f

ifEnabled(['WORKSPACE', '!SECURITY']).describe(

As discussed with him before, for current test, we will use ciGroup 10 and then his PR will update all the tests in query enhancement.

File renamed without changes.
0 ...ation/with-security/check_default_page.js → ...ation/with_security/check_default_page.js
View file
Open in desktop
File renamed without changes.
0 ...n/with-security/check_filter_and_query.js → ...n/with_security/check_filter_and_query.js
View file
Open in desktop
File renamed without changes.
0 ...ration/with-security/check_loaded_data.js → ...ration/with_security/check_loaded_data.js
View file
Open in desktop
File renamed without changes.
0 ...tegration/with-security/check_timeline.js → ...tegration/with_security/check_timeline.js
View file
Open in desktop
File renamed without changes.
0 ...on/with-security/helpers/generate_data.js → ...on/with_security/helpers/generate_data.js
View file
Open in desktop
File renamed without changes.
0 ...egration/with-security/plugins/.gitignore → ...egration/with_security/plugins/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...thout-security/check_advanced_settings.js → ...thout_security/check_advanced_settings.js
View file
Open in desktop
File renamed without changes.
0 ...on/without-security/check_default_page.js → ...on/without_security/check_default_page.js
View file
Open in desktop
File renamed without changes.
0 ...ithout-security/check_filter_and_query.js → ...ithout_security/check_filter_and_query.js
View file
Open in desktop
File renamed without changes.
0 ...ion/without-security/check_loaded_data.js → ...ion/without_security/check_loaded_data.js
View file
Open in desktop
File renamed without changes.
0 ...ration/without-security/check_timeline.js → ...ration/without_security/check_timeline.js
View file
Open in desktop
File renamed without changes.
0 ...without-security/helpers/generate_data.js → ...without_security/helpers/generate_data.js
View file
Open in desktop
File renamed without changes.
0 ...ation/without-security/plugins/.gitignore → ...ation/without_security/plugins/.gitignore
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"release_note:generate": "scripts/use_node scripts/generate_release_note",
"cypress:run-without-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --env SECURITY_ENABLED=false",
"cypress:run-with-security": "env TZ=America/Los_Angeles NO_COLOR=1 cypress run --env SECURITY_ENABLED=true,openSearchUrl=https://localhost:9200,WAIT_FOR_LOADER_BUFFER_MS=500",
"osd:ciGroup10": "echo \"cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/query_enhancements/*.js\"",
"osd:ciGroup10": "echo \"cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/query_enhancements/*.js\"",
"osd:ciGroup11": "echo \"cypress/integration/dashboard_sanity_test.spec.js\"",
"generate:opensearchsqlantlr": "./node_modules/antlr4ng-cli/index.js -Dlanguage=TypeScript -o ./src/plugins/data/public/antlr/opensearch_sql/.generated -visitor -no-listener -Xexact-output-dir ./src/plugins/data/public/antlr/opensearch_sql/grammar/OpenSearchSQLLexer.g4 ./src/plugins/data/public/antlr/opensearch_sql/grammar/OpenSearchSQLParser.g4",
"generate:opensearchpplantlr": "./node_modules/antlr4ng-cli/index.js -Dlanguage=TypeScript -o ./src/plugins/data/public/antlr/opensearch_ppl/.generated -visitor -no-listener -Xexact-output-dir ./src/plugins/data/public/antlr/opensearch_ppl/grammar/OpenSearchPPLLexer.g4 ./src/plugins/data/public/antlr/opensearch_ppl/grammar/OpenSearchPPLParser.g4"
Expand Down
Loading