Selaa lähdekoodia

fix(ui-tests): Pick admin password from config (#7842)

version-14
Faris Ansari 6 vuotta sitten
committed by GitHub
vanhempi
commit
d719f77edb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
16 muutettua tiedostoa jossa 32 lisäystä ja 24 poistoa
  1. +2
    -1
      cypress.json
  2. +7
    -6
      cypress/integration/awesome_bar.js
  3. +1
    -1
      cypress/integration/control_link.js
  4. +1
    -1
      cypress/integration/control_rating.js
  5. +1
    -1
      cypress/integration/file_uploader.js
  6. +1
    -1
      cypress/integration/form.js
  7. +1
    -1
      cypress/integration/list_view.js
  8. +4
    -4
      cypress/integration/list_view_settings.js
  9. +1
    -1
      cypress/integration/login.js
  10. +1
    -1
      cypress/integration/query_report.js
  11. +1
    -1
      cypress/integration/recorder.js
  12. +2
    -2
      cypress/integration/relative_filters.js
  13. +1
    -1
      cypress/integration/table_multiselect.js
  14. +6
    -0
      cypress/support/commands.js
  15. +1
    -1
      frappe/desk/page/setup_wizard/setup_wizard.js
  16. +1
    -1
      test_sites/test_site_ui/site_config.json

+ 2
- 1
cypress.json Näytä tiedosto

@@ -1,4 +1,5 @@
{
"baseUrl": "http://test_site_ui:8000",
"projectId": "92odwv"
"projectId": "92odwv",
"adminPassword": "admin"
}

+ 7
- 6
cypress/integration/awesome_bar.js Näytä tiedosto

@@ -1,7 +1,7 @@
context('Awesome Bar', () => {
before(() => {
cy.visit('/login');
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});

@@ -10,8 +10,9 @@ context('Awesome Bar', () => {
});

it('navigates to doctype list', () => {
cy.get('#navbar-search')
.type('todo{downarrow}{enter}', { delay: 100 });
cy.get('#navbar-search').type('todo', { delay: 200 });
cy.get('#navbar-search + ul').should('be.visible');
cy.get('#navbar-search').type('{downarrow}{enter}', { delay: 100 });

cy.get('h1').should('contain', 'To Do');

@@ -20,7 +21,7 @@ context('Awesome Bar', () => {

it('find text in doctype list', () => {
cy.get('#navbar-search')
.type('test in todo{downarrow}{enter}', { delay: 100 });
.type('test in todo{downarrow}{enter}', { delay: 200 });

cy.get('h1').should('contain', 'To Do');

@@ -31,14 +32,14 @@ context('Awesome Bar', () => {

it('navigates to new form', () => {
cy.get('#navbar-search')
.type('new blog post{downarrow}{enter}', { delay: 100 });
.type('new blog post{downarrow}{enter}', { delay: 200 });

cy.get('.title-text:visible').should('have.text', 'New Blog Post 1');
});

it('calculates math expressions', () => {
cy.get('#navbar-search')
.type('55 + 32{downarrow}{enter}', { delay: 100 });
.type('55 + 32{downarrow}{enter}', { delay: 200 });

cy.get('.modal-title').should('contain', 'Result');
cy.get('.msgprint').should('contain', '55 + 32 = 87');


+ 1
- 1
cypress/integration/control_link.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Control Link', () => {
beforeEach(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
cy.create_records({
doctype: 'ToDo',


+ 1
- 1
cypress/integration/control_rating.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Control Rating', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});



+ 1
- 1
cypress/integration/file_uploader.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('FileUploader', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});



+ 1
- 1
cypress/integration/form.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Form', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});



+ 1
- 1
cypress/integration/list_view.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('List View', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
cy.window().its('frappe').then(frappe => {
frappe.call("frappe.tests.ui_test_helpers.setup_workflow");


+ 4
- 4
cypress/integration/list_view_settings.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('List View Settings', () => {
beforeEach(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});
it('Default settings', () => {
@@ -14,13 +14,13 @@ context('List View Settings', () => {
cy.get('button').contains('Menu').click();
cy.get('.dropdown-menu li').filter(':visible').contains('Settings').click();
cy.get('.modal-dialog').should('contain', 'Settings');
cy.get('input[data-fieldname="disable_count"]').check({force: true});
cy.get('input[data-fieldname="disable_sidebar_stats"]').check({force: true});
cy.get('button').filter(':visible').contains('Save').click();
cy.reload();
cy.get('.list-count').should('be.empty');
cy.get('.list-sidebar .sidebar-stat').should('not.exist');



+ 1
- 1
cypress/integration/login.js Näytä tiedosto

@@ -23,7 +23,7 @@ context('Login', () => {

it('logs in using correct credentials', () => {
cy.get('#login_email').type('Administrator');
cy.get('#login_password').type('qwe');
cy.get('#login_password').type(Cypress.config('adminPassword'));

cy.get('.btn-login').click();
cy.location('pathname').should('eq', '/desk');


+ 1
- 1
cypress/integration/query_report.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Form', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});



+ 1
- 1
cypress/integration/recorder.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Recorder', () => {
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
});

it('Navigate to Recorder', () => {


+ 2
- 2
cypress/integration/relative_filters.js Näytä tiedosto

@@ -1,10 +1,10 @@
context('Relative Timeframe', () => {
beforeEach(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
});
before(() => {
cy.login('Administrator', 'qwe');
cy.login();
cy.visit('/desk');
cy.window().its('frappe').then(frappe => {
frappe.call("frappe.tests.ui_test_helpers.create_todo_records");


+ 1
- 1
cypress/integration/table_multiselect.js Näytä tiedosto

@@ -1,6 +1,6 @@
context('Table MultiSelect', () => {
beforeEach(() => {
cy.login('Administrator', 'qwe');
cy.login();
});

let name = 'table multiselect' + Math.random().toString().slice(2, 8);


+ 6
- 0
cypress/support/commands.js Näytä tiedosto

@@ -25,6 +25,12 @@ import 'cypress-file-upload';
// -- This is will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... });
Cypress.Commands.add('login', (email, password) => {
if (!email) {
email = 'Administrator';
}
if (!password) {
password = Cypress.config('adminPassword');
}
cy.request({
url: '/api/method/login',
method: 'POST',


+ 1
- 1
frappe/desk/page/setup_wizard/setup_wizard.js Näytä tiedosto

@@ -213,7 +213,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
}
setTimeout(function() {
// Reload
window.location.href = '';
window.location.href = '/desk';
}, 2000);
}



+ 1
- 1
test_sites/test_site_ui/site_config.json Näytä tiedosto

@@ -7,7 +7,7 @@
"mail_server": "smtp.example.com",
"mail_login": "test@example.com",
"mail_password": "test",
"admin_password": "qwe",
"admin_password": "admin",
"root_password": "travis",
"run_selenium_tests": 1,
"host_name": "http://test_site_ui:8000"


Ladataan…
Peruuta
Tallenna