Skip to content

Commit cc59104

Browse files
Andrea Barbassovins01-4science
authored andcommitted
Merged in task/dspace-cris-2023_02_x/DSC-2443 (pull request DSpace#3571)
[DSC-2443] fix header e2e tests Approved-by: Francesco Molinaro
2 parents c937ace + e7f59f9 commit cc59104

3 files changed

Lines changed: 34 additions & 26 deletions

File tree

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
<div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
2-
<a href="javascript:void(0);" role="menuitem"
3-
[attr.aria-label]="'nav.language' |translate"
4-
aria-controls="language-menu-list"
5-
aria-haspopup="menu"
6-
[title]="'nav.language' | translate"
7-
(click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
8-
data-test="lang-switch"
9-
tabindex="0">
10-
<i class="fas fa-globe-asia fa-lg fa-fw"></i>
11-
</a>
12-
<ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
13-
<li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
14-
role="menuitem"
15-
(keyup.enter)="useLang(lang)"
16-
(click)="useLang(lang)"
17-
[class.active]="lang === translate.currentLang">
18-
{{ langLabel(lang) }}
19-
</li>
20-
</ul>
21-
</div>
1+
<ng-container *dsRenderOnlyForBrowser="true">
2+
<div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
3+
<a href="javascript:void(0);" role="menuitem"
4+
[attr.aria-label]="'nav.language' |translate"
5+
aria-controls="language-menu-list"
6+
aria-haspopup="menu"
7+
[title]="'nav.language' | translate"
8+
(click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
9+
data-test="lang-switch"
10+
tabindex="0">
11+
<i class="fas fa-globe-asia fa-lg fa-fw"></i>
12+
</a>
13+
<ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' | translate"
14+
id="language-menu-list" role="menu">
15+
<li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
16+
role="menuitem"
17+
(keyup.enter)="useLang(lang)"
18+
(click)="useLang(lang)"
19+
[class.active]="lang === translate.currentLang">
20+
{{ langLabel(lang) }}
21+
</li>
22+
</ul>
23+
</div>
24+
</ng-container>

src/app/shared/lang-switch/lang-switch.component.spec.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
99
import { LangSwitchComponent } from './lang-switch.component';
1010
import { LangConfig } from '../../../config/lang-config.interface';
1111
import { LocaleService } from '../../core/locale/locale.service';
12+
import { BrowserOnlyDirective } from '../utils/browser-only.directive';
1213

1314
// This test is completely independent from any message catalogs or keys in the codebase
1415
// The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -67,7 +68,9 @@ describe('LangSwitchComponent', () => {
6768
};
6869

6970
TestBed.configureTestingModule({
70-
imports: [HttpClientTestingModule, TranslateModule.forRoot(
71+
imports: [HttpClientTestingModule,
72+
BrowserOnlyDirective,
73+
TranslateModule.forRoot(
7174
{
7275
loader: { provide: TranslateLoader, useClass: CustomLoader }
7376
}

src/app/shared/shared.module.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ import { MetadataLinkViewOrcidComponent } from './metadata-link-view/metadata-li
364364
import { SwitchComponent } from './switch/switch.component';
365365
import {StickyPopoverDirective} from './metadata-link-view/sticky-popover.directive';
366366
import { SortPipe } from './utils/sort.pipe';
367+
import { BrowserOnlyDirective } from './utils/browser-only.directive';
367368

368369
const MODULES = [
369370
CommonModule,
@@ -640,10 +641,11 @@ const DIRECTIVES = [
640641
];
641642

642643
@NgModule({
643-
imports: [
644-
...MODULES,
645-
...ROOT_MODULES,
646-
],
644+
imports: [
645+
...MODULES,
646+
...ROOT_MODULES,
647+
BrowserOnlyDirective,
648+
],
647649
declarations: [
648650
...PIPES,
649651
...COMPONENTS,

0 commit comments

Comments
 (0)