public inbox for [email protected]  

help / color / mirror / Atom feed

From: Khushboo Vashi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][Patch] - Jasmine Tests Fixes
Date: Wed, 21 Oct 2020 19:08:17 +0530
Message-ID: <CAFOhELfoz-7gDTmxfG5HgGsc73pdPOwGbJbpin0hY1SGbCU_oQ@mail.gmail.com> (raw)

Hi,

Please find the attached patch to fix the Jasmine tests failure.
It was due to 18cad32bd4541e1993a051028bee81a2310d020c commit.

Thanks,
Khushboo


Attachments:

  [application/octet-stream] jasmine_test_fixes.patch (2.6K, 3-jasmine_test_fixes.patch)
  download | inline diff:
diff --git a/web/regression/javascript/file_manager/file_manager_specs.js b/web/regression/javascript/file_manager/file_manager_specs.js
index 0485ee2cb..de4c1de69 100644
--- a/web/regression/javascript/file_manager/file_manager_specs.js
+++ b/web/regression/javascript/file_manager/file_manager_specs.js
@@ -65,8 +65,59 @@ describe('fileSelectDialog', function () {
     },
   };
 
-  describe('When dialog is called for select file', () => {
-    it('Select file dialog', function() {
+  describe('When dialog is called for', () => {
+
+    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 avilable 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 avilable screen resolution is still
+                // less then return the height value as it
+                return ih;
+            }
+          },
+        },
+      };
+    });
+
+    it('Select file', function() {
       params = {
         'dialog_title': 'Select file',
         'dialog_type': 'select_file',
@@ -81,10 +132,8 @@ describe('fileSelectDialog', function () {
 
       expect(Alertify.fileSelectionDlg).toHaveBeenCalled();
     });
-  });
 
-  describe('When dialog is called for create file', () => {
-    it('Select file dialog', function() {
+    it('create file', function() {
       params = {
         'dialog_title': 'Create file',
         'dialog_type': 'create_file',

view thread (2+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [pgAdmin4][Patch] - Jasmine Tests Fixes
  In-Reply-To: <CAFOhELfoz-7gDTmxfG5HgGsc73pdPOwGbJbpin0hY1SGbCU_oQ@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox