Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix the tests

Roland Geider7ea5979b3da5
diff --git a/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts b/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
index 28ab8a515..d3459652d 100644
--- a/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
+++ b/angular/src/app/exercise/exercise-detail/exercise-detail.component.spec.ts
@@ -1,19 +1,32 @@
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {ActivatedRoute} from '@angular/router';
+import {RouterTestingModule} from '@angular/router/testing';
import {ExerciseService} from '../exercise.service';
-import { exercise1 } from '../test-data/exercise';
+import {exercise1} from '../test-data/exercise';
import {ExerciseDetailComponent} from './exercise-detail.component';
-describe('ExerciseComponent', () => {
+describe('ExerciseDetailComponent', () => {
let component: ExerciseDetailComponent;
let fixture: ComponentFixture<ExerciseDetailComponent>;
+ const fakeActivatedRoute = {
+ snapshot: {
+ queryParamMap: {
+ get(): number {
+ return 6;
+ }
+ }
+ }
+ };
+
+
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ExerciseDetailComponent],
- imports: [HttpClientTestingModule],
- providers: [ExerciseService]
+ imports: [HttpClientTestingModule, RouterTestingModule],
+ providers: [ExerciseService, {provide: ActivatedRoute, useValue: fakeActivatedRoute}]
})
.compileComponents();
});
diff --git a/angular/src/app/exercise/exercise-edit/exercise-edit.component.spec.ts b/angular/src/app/exercise/exercise-edit/exercise-edit.component.spec.ts
index 2afe7561c..e5ef22639 100644
--- a/angular/src/app/exercise/exercise-edit/exercise-edit.component.spec.ts
+++ b/angular/src/app/exercise/exercise-edit/exercise-edit.component.spec.ts
@@ -1,10 +1,7 @@
import {HttpClientTestingModule} from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import {FormBuilder} from '@angular/forms';
-import {WeightService} from '../../weight/weight.service';
import {ExerciseService} from '../exercise.service';
-import {Category} from '../models/exercises/category.model';
-import {Exercise} from '../models/exercises/exercise.model';
import {exercise1} from '../test-data/exercise';
import { ExerciseEditComponent } from './exercise-edit.component';
diff --git a/angular/src/app/exercise/exercise-preview/exercise-preview.component.spec.ts b/angular/src/app/exercise/exercise-preview/exercise-preview.component.spec.ts
index 52a94f114..e2421f45c 100644
--- a/angular/src/app/exercise/exercise-preview/exercise-preview.component.spec.ts
+++ b/angular/src/app/exercise/exercise-preview/exercise-preview.component.spec.ts
@@ -1,4 +1,8 @@
+import {HttpClientTestingModule} from '@angular/common/http/testing';
import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {ExerciseDetailComponent} from '../exercise-detail/exercise-detail.component';
+import {ExerciseService} from '../exercise.service';
+import {exercise1} from '../test-data/exercise';
import { ExercisePreviewComponent } from './exercise-preview.component';
@@ -8,14 +12,17 @@ describe('ExercisePreviewComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
- declarations: [ ExercisePreviewComponent ]
+ declarations: [ExercisePreviewComponent],
+ imports: [HttpClientTestingModule],
+ providers: [ExerciseService]
})
- .compileComponents();
+ .compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(ExercisePreviewComponent);
component = fixture.componentInstance;
+ component.exercise = exercise1;
fixture.detectChanges();
});
diff --git a/angular/src/app/exercise/test-data/exercise.ts b/angular/src/app/exercise/test-data/exercise.ts
index 3bea68ef4..4486f6271 100644
--- a/angular/src/app/exercise/test-data/exercise.ts
+++ b/angular/src/app/exercise/test-data/exercise.ts
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import {Category} from '../models/exercises/category.model';
-import {Exercise} from '../models/exercises/exercise.model';
+
+import {Category} from '../models/category.model';
+import {Exercise} from '../models/exercise.model';
export const category1 = new Category(1, 'Arms');
export const category2 = new Category(2, 'Back');