test(search): move to speculoos

davinkevin · Jul 1, 2018 · 5fb2e5c · 5fb2e5c
1 parent df59983
commit 5fb2e5c
Show file tree

Hide file tree

Showing 10 changed files with 680 additions and 946 deletions.
diff --git a/frontend-angular/package.json b/frontend-angular/package.json
@@ -36,7 +36,6 @@
     "core-js": "^2.4.1",
     "font-awesome": "^4.7.0",
     "hammerjs": "^2.0.8",
-    "jasmine-marbles": "^0.3.1",
     "material-design-icons": "^3.0.1",
     "ng2-truncate": "^1.3.11",
     "rxjs": "^6.2.1",
@@ -54,6 +53,7 @@
     "@types/node": "~6.0.60",
     "codelyzer": "^4.0.1",
     "jasmine-core": "~2.8.0",
+    "jasmine-marbles": "^0.3.1",
     "jasmine-spec-reporter": "~4.2.1",
     "jest": "^22.4.2",
     "jest-preset-angular": "^5.2.1",
@@ -62,6 +62,7 @@
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
+    "ngx-speculoos": "^0.2.3",
     "prettier": "1.10.2",
     "protractor": "~5.1.2",
     "ts-node": "~4.1.0",

diff --git a/frontend-angular/src/app/search/resolver/search-query.resolver.spec.ts b/frontend-angular/src/app/search/resolver/search-query.resolver.spec.ts
@@ -10,7 +10,7 @@ describe('SearchQueryResolver', () => {
 
 	beforeEach(() => {
 		TestBed.configureTestingModule({
-			imports: [StoreModule.forRoot([]), StoreModule.forFeature('search', fromSearch.reducer)],
+			imports: [StoreModule.forRoot([]), StoreModule.forFeature('search', fromSearch.search)],
 			providers: [SearchQueryResolver]
 		});
 		resolver = TestBed.get(SearchQueryResolver);

diff --git a/frontend-angular/src/app/search/resolver/search.resolver.spec.ts b/frontend-angular/src/app/search/resolver/search.resolver.spec.ts
@@ -257,7 +257,7 @@ describe('SearchResolver', () => {
 
 	beforeEach(() => {
 		TestBed.configureTestingModule({
-			imports: [StoreModule.forRoot([]), StoreModule.forFeature('search', fromSearch.reducer)],
+			imports: [StoreModule.forRoot([]), StoreModule.forFeature('search', fromSearch.search)],
 			providers: [SearchResolver]
 		});
 

diff --git a/frontend-angular/src/app/search/search.component.html b/frontend-angular/src/app/search/search.component.html
@@ -71,7 +71,6 @@
   </mat-card>
 </div>
 
-
 <mat-paginator [length]="items.totalElements"
                [hidePageSize]="true"
                [pageSize]="12"