From 71a8c0f317d35e25f14ceccf0e345dff75cf80b1 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Tue, 27 Oct 2020 18:05:30 +0530 Subject: [PATCH] One more attempt to fix Jasmin test cases. --- .../file_manager/file_manager_specs.js | 58 +++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/web/regression/javascript/file_manager/file_manager_specs.js b/web/regression/javascript/file_manager/file_manager_specs.js index 8e8525fbc..30f982733 100644 --- a/web/regression/javascript/file_manager/file_manager_specs.js +++ b/web/regression/javascript/file_manager/file_manager_specs.js @@ -35,7 +35,7 @@ describe('fileSelectDialog', function () { else if (iw > pgAdmin.Browser.stdW.sm) return pgAdmin.Browser.stdW.sm; else - // if avilable screen resolution is still + // if available screen resolution is still // less then return the width value as it return iw; } @@ -57,7 +57,7 @@ describe('fileSelectDialog', function () { else if (ih > pgAdmin.Browser.stdH.md) return pgAdmin.Browser.stdH.md; else - // if avilable screen resolution is still + // if available screen resolution is still // less then return the height value as it return ih; } @@ -86,7 +86,7 @@ describe('fileSelectDialog', function () { else if (iw > pgAdmin.Browser.stdW.sm) return pgAdmin.Browser.stdW.sm; else - // if avilable screen resolution is still + // if available screen resolution is still // less then return the width value as it return iw; } @@ -108,7 +108,7 @@ describe('fileSelectDialog', function () { else if (ih > pgAdmin.Browser.stdH.md) return pgAdmin.Browser.stdH.md; else - // if avilable screen resolution is still + // if available screen resolution is still // less then return the height value as it return ih; } @@ -151,6 +151,56 @@ describe('fileSelectDialog', function () { }); describe('When dialog is called for storage file', () => { + beforeEach(() => { + pgAdmin.Browser = { + stdW: { + sm: 500, + md: 700, + lg: 900, + default: 500, + calc: (passed_width) => { + let iw = window.innerWidth; + if(iw > passed_width){ + return passed_width; + }else{ + if (iw > pgAdmin.Browser.stdW.lg) + return pgAdmin.Browser.stdW.lg; + else if (iw > pgAdmin.Browser.stdW.md) + return pgAdmin.Browser.stdW.md; + else if (iw > pgAdmin.Browser.stdW.sm) + return pgAdmin.Browser.stdW.sm; + else + // if available screen resolution is still + // less then return the width value as it + return iw; + } + }, + }, + stdH: { + sm: 200, + md: 400, + lg: 550, + default: 550, + calc: (passed_height) => { + // We are excluding sm as it is too small for dialog + let ih = window.innerHeight; + if (ih > passed_height){ + return passed_height; + }else{ + if (ih > pgAdmin.Browser.stdH.lg) + return pgAdmin.Browser.stdH.lg; + else if (ih > pgAdmin.Browser.stdH.md) + return pgAdmin.Browser.stdH.md; + else + // if available screen resolution is still + // less then return the height value as it + return ih; + } + }, + }, + }; + }); + it('Storage file dialog', function() { params = { 'dialog_title': 'Storage Manager',