diff --git a/cypress/integration/login.js b/cypress/integration/login.js index 3f13130b58..904b9e0721 100644 --- a/cypress/integration/login.js +++ b/cypress/integration/login.js @@ -21,15 +21,6 @@ context('Login', () => { cy.location('pathname').should('eq', '/login'); }); - it('logs in using correct credentials', () => { - cy.get('#login_email').type('Administrator'); - cy.get('#login_password').type(Cypress.config('adminPassword')); - - cy.get('.btn-login').click(); - cy.location('pathname').should('eq', '/desk'); - cy.window().its('frappe.session.user').should('eq', 'Administrator'); - }); - it('shows invalid login if incorrect credentials', () => { cy.get('#login_email').type('Administrator'); cy.get('#login_password').type('qwer'); @@ -38,4 +29,13 @@ context('Login', () => { cy.get('.page-card-head').contains('Invalid Login. Try again.'); cy.location('pathname').should('eq', '/login'); }); + + it('logs in using correct credentials', () => { + cy.get('#login_email').type('Administrator'); + cy.get('#login_password').type(Cypress.config('adminPassword')); + + cy.get('.btn-login').click(); + cy.location('pathname').should('eq', '/desk'); + cy.window().its('frappe.session.user').should('eq', 'Administrator'); + }); }); diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index f2047003fa..a912ca341c 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -61,10 +61,10 @@ class Workspace: if not self.doc.onboarding: return None - if frappe.db.get_value("Onboarding", self.doc.onboarding, "is_complete"): + if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"): return None - doc = frappe.get_doc("Onboarding", self.doc.onboarding) + doc = frappe.get_doc("Module Onboarding", self.doc.onboarding) # Check if user is allowed allowed_roles = set(doc.get_allowed_roles()) diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json index cb106c5dd4..0064d7bd28 100644 --- a/frappe/desk/doctype/desk_page/desk_page.json +++ b/frappe/desk/doctype/desk_page/desk_page.json @@ -188,11 +188,11 @@ "fieldname": "onboarding", "fieldtype": "Link", "label": "Onboarding", - "options": "Onboarding" + "options": "Module Onboarding" } ], "links": [], - "modified": "2020-04-26 12:21:46.205079", + "modified": "2020-05-12 16:12:20.708394", "modified_by": "Administrator", "module": "Desk", "name": "Desk Page", diff --git a/frappe/desk/doctype/onboarding/__init__.py b/frappe/desk/doctype/module_onboarding/__init__.py similarity index 100% rename from frappe/desk/doctype/onboarding/__init__.py rename to frappe/desk/doctype/module_onboarding/__init__.py diff --git a/frappe/desk/doctype/onboarding/onboarding.js b/frappe/desk/doctype/module_onboarding/module_onboarding.js similarity index 93% rename from frappe/desk/doctype/onboarding/onboarding.js rename to frappe/desk/doctype/module_onboarding/module_onboarding.js index bed7dbd5de..d95920e2ca 100644 --- a/frappe/desk/doctype/onboarding/onboarding.js +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on("Onboarding", { +frappe.ui.form.on("Module Onboarding", { refresh: function(frm) { frappe.boot.developer_mode && frm.set_intro( diff --git a/frappe/desk/doctype/onboarding/onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json similarity index 98% rename from frappe/desk/doctype/onboarding/onboarding.json rename to frappe/desk/doctype/module_onboarding/module_onboarding.json index b1d563a9dc..9810e7a15f 100644 --- a/frappe/desk/doctype/onboarding/onboarding.json +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json @@ -93,7 +93,7 @@ "modified": "2020-05-01 19:37:21.492405", "modified_by": "Administrator", "module": "Desk", - "name": "Onboarding", + "name": "Module Onboarding", "owner": "Administrator", "permissions": [ { diff --git a/frappe/desk/doctype/onboarding/onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py similarity index 89% rename from frappe/desk/doctype/onboarding/onboarding.py rename to frappe/desk/doctype/module_onboarding/module_onboarding.py index c8527d22b6..89160a60f0 100644 --- a/frappe/desk/doctype/onboarding/onboarding.py +++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py @@ -8,10 +8,10 @@ from frappe.model.document import Document from frappe.modules.export_file import export_to_files -class Onboarding(Document): +class ModuleOnboarding(Document): def on_update(self): if frappe.conf.developer_mode: - export_to_files(record_list=[['Onboarding', self.name]], record_module=self.module) + export_to_files(record_list=[['Module Onboarding', self.name]], record_module=self.module) for step in self.steps: export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module) diff --git a/frappe/desk/doctype/onboarding/test_onboarding.py b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py similarity index 79% rename from frappe/desk/doctype/onboarding/test_onboarding.py rename to frappe/desk/doctype/module_onboarding/test_module_onboarding.py index 8a9e346fd9..ef305667b1 100644 --- a/frappe/desk/doctype/onboarding/test_onboarding.py +++ b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe import unittest -class TestOnboarding(unittest.TestCase): +class TestModuleOnboarding(unittest.TestCase): pass diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 320cc24677..b7d9d4d548 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -51,7 +51,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe ("desk", "onboarding_permission"), ("desk", "onboarding_step"), ("desk", "onboarding_step_map"), - ("desk", "onboarding"), + ("desk", "module_onboarding"), ("desk", "desk_card"), ("desk", "desk_chart"), ("desk", "desk_shortcut"), @@ -85,7 +85,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'web_template', 'notification', 'print_style', 'data_migration_mapping', 'data_migration_plan', 'desk_page', - 'onboarding_step', 'onboarding'] + 'onboarding_step', 'module_onboarding'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py index cddef4f910..27649b8da9 100644 --- a/frappe/modules/import_file.py +++ b/frappe/modules/import_file.py @@ -13,7 +13,7 @@ ignore_values = { "Print Format": ["disabled"], "Notification": ["enabled"], "Print Style": ["disabled"], - "Onboarding": ['is_complete'], + "Module Onboarding": ['is_complete'], "Onboarding Step": ['is_complete', 'is_skipped'] } diff --git a/frappe/patches.txt b/frappe/patches.txt index b73f2aea83..86491b32b4 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -279,3 +279,4 @@ frappe.patches.v13_0.migrate_translation_column_data frappe.patches.v13_0.set_read_times frappe.patches.v13_0.remove_web_view frappe.patches.v13_0.remove_tailwind_from_page_builder +frappe.patches.v13_0.rename_onboarding diff --git a/frappe/patches/v13_0/rename_onboarding.py b/frappe/patches/v13_0/rename_onboarding.py new file mode 100644 index 0000000000..c506c6076e --- /dev/null +++ b/frappe/patches/v13_0/rename_onboarding.py @@ -0,0 +1,10 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Onboarding"): + frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True) + diff --git a/frappe/website/onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json similarity index 95% rename from frappe/website/onboarding/website/website.json rename to frappe/website/module_onboarding/website/website.json index ee4403557b..b849a809ed 100644 --- a/frappe/website/onboarding/website/website.json +++ b/frappe/website/module_onboarding/website/website.json @@ -6,7 +6,7 @@ ], "creation": "2020-04-26 13:03:30.405135", "docstatus": 0, - "doctype": "Onboarding", + "doctype": "Module Onboarding", "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website", "idx": 0, "is_complete": 0,