diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts index 1a9b841eb7..9852216e43 100644 --- a/cypress/e2e/header.cy.ts +++ b/cypress/e2e/header.cy.ts @@ -8,11 +8,6 @@ describe('Header', () => { cy.get('ds-header').should('be.visible'); // Analyze for accessibility - testA11y({ - include: ['ds-header'], - exclude: [ - ['#search-navbar-container'] // search in navbar has duplicative ID. Will be fixed in #1174 - ], - }); + testA11y('ds-header'); }); }); diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html index 02a9890502..e9b5f285fb 100644 --- a/src/app/search-navbar/search-navbar.component.html +++ b/src/app/search-navbar/search-navbar.component.html @@ -1,4 +1,4 @@ -
+
{ let fixture: ComponentFixture; let mockSearchService: any; let router: Router; - let routerStub; - let paginationService; beforeEach(waitForAsync(() => { mockSearchService = { @@ -27,12 +24,6 @@ describe('SearchNavbarComponent', () => { } }; - routerStub = { - navigate: (commands) => commands - }; - - paginationService = new PaginationServiceStub(); - TestBed.configureTestingModule({ imports: [ FormsModule, @@ -72,7 +63,7 @@ describe('SearchNavbarComponent', () => { spyOn(component, 'expand').and.callThrough(); spyOn(component, 'onSubmit').and.callThrough(); spyOn(router, 'navigate'); - const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon')); + const searchIcon = fixture.debugElement.query(By.css('form .submit-icon')); searchIcon.triggerEventHandler('click', { preventDefault: () => {/**/ } @@ -88,7 +79,7 @@ describe('SearchNavbarComponent', () => { describe('empty query', () => { describe('press submit button', () => { beforeEach(fakeAsync(() => { - const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon')); + const searchIcon = fixture.debugElement.query(By.css('form .submit-icon')); searchIcon.triggerEventHandler('click', { preventDefault: () => {/**/ } @@ -97,7 +88,7 @@ describe('SearchNavbarComponent', () => { fixture.detectChanges(); })); it('to search page with empty query', () => { - const extras: NavigationExtras = {queryParams: { query: '' }, queryParamsHandling: 'merge'}; + const extras: NavigationExtras = { queryParams: { query: '' }, queryParamsHandling: 'merge' }; expect(component.onSubmit).toHaveBeenCalledWith({ query: '' }); expect(router.navigate).toHaveBeenCalledWith(['search'], extras); }); @@ -109,20 +100,20 @@ describe('SearchNavbarComponent', () => { beforeEach(async () => { await fixture.whenStable(); fixture.detectChanges(); - searchInput = fixture.debugElement.query(By.css('#search-navbar-container form input')); + searchInput = fixture.debugElement.query(By.css('form input')); searchInput.nativeElement.value = 'test'; searchInput.nativeElement.dispatchEvent(new Event('input')); fixture.detectChanges(); }); describe('press submit button', () => { beforeEach(fakeAsync(() => { - const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon')); + const searchIcon = fixture.debugElement.query(By.css('form .submit-icon')); searchIcon.triggerEventHandler('click', null); tick(); fixture.detectChanges(); })); it('to search page with query', async () => { - const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge'}; + const extras: NavigationExtras = { queryParams: { query: 'test' }, queryParamsHandling: 'merge' }; expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' }); expect(router.navigate).toHaveBeenCalledWith(['search'], extras);