Merge pull request #3459 from IgniteUI/bkulov/fix-filtering-tests

Fix the logic calculating test results
IgniteUI · Dec 18, 2018 · 471faae · 471faae
2 parents ae21495 + f88a761
commit 471faae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts
@@ -2988,7 +2988,9 @@ function fillExpectedResults(grid: IgxGridComponent, calendar: Calendar, today)
     // day + 15
     if (!dateItem0.isThisYear) {
         thisYearCountItems--;
-    } else if (dateItem0.isNextYear) {
+    }
+
+    if (dateItem0.isNextYear) {
         nextYearCountItems++;
     }
 

diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts
@@ -752,7 +752,9 @@ function fillExpectedResults(grid: IgxGridComponent, calendar: Calendar, today)
     // day + 15
     if (!dateItem0.isThisYear) {
         thisYearCountItems--;
-    } else if (dateItem0.isNextYear) {
+    }
+
+    if (dateItem0.isNextYear) {
         nextYearCountItems++;
     }