Merge pull request #4427 from Cookiezaurs/master

[SER-793]Fixes for views tests
Countly · Aug 2, 2023 · c717b9d · c717b9d
2 parents 124a47a + 0716957
commit c717b9d
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/plugins/views/tests.js b/plugins/views/tests.js
@@ -13,6 +13,7 @@ var APP_ID = "";
 //recalculate
 var myTime = Date.now();
 var start = new Date(new Date().getFullYear(), 0, 0);
+var startMonth = new Date(new Date().getFullYear(), new Date().getMonth(), 0);
 
 var tableResponse = {};
 var userObject = {};
@@ -32,6 +33,7 @@ graphResponse.yesterday = {};
 graphResponse["30days"] = {};
 
 var days_this_year;
+var days_this_month;
 
 function pushValues(period, index, map) {
     for (var key in map) {
@@ -241,7 +243,9 @@ describe('Testing views plugin', function() {
     describe('verify empty views tables', function() {
         it('should have 0 views', function(done) {
             days_this_year = Math.floor((myTime - start) / (1000 * 24 * 60 * 60));
-            console.log("days left in this year:" + days_this_year);
+            days_this_month = Math.floor((myTime - startMonth) / (1000 * 24 * 60 * 60));
+            console.log("days gone in this month:" + days_this_month);
+            console.log("days gone in this year:" + days_this_year);
             API_KEY_ADMIN = testUtils.get("API_KEY_ADMIN");
             APP_ID = testUtils.get("APP_ID");
             APP_KEY = testUtils.get("APP_KEY");
@@ -300,8 +304,12 @@ describe('Testing views plugin', function() {
             tableResponse.yesterday.iTotalRecords += 1;
             tableResponse.yesterday.iTotalDisplayRecords += 1;
             pushValues("yesterday", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1, "view": "testview0"});
-
-            pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1});
+            if (days_this_month < 2) {
+                pushValues("30days", 0, {"u": 1, "t": 1, "s": 1});
+            }
+            else {
+                pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1});
+            }
 
             tableResponse["7days"].iTotalRecords += 1;
             tableResponse["7days"].iTotalDisplayRecords += 1;
@@ -336,7 +344,13 @@ describe('Testing views plugin', function() {
             tableResponse.hour.iTotalRecords += 1;
             tableResponse.hour.iTotalDisplayRecords += 1;
             pushValues("hour", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1});
-            pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, 'uvalue': 1});
+
+            if (days_this_month > 1) {
+                pushValues("30days", 0, {"u": 1, "t": 1, "s": 1});
+            }
+            else {
+                pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1});
+            }
 
             tableResponse.month.iTotalRecords = 1;
             tableResponse.month.iTotalDisplayRecords = 1;