From 26821d4fbe63e5cf59c6437a3ca3e0e66a573aff Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 27 Jan 2021 14:31:00 +0530 Subject: [PATCH 1/4] fix: ui tests --- cypress/integration/depends_on.js | 2 +- cypress/integration/file_uploader.js | 2 ++ cypress/integration/form.js | 2 +- cypress/integration/list_view.js | 1 + cypress/integration/list_view_settings.js | 2 +- cypress/integration/login.js | 6 +++--- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index 6cf39f3dd8..d33babb134 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -92,7 +92,7 @@ context('Depends On', () => { cy.fill_table_field('child_test_depends_on_field', '1', 'child_test_field', 'Some Value'); cy.fill_table_field('child_test_depends_on_field', '1', 'child_dependant_field', 'Some Other Value'); - cy.get('@row1-form_in_grid').find('.octicon-triangle-up').click(); + cy.get('@row1-form_in_grid').find('.grid-collapse-row').click(); // set the table to read-only cy.fill_field('test_field', 'Some Other Value'); diff --git a/cypress/integration/file_uploader.js b/cypress/integration/file_uploader.js index 6bfe30ff55..6003313e05 100644 --- a/cypress/integration/file_uploader.js +++ b/cypress/integration/file_uploader.js @@ -29,6 +29,7 @@ context('FileUploader', () => { subjectType: 'drag-n-drop', force: true }); + cy.get_open_dialog().find('.file-name').should('contain', 'example.json'); cy.server(); cy.route('POST', '/api/method/upload_file').as('upload_file'); @@ -42,6 +43,7 @@ context('FileUploader', () => { open_upload_dialog(); cy.get_open_dialog().find('.btn-file-upload div:contains("Library")').click(); + cy.get('.file-filter').type('example.json'); cy.get_open_dialog().find('.tree-label:contains("example.json")').first().click(); cy.server(); cy.route('POST', '/api/method/upload_file').as('upload_file'); diff --git a/cypress/integration/form.js b/cypress/integration/form.js index bea987b36d..961ffc5ee6 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -44,7 +44,7 @@ context('Form', () => { it('validates behaviour of Data options validations in child table', () => { // test email validations for set_invalid controller let website_input = 'website.in'; - let expectBackgroundColor = 'rgb(255, 220, 220)'; + let expectBackgroundColor = 'rgb(255, 245, 245)'; cy.visit('/app/contact/new'); cy.get('.frappe-control[data-fieldname="email_ids"]').as('table'); diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index ac51f42ccb..92a84febbb 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -11,6 +11,7 @@ context('List View', () => { cy.go_to_list('ToDo'); cy.get('.list-row-container:contains("Pending") .list-row-checkbox').click({ multiple: true, force: true }); cy.get('.actions-btn-group button').contains('Actions').should('be.visible').click(); + cy.wait(300); cy.get('.dropdown-menu li:visible').should('have.length', 8).each((el, index) => { cy.wrap(el).contains(actions[index]); }).then((elements) => { diff --git a/cypress/integration/list_view_settings.js b/cypress/integration/list_view_settings.js index 13d37985e4..c175108109 100644 --- a/cypress/integration/list_view_settings.js +++ b/cypress/integration/list_view_settings.js @@ -28,7 +28,7 @@ context('List View Settings', () => { cy.get('.menu-btn-group button').click({ force: true }); cy.get('.dropdown-menu li').filter(':visible').contains('List Settings').click(); - cy.get('.modal-dialog').should('contain', 'List Settings'); + cy.get('.modal-dialog').should('contain', 'DocType Settings'); cy.get('input[data-fieldname="disable_count"]').uncheck({ force: true }); cy.get('input[data-fieldname="disable_sidebar_stats"]').uncheck({ force: true }); cy.get('button').filter(':visible').contains('Save').click(); diff --git a/cypress/integration/login.js b/cypress/integration/login.js index d1ee99b36d..c895353ce6 100644 --- a/cypress/integration/login.js +++ b/cypress/integration/login.js @@ -32,10 +32,10 @@ context('Login', () => { it('logs in using correct credentials', () => { cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type(Cypress.config('adminPassword')); + cy.get('#login_password').type('root'); cy.get('.btn-login:visible').click(); - cy.location('pathname').should('eq', '/app/home'); + cy.location('pathname').should('eq', '/app'); cy.window().its('frappe.session.user').should('eq', 'Administrator'); }); @@ -58,7 +58,7 @@ context('Login', () => { ); cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type(Cypress.config('adminPassword')); + cy.get('#login_password').type('root'); cy.get('.btn-login:visible').click(); From c4d322956cd06a01c63310426a03e25b5934042d Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 27 Jan 2021 17:42:05 +0530 Subject: [PATCH 2/4] fix: common indicator style for website and desk --- frappe/public/scss/{desk => common}/indicator.scss | 0 frappe/public/scss/desk/index.scss | 2 +- frappe/public/scss/website/index.scss | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename frappe/public/scss/{desk => common}/indicator.scss (100%) diff --git a/frappe/public/scss/desk/indicator.scss b/frappe/public/scss/common/indicator.scss similarity index 100% rename from frappe/public/scss/desk/indicator.scss rename to frappe/public/scss/common/indicator.scss diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss index 7ed40d69e0..0869109cc2 100644 --- a/frappe/public/scss/desk/index.scss +++ b/frappe/public/scss/desk/index.scss @@ -16,7 +16,7 @@ @import "slides"; @import "toast"; @import "breadcrumb"; -@import "indicator"; +@import "../common/indicator"; @import "tags"; @import "page"; @import "timeline"; diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss index 89a9bd101b..5d319451ed 100644 --- a/frappe/public/scss/website/index.scss +++ b/frappe/public/scss/website/index.scss @@ -8,6 +8,7 @@ @import 'base'; @import "../common/buttons"; @import "../common/modal"; +@import "../common/indicator.scss"; @import 'multilevel_dropdown'; @import 'website_image'; @import 'website_avatar'; From 941decbb230e3c2f1537deda653a7d8531762a6d Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 28 Jan 2021 12:32:48 +0530 Subject: [PATCH 3/4] fix: revert login password changes --- cypress/integration/login.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/login.js b/cypress/integration/login.js index c895353ce6..ee889df6b8 100644 --- a/cypress/integration/login.js +++ b/cypress/integration/login.js @@ -32,7 +32,7 @@ context('Login', () => { it('logs in using correct credentials', () => { cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type('root'); + cy.get('#login_password').type(Cypress.config('adminPassword')); cy.get('.btn-login:visible').click(); cy.location('pathname').should('eq', '/app'); @@ -58,7 +58,7 @@ context('Login', () => { ); cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type('root'); + cy.get('#login_password').type(Cypress.config('adminPassword')); cy.get('.btn-login:visible').click(); From 5dc42f9c1d5405480f9a951e9625bae026b814e7 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 28 Jan 2021 16:55:06 +0530 Subject: [PATCH 4/4] fix: make add filter a button --- frappe/public/js/frappe/ui/filters/filter_list.js | 4 ++-- frappe/public/scss/desk/filters.scss | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 37e6b858a6..225ca99269 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -291,9 +291,9 @@ frappe.ui.FilterGroup = class {
-
+
+