Merge pull request #334 from MurhafSousli/dev

v8.0.0

Author: MurhafSousli

.github/workflows/integrate.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           node-version: 14
       - name: Install dependencies
-        run: npm install
+        run: npm ci
       - name: Build
         run: npm run build-lib
       - name: Test

.github/workflows/netlify.yml

@@ -14,9 +14,7 @@ jobs:
         with:
           node-version: 14
       - name: Install dependencies
-        run: npm install
-      - name: Build and link library
-        run: npm run build-lib && npm run link-lib
+        run: npm ci
       - name: Build demo
         run: npm run build-demo
       - name: Deploy to Netlify

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 8.0.0
+
+- feat: Add matcher feature to http module, closes [#254](https://github.com/MurhafSousli/ngx-progressbar/issues/254) in [a6ab70b](https://github.com/MurhafSousli/ngx-progressbar/pull/331/commits/a6ab70b3c2c9f15c2c0e71c45a88e9745f61202c) and [ce3c0d6](https://github.com/MurhafSousli/ngx-progressbar/pull/331/commits/ce3c0d6b86632c873689330cddea6a977aecf07a).
+- fix: Remove case-sensitive from `silentApis`, closes [#283](https://github.com/MurhafSousli/ngx-progressbar/issues/283) in [32da22c](https://github.com/MurhafSousli/ngx-progressbar/pull/331/commits/32da22c85e9d9ea8897f7cfb6f11ef1c69226a1a).
+- refactor: Change `zoom` to `transform: scale`, closes [#275](https://github.com/MurhafSousli/ngx-progressbar/issues/275) in [c78dff6](https://github.com/MurhafSousli/ngx-progressbar/pull/331/commits/c78dff66506aaedf41cd6d82e52944bbafa5748c).
+- Added unit tests
+
+### Breaking changes
+
+**Before:**
+
+- `silentApis` used to check the url using `url.startsWith()`
+
+**After:**
+
+- `silentApis` checks the url using `url.includes()`
+
+When `silentApis` is used along with `matcher` regex, it will check if the URL matches both cases, learn more at [wiki page](https://github.com/MurhafSousli/ngx-progressbar/wiki/HttpClient-requests).
+
+
 ## 7.0.0
 
 - Upgrade to Angular 13, closes [#319](https://github.com/MurhafSousli/ngx-progressbar/issues/319) in [fdf89a2](https://github.com/MurhafSousli/ngx-progressbar/pull/325/commits/fdf89a216f3b137e00b6f6f303840f32ad9f30e8).

package.json

@@ -7,7 +7,6 @@
     "build-lib": "ng build ngx-progressbar --configuration production",
     "test-lib": "ng test ngx-progressbar",
     "test-lib-headless": "ng test ngx-progressbar --watch=false --no-progress --browsers=ChromeHeadless",
-    "link-lib": "npm link dist/ngx-progressbar && npm link ngx-progressbar",
     "publish-lib": "npm publish dist/ngx-progressbar"
   },
   "private": true,

projects/ngx-progressbar/src/lib/ng-progress-router.service.spec.ts

@@ -0,0 +1,64 @@
+import { TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { NgProgressModule, NgProgress, NgProgressRef } from 'ngx-progressbar';
+import { NgProgressRouterModule } from 'ngx-progressbar/router';
+
+const CUSTOM_PROGRESS_ID: string = 'my-custom-progress';
+const CUSTOM_PROGRESS_DELAY: number = 200;
+
+@Component({
+  selector: 'page-1',
+  template: ''
+})
+export class Page1 {
+}
+
+@Component({
+  selector: 'page-2',
+  template: ''
+})
+export class Page2 {
+}
+
+describe(`NgProgressRouter`, () => {
+  let ngProgress: NgProgress;
+  let router: Router;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        NgProgressModule,
+        NgProgressRouterModule.withConfig({
+          id: CUSTOM_PROGRESS_ID,
+          delay: CUSTOM_PROGRESS_DELAY
+        }),
+        RouterTestingModule.withRoutes([
+          { path: '', component: Page1 },
+          { path: 'page2', component: Page2 }
+        ])
+      ],
+      declarations: [Page1, Page2]
+    }).compileComponents();
+
+    ngProgress = TestBed.inject(NgProgress);
+    router = TestBed.inject(Router);
+  });
+
+  it('should start/complete the progress bar on route change', (done: DoneFn) => {
+    const progressRef: NgProgressRef = ngProgress.ref(CUSTOM_PROGRESS_ID);
+    spyOn(progressRef, 'start');
+    spyOn(progressRef, 'complete');
+
+    router.navigate(['page2']).then(() => {
+      setTimeout(() => {
+        expect(progressRef.complete).toHaveBeenCalled();
+        done();
+      }, CUSTOM_PROGRESS_DELAY);
+    });
+
+    expect(progressRef.start).toHaveBeenCalled();
+  });
+});

projects/ngx-progressbar/src/lib/ng-progress.component.spec.ts

@@ -1,39 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { of } from 'rxjs';
-import { NgProgressComponent } from './ng-progress.component';
-import { NgProgress } from './ng-progress.service';
-
-class NgProgressStub {
-  config = {};
-
-  ref() {
-    return {
-      state: of(
-        {
-          active: true,
-          value: 5
-        }
-      )
-    };
-  }
-}
-
-describe('NgProgressComponent', () => {
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NgProgress, NgProgressComponent, NgProgressModule } from 'ngx-progressbar';
+
+describe('NgProgress Component', () => {
   let component: NgProgressComponent;
+  let ngProgress: NgProgress;
   let fixture: ComponentFixture<NgProgressComponent>;
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [NgProgressComponent],
-      imports: [
-        RouterTestingModule
-      ],
-      providers: [
-        { provide: NgProgress, useClass: NgProgressStub }
-      ]
-    }).compileComponents();
-  }));
+      imports: [NgProgressModule]
+    });
+
+    ngProgress = TestBed.inject(NgProgress);
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NgProgressComponent);
@@ -44,10 +23,29 @@ describe('NgProgressComponent', () => {
     expect(component).toBeDefined();
   });
 
-  // it('should destroy component without errors', () => {
-  //   const ngOnDestroySpy = spyOn(component, 'ngOnDestroy');
-  //   fixture.destroy();
-  //   component.ngOnDestroy();
-  //   expect(ngOnDestroySpy).toHaveBeenCalled();
-  // });
+  it('should start/complete the progress using the start/complete functions', (done: DoneFn) => {
+    const progressRef = ngProgress.ref();
+    spyOn(progressRef, 'start');
+    spyOn(progressRef, 'complete');
+    component.ngOnInit();
+
+    component.start();
+    expect(progressRef.start).toHaveBeenCalled();
+
+    setTimeout(() => {
+      component.complete();
+      expect(progressRef.complete).toHaveBeenCalled();
+      done();
+    }, 200);
+  });
+
+  it('should get true on isStarted when progress is started', (done: DoneFn) => {
+    component.ngOnInit();
+    component.start();
+
+    setTimeout(() => {
+      expect(component.isStarted).toBeTrue();
+      done();
+    });
+  });
 });