From d2ee5c4e8204b97da550c0f280370558f8ba2c8a Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Mon, 4 Feb 2019 17:43:19 +0530 Subject: [PATCH] 1) Fixed jasmine test cases. 2) Bootstarp4 toggle size should be mini for triggers --- .../databases/schemas/tables/triggers/static/js/trigger.js | 1 + web/regression/javascript/pgadmin_utils_spec.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js index 6e8bfe237..585f0828a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js @@ -25,6 +25,7 @@ define('pgadmin.node.trigger', [ offText: gettext('No'), onColor: 'success', offColor: 'primary', + size: 'mini', width: null, height: null, }, diff --git a/web/regression/javascript/pgadmin_utils_spec.js b/web/regression/javascript/pgadmin_utils_spec.js index 341376ade..39fe87dfb 100644 --- a/web/regression/javascript/pgadmin_utils_spec.js +++ b/web/regression/javascript/pgadmin_utils_spec.js @@ -15,8 +15,8 @@ describe('getEpoch', function () { }); it('should return epoch for a date passed', function () { - let someDate = new Date(2019,1,1,10,20,30,40), - someDateEpoch = 1548996630; + let someDate = new Date('Feb 01 2019 10:20:30 GMT0000'), + someDateEpoch = 1549016430; expect(getEpoch(new Date(someDate))).toEqual(someDateEpoch); });