hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

80084: Fix unit test & LGTM issues

Browse Source
This commit is contained in:
Yura Bondarenko
2021-06-14 10:50:59 +02:00
parent 04b4f1cf58
commit 34b117efe3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/core/metadata/metadata.service.spec.ts
View File

@@ -47,13 +47,13 @@ import { PageInfo } from '../shared/page-info.model';
import { UUIDService } from '../shared/uuid.service'; import { UUIDService } from '../shared/uuid.service';
import { MetadataService } from './metadata.service'; import { MetadataService } from './metadata.service';
import { environment } from '../../../environments/environment';
import { storeModuleConfig } from '../../app.reducer'; import { storeModuleConfig } from '../../app.reducer';
import { RootDataService } from '../data/root-data.service'; import { RootDataService } from '../data/root-data.service';
import { Root } from '../data/root.model'; import { Root } from '../data/root.model';
import { Bundle } from '../shared/bundle.model'; import { Bundle } from '../shared/bundle.model';
import { BundleDataService } from '../data/bundle-data.service'; import { BundleDataService } from '../data/bundle-data.service';
import { createPaginatedList } from '../../shared/testing/utils.test'; import { createPaginatedList } from '../../shared/testing/utils.test';
import { HardRedirectService } from '../services/hard-redirect.service';
/* tslint:disable:max-classes-per-file */ /* tslint:disable:max-classes-per-file */
@Component({ @Component({
@@ -96,6 +96,7 @@ describe('MetadataService', () => {
let authService: AuthService; let authService: AuthService;
let rootService: RootDataService; let rootService: RootDataService;
let translateService: TranslateService; let translateService: TranslateService;
let hardRedirectService: HardRedirectService;
let location: Location; let location: Location;
let router: Router; let router: Router;
@@ -147,6 +148,9 @@ describe('MetadataService', () => {
dspaceVersion: 'mock-dspace-version' dspaceVersion: 'mock-dspace-version'
})) }))
}); });
hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
getRequestOrigin: 'https://request.org',
});
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
@@ -187,6 +191,7 @@ describe('MetadataService', () => {
{ provide: BitstreamDataService, useValue: bitstreamDataService }, { provide: BitstreamDataService, useValue: bitstreamDataService },
{ provide: BundleDataService, useValue: bundleDataService }, { provide: BundleDataService, useValue: bundleDataService },
{ provide: RootDataService, useValue: rootService }, { provide: RootDataService, useValue: rootService },
{ provide: HardRedirectService, useValue: hardRedirectService },
Meta, Meta,
Title, Title,
// tslint:disable-next-line:no-empty // tslint:disable-next-line:no-empty
@@ -229,7 +234,7 @@ describe('MetadataService', () => {
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']); router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick(); tick();
expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document'); expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download'); expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
})); }));
it('items page should set meta tags as published Technical Report', fakeAsync(() => { it('items page should set meta tags as published Technical Report', fakeAsync(() => {
@@ -283,7 +288,7 @@ describe('MetadataService', () => {
spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock))); spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']); router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick(); tick();
expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'); expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
})); }));
}); });
@@ -322,7 +327,7 @@ describe('MetadataService', () => {
bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([], MockBitstream3)); bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([], MockBitstream3));
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']); router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick(); tick();
expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'); expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
})); }));
describe('no primary Bitstream', () => { describe('no primary Bitstream', () => {
@@ -331,7 +336,7 @@ describe('MetadataService', () => {
bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([MockBitstream3])); bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([MockBitstream3]));
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']); router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick(); tick();
expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'); expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
})); }));
it('should link to first Bitstream with allowed format', fakeAsync(() => { it('should link to first Bitstream with allowed format', fakeAsync(() => {
@@ -345,7 +350,7 @@ describe('MetadataService', () => {
router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']); router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
tick(); tick();
expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download'); expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download');
})); }));
}); });
}); });

1
src/app/core/metadata/metadata.service.ts
View File

@@ -23,7 +23,6 @@ import {
getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload,
getFirstCompletedRemoteData getFirstCompletedRemoteData
} from '../shared/operators'; } from '../shared/operators';
import { environment } from '../../../environments/environment';
import { RootDataService } from '../data/root-data.service'; import { RootDataService } from '../data/root-data.service';
import { getBitstreamDownloadRoute } from '../../app-routing-paths'; import { getBitstreamDownloadRoute } from '../../app-routing-paths';
import { BundleDataService } from '../data/bundle-data.service'; import { BundleDataService } from '../data/bundle-data.service';