Skip to content

Commit

Permalink
Merge branch 'UoEMainLibrary-dspace-7_x' into playground-UoEMainLibra…
Browse files Browse the repository at this point in the history
…ry-dspace-7_x
  • Loading branch information
dspeed2 committed Aug 28, 2024
2 parents daec56b + 6844d13 commit 8fc798b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/app/admin/admin-sidebar/admin-sidebar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ <h4 class="section-header-text mb-0">{{ 'menu.header.admin' | translate }}</h4>
</div>
<div class="navbar-nav">
<div class="sidebar-section" id="sidebar-collapse-toggle">
<!-- <a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
<a class="nav-item nav-link sidebar-section d-flex flex-row flex-nowrap"
href="javascript:void(0);"
(click)="toggle($event)"
(keyup.space)="toggle($event)"
> -->
>
<div class="shortcut-icon">
<i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
[title]="'menu.section.icon.pin' | translate"></i>
Expand All @@ -49,7 +49,7 @@ <h4 class="section-header-text mb-0">{{ 'menu.header.admin' | translate }}</h4>
<span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
<span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
</div>
<!-- </a> -->
</a>
</div>
</div>
</nav>
2 changes: 1 addition & 1 deletion src/app/item-page/full/full-item-page.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe('FullItemPageComponent', () => {
});

it('should display the item\'s metadata', () => {
const table = fixture.debugElement.query(By.css('table'));
const table = fixture.debugElement.query(By.css('div.table-responsive'));
for (const metadatum of mockItem.allMetadata(Object.keys(mockItem.metadata))) {
expect(table.nativeElement.innerHTML).toContain(metadatum.value);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,20 @@ describe('StatisticsTableComponent', () => {

it ('should display a table with the correct data', () => {

expect(de.query(By.css('table'))).toBeTruthy();
expect(de.query(By.css('div.table'))).toBeTruthy();

expect(de.query(By.css('th.views-header')).nativeElement.innerText)
expect(de.query(By.css('div.views-header')).nativeElement.innerText)
.toEqual('views');
expect(de.query(By.css('th.downloads-header')).nativeElement.innerText)
expect(de.query(By.css('div.downloads-header')).nativeElement.innerText)
.toEqual('downloads');

expect(de.query(By.css('td.item_1-views-data')).nativeElement.innerText)
expect(de.query(By.css('div.item_1-views-data')).nativeElement.innerText)
.toEqual('7');
expect(de.query(By.css('td.item_1-downloads-data')).nativeElement.innerText)
expect(de.query(By.css('div.item_1-downloads-data')).nativeElement.innerText)
.toEqual('4');
expect(de.query(By.css('td.item_2-views-data')).nativeElement.innerText)
expect(de.query(By.css('div.item_2-views-data')).nativeElement.innerText)
.toEqual('8');
expect(de.query(By.css('td.item_2-downloads-data')).nativeElement.innerText)
expect(de.query(By.css('div.item_2-downloads-data')).nativeElement.innerText)
.toEqual('8');
});
});
Expand Down
6 changes: 3 additions & 3 deletions src/app/thumbnail/thumbnail.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ describe('ThumbnailComponent', () => {

fixture.detectChanges();
const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt + ' for PDF');
});
});

Expand Down Expand Up @@ -271,7 +271,7 @@ describe('ThumbnailComponent', () => {
comp.ngOnChanges({});
fixture.detectChanges();
const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt + ' for PDF');
});
});

Expand Down Expand Up @@ -311,7 +311,7 @@ describe('ThumbnailComponent', () => {
comp.ngOnChanges({});
fixture.detectChanges();
const image: HTMLElement = de.query(By.css('img')).nativeElement;
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt + ' for PDF');
});
});

Expand Down

0 comments on commit 8fc798b

Please sign in to comment.