Fix unit tests and ensure forceRefresh keeps working even when the ur…

…l doesn't change

src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.spec.ts

@@ -120,6 +120,7 @@ describe('PaginationBaseService', () => {
     httpMock.expectOne('/users?page=1&pageSize=20');
     httpMock.verify();
     service.forceRefresh();
+    await delay(1);
     httpMock.expectOne('/users?page=1&pageSize=20');
     httpMock.verify();
   }));
@@ -148,13 +149,28 @@ describe('PaginationBaseService', () => {
     expect(hasReceivedResponse).toBeFalsy();
   }));
 
-  it('cancels first request when second request send', async(async () => {
+  it('cancels first request when second request sent', async(async () => {
     let service = getService();
     service.baseUrl = '/users';
     await delay(1);
     let httpMock = getHttpMock();
     const firstRequest = httpMock.expectOne('/users?page=1&pageSize=20');
     service.forceRefresh();
+    await delay(1);
+    const secondRequest = httpMock.expectOne('/users?page=1&pageSize=20');
+    expect(firstRequest.cancelled).toBeTruthy();
+    expect(secondRequest.cancelled).toBeFalsy();
+  }));
+
+  it('does not send two requests when calling forceRefresh twice subsequently', async(async () => {
+    let service = getService();
+    service.baseUrl = '/users';
+    await delay(1);
+    let httpMock = getHttpMock();
+    const firstRequest = httpMock.expectOne('/users?page=1&pageSize=20');
+    service.forceRefresh();
+    service.forceRefresh();
+    await delay(1);
     const secondRequest = httpMock.expectOne('/users?page=1&pageSize=20');
     expect(firstRequest.cancelled).toBeTruthy();
     expect(secondRequest.cancelled).toBeFalsy();
@@ -173,6 +189,7 @@ describe('PaginationBaseService', () => {
     expect(hasReceivedResponse).toBeFalsy();
     httpMock.verify();
     service.forceRefresh();
+    await delay(1);
     const secondRequest = httpMock.expectOne('/users?page=1&pageSize=20');
     secondRequest.flush({});
     expect(hasReceivedResponse).toBeTruthy();
@@ -237,6 +254,7 @@ describe('PaginationBaseService', () => {
       });
 
     requeryAction(service); // This is currently either calling 'forceRefresh()' or 'requery()'
+    await delay(1);
 
     const secondRequest = httpMock.expectOne('/users?page=1&pageSize=20');
     const secondPaginationResponse: PaginationResult<User> = {

src/ng-lightquery/projects/ng-lightquery/src/lib/pagination-base.service.ts

@@ -20,9 +20,8 @@ export abstract class PaginationBaseService<T> {
   private forceRefreshUrl = new Subject<string>();
 
   constructor(protected http: HttpClient) {
-    merge(this.requestUrl, this.forceRefreshUrl)
+    merge(this.requestUrl.pipe(distinctUntilChanged()), this.forceRefreshUrl)
       .pipe(
-        distinctUntilChanged(),
         // We're putting a 0 (zero) debounce time here, mostly to
         // ensure that when multiple changes are applied via code, e.g.
         // setting a page number and a query parameter, we don't send two requests