From e8d050a4f1729a42e2d3b0f8219a585c2b7a31af Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 25 Feb 2021 18:17:35 +0530 Subject: [PATCH 1/6] fix: Email Password popup grammer fix --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index e033ae4c5b..54f74e5eed 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -202,7 +202,7 @@ frappe.Application = Class.extend({ email_password_prompt: function(email_account,user,i) { var me = this; var d = new frappe.ui.Dialog({ - title: __('Email Account setup please enter your password for: {0}', [email_account[i]["email_id"]]), + title: __('Please enter your password for: {0}', [email_account[i]["email_id"]]), fields: [ { 'fieldname': 'password', 'fieldtype': 'Password', From 3717c981544bb9be9d10d6a83c266dd7a8ee11a0 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 9 Mar 2021 15:18:44 +0530 Subject: [PATCH 2/6] fix: implemented suggestions --- frappe/public/js/frappe/desk.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 54f74e5eed..54d7c79797 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -201,12 +201,13 @@ frappe.Application = Class.extend({ email_password_prompt: function(email_account,user,i) { var me = this; - var d = new frappe.ui.Dialog({ - title: __('Please enter your password for: {0}', [email_account[i]["email_id"]]), + let d = new frappe.ui.Dialog({ + title: __('Password missing in Email Account'), fields: [ - { 'fieldname': 'password', + { + 'fieldname': 'password', 'fieldtype': 'Password', - 'label': 'Email Account Password', + 'label': __('Please enter the password for: {0}', [`${email_account[i]["email_id"]}`]), 'reqd': 1 }, { From 78a8cd74d032646d48ae07150fd6257cddef8333 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 9 Mar 2021 15:22:22 +0530 Subject: [PATCH 3/6] fix: sider fix --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 54d7c79797..4162b3254b 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -202,7 +202,7 @@ frappe.Application = Class.extend({ email_password_prompt: function(email_account,user,i) { var me = this; let d = new frappe.ui.Dialog({ - title: __('Password missing in Email Account'), + title: __('Password missing in Email Account'), fields: [ { 'fieldname': 'password', From a4b75e78445e30820eab321f2238a7ac35e2084e Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Tue, 9 Mar 2021 16:34:54 +0530 Subject: [PATCH 4/6] fix: translation syntax --- frappe/public/js/frappe/desk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 4162b3254b..d59bd4cdb7 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -207,7 +207,7 @@ frappe.Application = Class.extend({ { 'fieldname': 'password', 'fieldtype': 'Password', - 'label': __('Please enter the password for: {0}', [`${email_account[i]["email_id"]}`]), + 'label': __('Please enter the password for: {0}', [email_account[i]["email_id"]]), 'reqd': 1 }, { From 5cd3f8534b55658d24b7aff48cdeb5d208e10c2e Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 9 Mar 2021 16:36:36 +0530 Subject: [PATCH 5/6] fix: create gender only if provided while creating oauth user --- frappe/utils/oauth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index 40bde6c2cc..6596701ee3 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -231,14 +231,14 @@ def update_oauth_user(user, data, provider): save = True user = frappe.new_doc("User") - gender = (data.get("gender") or "").title() + gender = data.get("gender", "").title() - if not frappe.db.exists("Gender", gender): + if gender and not frappe.db.exists("Gender", gender): doc = frappe.new_doc("Gender", {"gender": gender}) doc.insert(ignore_permissions=True) user.update({ - "doctype":"User", + "doctype": "User", "first_name": get_first_name(data), "last_name": get_last_name(data), "email": get_email(data), From 5e6283f33d3cbb7e0b61c3c715adc794eeffbcce Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 9 Mar 2021 22:27:16 +0530 Subject: [PATCH 6/6] test: Reset recorder before each test to avoid flaky tests (#12554) --- cypress/integration/recorder.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/cypress/integration/recorder.js b/cypress/integration/recorder.js index 7236200741..d30cc3568c 100644 --- a/cypress/integration/recorder.js +++ b/cypress/integration/recorder.js @@ -3,6 +3,16 @@ context('Recorder', () => { cy.login(); }); + beforeEach(() => { + cy.visit('/app/recorder'); + return cy.window().its('frappe').then(frappe => { + // reset recorder + return frappe.xcall("frappe.recorder.stop").then(() => { + return frappe.xcall("frappe.recorder.delete"); + }); + }); + }); + it('Navigate to Recorder', () => { cy.visit('/app'); cy.awesomebar('recorder'); @@ -11,7 +21,6 @@ context('Recorder', () => { }); it('Recorder Empty State', () => { - cy.visit('/app/recorder'); cy.get('.title-text').should('contain', 'Recorder'); cy.get('.indicator-pill').should('contain', 'Inactive').should('have.class', 'red'); @@ -24,7 +33,6 @@ context('Recorder', () => { }); it('Recorder Start', () => { - cy.visit('/app/recorder'); cy.get('.primary-action').should('contain', 'Start').click(); cy.get('.indicator-pill').should('contain', 'Active').should('have.class', 'green'); @@ -40,15 +48,9 @@ context('Recorder', () => { cy.visit('/app/recorder'); cy.get('.title-text').should('contain', 'Recorder'); cy.get('.result-list').should('contain', '/api/method/frappe.desk.reportview.get'); - - cy.get('#page-recorder .primary-action').should('contain', 'Stop').click(); - cy.wait(500); - cy.get('#page-recorder .btn-secondary').should('contain', 'Clear').click(); - cy.get('.msg-box').should('contain', 'Inactive'); }); - it('Recorder View Request', () => { - cy.visit('/app/recorder'); + it.only('Recorder View Request', () => { cy.get('.primary-action').should('contain', 'Start').click(); cy.visit('/app/List/DocType/List'); @@ -64,9 +66,5 @@ context('Recorder', () => { cy.url().should('include', '/recorder/request'); cy.get('form').should('contain', '/api/method/frappe'); - - cy.get('#page-recorder .primary-action').should('contain', 'Stop').click(); - cy.wait(200); - cy.get('#page-recorder .btn-secondary').should('contain', 'Clear').click(); }); -}); \ No newline at end of file +});