Change Action script to merge reports

Author: fasterinnerlooper

.github/workflows/coverage.yml

@@ -36,11 +36,17 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Run the tests
+      - name: Run unit tests
+        run: npm run test:coverage
+
+      - name: Upload unit test coverage to Codecov
+        uses: codecov/codecov-action@v1
+
+      - name: Run Cypress tests
         run: npm run e2e:ci
 
-      - name: Covert test results
-        run: npx nyc report --reporter=json --reporter=html
+      - name: Convert test results
+        run: npx nyc report --reporter=json
 
-      - name: Upload coverage to Codecov
+      - name: Merge e2e coverage
         uses: codecov/codecov-action@v1

.gitignore

@@ -38,6 +38,7 @@ speed-measure-plugin*.json
 /.sass-cache
 /connect.lock
 /coverage
+/.nyc_output
 /libpeerconnection.log
 npm-debug.log
 yarn-error.log

src/app/core/services/auth.service.spec.ts

@@ -0,0 +1,14 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AuthService } from './auth.service';
+
+let service: AuthService;
+
+beforeEach(() => {
+  TestBed.configureTestingModule({ providers: [AuthService], imports: [HttpClientTestingModule] });
+});
+
+it('should create', () => {
+  service = TestBed.inject(AuthService);
+  expect(service).toBeTruthy();
+});

src/app/features/after-login/after-login.component.spec.ts

@@ -1,5 +1,5 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { MatNativeDateModule } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { ScamComponent } from '@shared/components/scam/scam.component';
@@ -11,13 +11,15 @@ describe('AfterLoginComponent', () => {
   let component: AfterLoginComponent;
   let fixture: ComponentFixture<AfterLoginComponent>;
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [AfterLoginComponent, ScamComponent],
-      imports: [SharedModule, MatDatepickerModule, MatNativeDateModule],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA],
-    }).compileComponents();
-  });
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [AfterLoginComponent, ScamComponent],
+        imports: [SharedModule, MatDatepickerModule, MatNativeDateModule],
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      }).compileComponents();
+    })
+  );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AfterLoginComponent);