From 6ac15b4b24a24b3992f7bb9de4e1105cc6477c4b Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Tue, 31 Jan 2023 14:19:37 -0800 Subject: [PATCH 1/3] Fix flaky tests. https://ucsc-cgl.atlassian.net/browse/SEAB-5217 It was failing when running locally about 50% of the time. With the "fix", ran 10 times in a row without an error. --- cypress/e2e/group3/githubAppTools.ts | 2 ++ src/app/search/map-friendly-values.pipe.ts | 7 +++++++ src/app/search/state/search.service.ts | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cypress/e2e/group3/githubAppTools.ts b/cypress/e2e/group3/githubAppTools.ts index b3e8fff313..4a5815be0d 100644 --- a/cypress/e2e/group3/githubAppTools.ts +++ b/cypress/e2e/group3/githubAppTools.ts @@ -146,11 +146,13 @@ describe('GitHub App Tools', () => { cy.contains('Tool Information'); cy.contains('Tool Version Information'); cy.get('[data-cy=workflowTitle]').contains('github.com/C/test-github-app-tools/md5sum:invalidTool'); + cy.wait(1000); // Ugh, but clicking too soon seems to cause SEAB-5217 goToTab('Versions'); cy.contains('main').click(); cy.get('[data-cy=workflowTitle]').contains('github.com/C/test-github-app-tools/md5sum:main'); cy.get('#starringButton').click(); cy.get('#starCountButton').should('contain', '1'); + cy.wait(1000); // Ugh, but clicking too soon seems to cause SEAB-5217 goToTab('Info'); cy.get('[data-cy=trs-link]').contains('TRS: github.com/C/test-github-app-tools/md5sum'); }); diff --git a/src/app/search/map-friendly-values.pipe.ts b/src/app/search/map-friendly-values.pipe.ts index b0512ec1bf..285e574c4c 100644 --- a/src/app/search/map-friendly-values.pipe.ts +++ b/src/app/search/map-friendly-values.pipe.ts @@ -112,6 +112,13 @@ export class MapFriendlyValuesPipe implements PipeTransform { ['INSTALL', 'Install'], ]), ], + [ + 'openData', + new Map([ + ['0', 'No public test data'], + ['1', 'Has public test data'], + ]), + ], ]); /** diff --git a/src/app/search/state/search.service.ts b/src/app/search/state/search.service.ts index 30a40b4914..658ac80cf0 100644 --- a/src/app/search/state/search.service.ts +++ b/src/app/search/state/search.service.ts @@ -73,7 +73,7 @@ export class SearchService { * @private * @memberof SearchService */ - public exclusiveFilters = ['verified', 'private_access', 'has_checker']; + public exclusiveFilters = ['verified', 'private_access', 'has_checker', 'openData']; constructor( private searchStore: SearchStore, private searchQuery: SearchQuery, @@ -511,6 +511,7 @@ export class SearchService { ['VerifiedPlatforms', 'verified_platforms.keyword'], ['Category', 'categories.name.keyword'], ['Language Versions', 'descriptor_type_versions.keyword'], + ['Open Data', 'openData'], ]); } @@ -532,6 +533,7 @@ export class SearchService { ['verified_platforms.keyword', 'Verified Platforms'], ['categories.name.keyword', 'Category'], ['descriptor_type_versions.keyword', 'Language Versions'], + ['openData', 'Open Data'], ]); } @@ -552,6 +554,7 @@ export class SearchService { 'descriptor_type_versions.keyword', 'Indicates that the tool or workflow contains at least one version that is written with the workflow language version', ], + ['openData', 'Indicates whether an entry has a test parameter file with all publicly accessible data.'], ]); } @@ -573,6 +576,7 @@ export class SearchService { ['input_file_formats.value.keyword', new SubBucket()], ['output_file_formats.value.keyword', new SubBucket()], ['has_checker', new SubBucket()], + ['openData', new SubBucket()], ]); } From df5d6be69398b2e4c634483fa7f4241a63fc8f77 Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Tue, 31 Jan 2023 14:39:11 -0800 Subject: [PATCH 2/3] Whoops, wrong branch pulled in --- src/app/search/map-friendly-values.pipe.ts | 7 ------- src/app/search/state/search.service.ts | 6 +----- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/app/search/map-friendly-values.pipe.ts b/src/app/search/map-friendly-values.pipe.ts index 285e574c4c..b0512ec1bf 100644 --- a/src/app/search/map-friendly-values.pipe.ts +++ b/src/app/search/map-friendly-values.pipe.ts @@ -112,13 +112,6 @@ export class MapFriendlyValuesPipe implements PipeTransform { ['INSTALL', 'Install'], ]), ], - [ - 'openData', - new Map([ - ['0', 'No public test data'], - ['1', 'Has public test data'], - ]), - ], ]); /** diff --git a/src/app/search/state/search.service.ts b/src/app/search/state/search.service.ts index 658ac80cf0..30a40b4914 100644 --- a/src/app/search/state/search.service.ts +++ b/src/app/search/state/search.service.ts @@ -73,7 +73,7 @@ export class SearchService { * @private * @memberof SearchService */ - public exclusiveFilters = ['verified', 'private_access', 'has_checker', 'openData']; + public exclusiveFilters = ['verified', 'private_access', 'has_checker']; constructor( private searchStore: SearchStore, private searchQuery: SearchQuery, @@ -511,7 +511,6 @@ export class SearchService { ['VerifiedPlatforms', 'verified_platforms.keyword'], ['Category', 'categories.name.keyword'], ['Language Versions', 'descriptor_type_versions.keyword'], - ['Open Data', 'openData'], ]); } @@ -533,7 +532,6 @@ export class SearchService { ['verified_platforms.keyword', 'Verified Platforms'], ['categories.name.keyword', 'Category'], ['descriptor_type_versions.keyword', 'Language Versions'], - ['openData', 'Open Data'], ]); } @@ -554,7 +552,6 @@ export class SearchService { 'descriptor_type_versions.keyword', 'Indicates that the tool or workflow contains at least one version that is written with the workflow language version', ], - ['openData', 'Indicates whether an entry has a test parameter file with all publicly accessible data.'], ]); } @@ -576,7 +573,6 @@ export class SearchService { ['input_file_formats.value.keyword', new SubBucket()], ['output_file_formats.value.keyword', new SubBucket()], ['has_checker', new SubBucket()], - ['openData', new SubBucket()], ]); } From 71c7b2fab6388b7c7f62e86ba3842f54a0d2480c Mon Sep 17 00:00:00 2001 From: Charles Overbeck Date: Wed, 1 Feb 2023 11:30:16 -0800 Subject: [PATCH 3/3] Better fix. --- cypress/e2e/group3/githubAppTools.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/group3/githubAppTools.ts b/cypress/e2e/group3/githubAppTools.ts index 4a5815be0d..27e031fe5d 100644 --- a/cypress/e2e/group3/githubAppTools.ts +++ b/cypress/e2e/group3/githubAppTools.ts @@ -142,17 +142,20 @@ describe('GitHub App Tools', () => { selectGitHubAppTool('test-github-app-tools/md5sum'); cy.get('[data-cy=viewPublicWorkflowButton]').click(); + + // Look for something that is on public page that is not in My Tools; avoids detached DOM when clicking on versions below; also + // ensures the subsequent checks below are checking the public page and not the My Tools Page + cy.get('app-launch-third-party'); + cy.get('[data-cy=tool-icon]').should('exist'); cy.contains('Tool Information'); cy.contains('Tool Version Information'); cy.get('[data-cy=workflowTitle]').contains('github.com/C/test-github-app-tools/md5sum:invalidTool'); - cy.wait(1000); // Ugh, but clicking too soon seems to cause SEAB-5217 goToTab('Versions'); cy.contains('main').click(); cy.get('[data-cy=workflowTitle]').contains('github.com/C/test-github-app-tools/md5sum:main'); cy.get('#starringButton').click(); cy.get('#starCountButton').should('contain', '1'); - cy.wait(1000); // Ugh, but clicking too soon seems to cause SEAB-5217 goToTab('Info'); cy.get('[data-cy=trs-link]').contains('TRS: github.com/C/test-github-app-tools/md5sum'); });