From d449bd70a08e84677b0728f3680dd96d3ce48af3 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Thu, 12 Sep 2019 16:57:11 -0700
Subject: [PATCH] Fixes unit test and problem in map fuction.
---
src/app/core/auth/auth-request.service.ts | 10 ++++++++--
.../core/submission/submission-rest.service.spec.ts | 2 ++
src/app/core/submission/submission-rest.service.ts | 5 ++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 4c8ce273bd..e717de9df9 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -44,7 +44,10 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(),
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
- map ((request: PostRequest) => request.responseMsToLive = 0),
+ map ((request: PostRequest) => {
+ request.responseMsToLive = 0;
+ return request;
+ }),
tap((request: PostRequest) => this.requestService.configure(request)),
mergeMap((request: PostRequest) => this.fetchRequest(request)),
distinctUntilChanged());
@@ -56,7 +59,10 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(),
map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
- map ((request: GetRequest) => request.responseMsToLive = 0),
+ map ((request: GetRequest) => {
+ request.responseMsToLive = 0;
+ return request;
+ }),
tap((request: GetRequest) => this.requestService.configure(request)),
mergeMap((request: GetRequest) => this.fetchRequest(request)),
distinctUntilChanged());
diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 6f3e24e9c4..8e47bbd994 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -59,6 +59,8 @@ describe('SubmissionRestService test suite', () => {
describe('getDataById', () => {
it('should configure a new SubmissionRequest', () => {
const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref);
+ // set cache time to zero
+ expected.responseMsToLive = 0;
scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe());
scheduler.flush();
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index fb15975caa..58aa507314 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -109,7 +109,10 @@ export class SubmissionRestService {
filter((href: string) => isNotEmpty(href)),
distinctUntilChanged(),
map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
- map ((request: RestRequest) => request.responseMsToLive = 0),
+ map ((request: RestRequest) => {
+ request.responseMsToLive = 0;
+ return request;
+ }),
tap((request: RestRequest) => this.requestService.configure(request)),
flatMap(() => this.fetchRequest(requestId)),
distinctUntilChanged());
--
GitLab