Skip to content

Commit

Permalink
More test fixings.
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Overbeck committed Dec 21, 2024
1 parent 93e245c commit bc75b69
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
8 changes: 4 additions & 4 deletions cypress/e2e/group2/notebooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ describe('Dockstore notebooks', () => {
it('should have /notebooks/<name> page for single notebook', () => {
cy.visit('/notebooks/' + name);
// Check the labels on the tabs.
cy.get('.mat-tab-list').contains('Info');
cy.get('.mat-tab-list').contains('Preview');
cy.get('.mat-tab-list').contains('Versions');
cy.get('.mat-tab-list').contains('Files');
cy.get('.mat-mdc-tab-list').contains('Info');
cy.get('.mat-mdc-tab-list').contains('Preview');
cy.get('.mat-mdc-tab-list').contains('Versions');
cy.get('.mat-mdc-tab-list').contains('Files');
// Should initially display the Info tab.
// Check for some key information.
cy.contains(name);
Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/immutableDatabaseTests/notebooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Notebooks Pages', () => {
cy.visit('/notebooks');
cy.url().should('contain', 'notebooks');
cy.get('[data-cy=header]').contains('h3', 'Notebooks');
cy.contains('Search notebooks');
cy.get('input[placeholder="Search notebooks"]');
cy.contains('Format');
cy.contains('Language');
});
Expand All @@ -43,12 +43,12 @@ describe('Notebooks Pages', () => {
describe('Notebooks should be visible', () => {
it('should be included in search', () => {
cy.visit('/search?entryType=notebooks&searchMode=files&notebooks');
cy.contains('.mat-tab-label', 'Notebooks');
cy.contains('.mat-mdc-tab', 'Notebooks');
});

it('should exist on starred page', () => {
cy.visit('/starred?tab=notebooks');
cy.contains('.mat-tab-label', 'Notebooks');
cy.contains('.mat-mdc-tab', 'Notebooks');
});

it('should exist on dashboard', () => {
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/immutableDatabaseTests/workflowDetails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('Dockstore Workflow Details', () => {
describe('Change tab to Executions', () => {
it('Should see No Metrics banner', () => {
cy.visit('/workflows/github.com/A/l');
cy.get('.mat-tab-label').should('have.length', 7);
cy.get('.mat-mdc-tab').should('have.length', 7);
goToTab('Metrics');
cy.url().should('eq', Cypress.config().baseUrl + '/workflows/github.com/A/l:master?tab=metrics');
cy.get('[data-cy=no-metrics-banner]').should('be.visible');
Expand Down Expand Up @@ -143,7 +143,7 @@ describe('Test bble', () => {
goToTab('Files');
cy.get('[data-cy=primary-descriptor-bubble]').should('be.visible');
cy.get('mat-form-field').click();
cy.contains('.mat-option-text', 'arguments.cwl').click();
cy.contains('mat-option', 'arguments.cwl').click();
cy.get('[data-cy=primary-descriptor-bubble]').should('not.exist');
cy.get('[data-cy=go-to-primary-icon]').should('be.visible').click();
cy.get('[data-cy=primary-descriptor-bubble]').should('be.visible');
Expand Down
4 changes: 2 additions & 2 deletions cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function goToTab(tabName: string): void {
}

export function assertVisibleTab(tabName: string): void {
cy.get('.mat-tab-labels').should('be.visible').contains('div', tabName).should('be.visible');
cy.get('.mdc-tab').should('be.visible').contains('div', tabName).should('be.visible');
}

/**
Expand All @@ -49,7 +49,7 @@ export function clickFirstActionsButtonPrivate(): void {
}

export function isActiveTab(tabName: string): void {
cy.contains('.mat-tab-label', tabName).should('have.class', 'mat-tab-label-active');
cy.contains('.mat-mdc-tab', tabName).should('have.class', 'mat-mdc-focus-indicator');
}

export function assertNoTab(tabName: string): any {
Expand Down
9 changes: 1 addition & 8 deletions src/app/container/container.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -340,14 +340,7 @@ <h3>
<div class="h5">Docker Pull Command</div>
<mat-divider></mat-divider>
<div class="input-group pt-3">
<input
data-cy="docker-pull-command"
type="text"
class="form-control selected-item"
[(ngModel)]="dockerPullCmd"
value="{{ dockerPullCmd }}"
readonly
/>
<input type="text" class="form-control selected-item" [(ngModel)]="dockerPullCmd" value="{{ dockerPullCmd }}" readonly />
<span class="input-group-btn">
<button
class="btn btn-default form-sm-button-material"
Expand Down

0 comments on commit bc75b69

Please sign in to comment.