vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: Update Cypress 3 to 6 & fix test cases

Browse source
This commit is contained in:
Suraj Shetty 2021-01-31 21:54:59 +05:30
parent 458fba8350
commit 39d0e72f94
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cypress/integration/file_uploader.js
View file

@ -21,7 +21,7 @@ context('FileUploader', () => {
open_upload_dialog();
cy.fixture('example.json').then(fileContent => {
cy.get_open_dialog().find('.file-upload-area').upload({
cy.get_open_dialog().find('.file-upload-area').attachFile({
fileContent,
fileName: 'example.json',
mimeType: 'application/json'
@ -34,7 +34,7 @@ context('FileUploader', () => {
cy.server();
cy.route('POST', '/api/method/upload_file').as('upload_file');
cy.get_open_dialog().find('.btn-modal-primary').click();
cy.wait('@upload_file').its('status').should('be', 200);
cy.wait('@upload_file').its('status').should('eq', 200);
cy.get('.modal:visible').should('not.exist');
});
});

9
cypress/integration/form.js
View file

@ -33,13 +33,12 @@ context('Form', () => {
cy.hide_dialog();
cy.get('.next-doc').click();
cy.wait(200);
cy.hide_dialog();
cy.contains('Test Form Contact 2').should('not.exist');
cy.get('.title-text').should('contain', 'Test Form Contact 1');
cy.get('.title-text').should('contain', 'Test Form Contact 3');
// clear filters
cy.window().its('frappe').then((frappe) => {
let list_view = frappe.get_list_view('Contact');
list_view.filter_area.filter_list.clear_filters();
});
cy.visit('/app/contact');
cy.clear_filters();
});
it('validates behaviour of Data options validations in child table', () => {
// test email validations for set_invalid controller

2
cypress/support/index.js
View file

@ -21,5 +21,5 @@ import './commands';
// require('./commands')
Cypress.Cookies.defaults({
whitelist: 'sid'
preserve: 'sid'
});

5
frappe/commands/utils.py
View file

@ -571,10 +571,11 @@ def run_ui_tests(context, app, headless=False):
plugin_path = "{0}/cypress-file-upload".format(node_bin)
# check if cypress in path...if not, install it.
if not (os.path.exists(cypress_path) or os.path.exists(plugin_path)):
if not (os.path.exists(cypress_path) or os.path.exists(plugin_path)) \
or not subprocess.getoutput("npm view cypress version").startswith("6."):
# install cypress
click.secho("Installing Cypress...", fg="yellow")
frappe.commands.popen("yarn add cypress@3 cypress-file-upload@^3.1 --no-lockfile")
frappe.commands.popen("yarn add cypress@^6 cypress-file-upload@^5 --no-lockfile")
# run for headless mode
run_or_open = 'run --browser chrome --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb' if headless else 'open'

4
frappe/public/js/frappe/form/toolbar.js
View file

@ -222,10 +222,10 @@ frappe.ui.form.Toolbar = class Toolbar {
if (!this.frm.is_new() && !this.frm.meta.issingle) {
this.page.add_action_icon("left", () => {
this.frm.navigate_records(1);
}, 'prev-doc', __("Previous"));
}, 'prev-doc', __("Previous Document"));
this.page.add_action_icon("right", ()=> {
this.frm.navigate_records(0);
}, 'next-doc', __("Next"));
}, 'next-doc', __("Next Document"));
}
}