Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis (#11882)

Browse Source 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
This commit is contained in:
Zarrar 2017-12-08 14:57:38 +05:30 committed by Nabin Hait
parent 2ba198ec70
commit 17fd6610dc
34 changed files with 184 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -64,6 +64,12 @@ jobs:
- bench execute erpnext.setup.utils.enable_all_roles_and_domains
- bench run-ui-tests --app erpnext
env: Client Side Test
- # stage
script:
- bench --verbose run-setup-wizard-ui-test
- bench execute erpnext.setup.utils.enable_all_roles_and_domains
- bench run-ui-tests --app erpnext --test-list erpnext/tests/ui/tests2.txt
env: Client Side Test - 2
- # stage
script:
- bench --verbose run-setup-wizard-ui-test

2
erpnext/accounts/doctype/account/tests/test_account_with_number.js
View File

@ -46,7 +46,7 @@ QUnit.test("test account with number", function(assert) {
},
() => frappe.timeout(.5),
() => frappe.click_button("Rename"),
() => frappe.timeout(1),
() => frappe.timeout(2),
() => {
assert.ok(cur_frm.doc.account_name=="Test Income", "account name remained same");
assert.ok(cur_frm.doc.account_number=="4030", "Account number updated to 4030");

2
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.js
View File

@ -1,7 +1,7 @@
QUnit.module('Purchase Invoice');
QUnit.test("test purchase invoice", function(assert) {
assert.expect(4);
assert.expect(6);
let done = assert.async();
frappe.run_serially([
() => {

2
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
View File

@ -11,7 +11,7 @@ QUnit.test("test sales invoice with margin", function(assert) {
{currency: 'USD'},
{items: [
[
{'item_code': 'Test Product 3'},
{'item_code': 'Test Product 4'},
{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
{'qty': 1},
{'margin_type': 'Percentage'},

1
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_payment.js
View File

@ -44,7 +44,6 @@ QUnit.test("test sales Invoice with payment", function(assert) {
() => { cur_frm.set_value('paid_to','Cash - '+frappe.get_abbr(frappe.defaults.get_default('Company')));},
() => {cur_frm.set_value('reference_no','TEST1234');},
() => {cur_frm.set_value('reference_date',frappe.datetime.add_days(frappe.datetime.nowdate(), 0));},
() => cur_frm.set_value("payment_schedule", []),
() => cur_frm.save(),
() => {
// get payment details

10
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
View File

@ -97,10 +97,12 @@ QUnit.test("test: purchase order with last purchase rate", function(assert) {
},
// enable allow_last_purchase_rate
() => frappe.tests.make('Buying Settings', [
// values to be set
{"disable_fetch_last_purchase_rate": 1}
]),
() => {
return frappe.tests.make('Buying Settings', [
// values to be set
{"disable_fetch_last_purchase_rate": 1}
]);
},
() => {
return frappe.tests.make('Purchase Order', [

1
erpnext/buying/doctype/supplier/test_supplier.js
View File

@ -10,7 +10,6 @@ QUnit.test("test: supplier", function(assert) {
{supplier_type: 'Hardware'},
{country: 'India'},
{default_currency: 'INR'},
{credit_days_based_on: 'Fixed Days'},
{accounts: [
[
{'company': "For Testing"},

43
erpnext/crm/doctype/lead/tests/test_lead_individual.js Normal file
View File

@ -0,0 +1,43 @@
QUnit.module("sales");
QUnit.test("test: lead", function (assert) {
assert.expect(4);
let done = assert.async();
let lead_name = frappe.utils.get_random(10);
frappe.run_serially([
// test lead creation
() => frappe.set_route("List", "Lead"),
() => frappe.new_doc("Lead"),
() => frappe.timeout(1),
() => cur_frm.set_value("lead_name", lead_name),
() => cur_frm.save(),
() => frappe.timeout(1),
() => {
assert.ok(cur_frm.doc.lead_name.includes(lead_name),
'name correctly set');
frappe.lead_name = cur_frm.doc.name;
},
// create address and contact
() => frappe.click_link('Address & Contact'),
() => frappe.click_button('New Address'),
() => frappe.timeout(1),
() => frappe.set_control('address_line1', 'Gateway'),
() => frappe.set_control('city', 'Mumbai'),
() => cur_frm.save(),
() => frappe.timeout(3),
() => assert.equal(frappe.get_route()[1], 'Lead',
'back to lead form'),
() => frappe.click_link('Address & Contact'),
() => assert.ok($('.address-box').text().includes('Mumbai'),
'city is seen in address box'),
// make opportunity
() => frappe.click_button('Make'),
() => frappe.click_link('Opportunity'),
() => frappe.timeout(2),
() => assert.equal(cur_frm.doc.lead, frappe.lead_name,
'lead name correctly mapped'),
() => done()
]);
});

46
erpnext/crm/doctype/lead/test_lead.js → erpnext/crm/doctype/lead/tests/test_lead_organization.js
View File

@ -1,52 +1,16 @@
QUnit.module("sales");
QUnit.test("test: lead", function (assert) {
assert.expect(10);
assert.expect(5);
let done = assert.async();
let lead_name = frappe.utils.get_random(10);
frappe.run_serially([
// test lead creation
() => frappe.set_route("List", "Lead"),
() => frappe.new_doc("Lead"),
() => frappe.timeout(1),
() => cur_frm.set_value("lead_name", lead_name),
() => cur_frm.save(),
() => frappe.timeout(1),
() => {
assert.ok(cur_frm.doc.lead_name.includes(lead_name),
'name correctly set');
frappe.lead_name = cur_frm.doc.name;
},
// create address and contact
() => frappe.click_link('Address & Contact'),
() => frappe.click_button('New Address'),
() => frappe.timeout(1),
() => frappe.set_control('address_line1', 'Gateway'),
() => frappe.set_control('city', 'Mumbai'),
() => cur_frm.save(),
() => frappe.timeout(3),
() => assert.equal(frappe.get_route()[1], 'Lead',
'back to lead form'),
() => frappe.click_link('Address & Contact'),
() => assert.ok($('.address-box').text().includes('Mumbai'),
'city is seen in address box'),
// make opportunity
() => frappe.click_button('Make'),
() => frappe.click_link('Opportunity'),
() => frappe.timeout(2),
() => assert.equal(cur_frm.doc.lead, frappe.lead_name,
'lead name correctly mapped'),
() => done()
]);
frappe.run_serially([
// test lead creation
() => frappe.set_route("List", "Lead"),
() => frappe.new_doc("Lead"),
() => frappe.timeout(1),
() => cur_frm.set_value("organization_lead", "1"),
() => cur_frm.set_value("organization_name", lead_name),
() => cur_frm.set_value("company_name", lead_name),
() => cur_frm.save(),
() => frappe.timeout(1),
() => {
@ -74,15 +38,15 @@ QUnit.test("test: lead", function (assert) {
() => frappe.set_control('last_name', 'Doe'),
() => cur_frm.save(),
() => frappe.timeout(3),
() => assert.equal(frappe.get_route()[1], 'Lead',
'back to lead form'),
() => frappe.set_route('Form', 'Lead', cur_frm.doc.links[0].link_name),
() => frappe.timeout(1),
() => frappe.click_link('Address & Contact'),
() => assert.ok($('.address-box').text().includes('John'),
'contact is seen in contact box'),
// make customer
() => frappe.click_button('Make'),
() => frappe.click_link('customer'),
() => frappe.click_link('Customer'),
() => frappe.timeout(2),
() => assert.equal(cur_frm.doc.lead_name, frappe.lead_name,
'lead name correctly mapped'),

23
erpnext/education/doctype/assessment_group/test_assessment_group.js
View File

@ -18,8 +18,6 @@ QUnit.test('Test: Assessment Group', function(assert){
// Creating child nodes
() => frappe.tests.click_link('All Assessment Groups'),
() => frappe.map_group.make('Assessment-group-1'),
() => frappe.map_group.make('Assessment-group-2'),
() => frappe.map_group.make('Assessment-group-3'),
() => frappe.map_group.make('Assessment-group-4', "All Assessment Groups", 1),
() => frappe.tests.click_link('Assessment-group-4'),
() => frappe.map_group.make('Assessment-group-5', "Assessment-group-3", 0),
@ -39,27 +37,8 @@ QUnit.test('Test: Assessment Group', function(assert){
() => frappe.timeout(0.5),
() => frappe.tests.click_button('Yes'),
// Renaming Child node
() => frappe.timeout(0.5),
() => frappe.tests.click_link('Assessment-group-2'),
() => frappe.tests.click_button('Rename'),
() => frappe.timeout(0.4),
() => cur_dialog.set_value('new_name', 'Assessment-group-6'),
() => frappe.tests.click_button('Rename'),
() => frappe.tests.click_button('Close'),
// Merging 2 child nodes into 1
() => frappe.timeout(0.5),
() => frappe.tests.click_link('Assessment-group-6'),
() => frappe.tests.click_button('Rename'),
() => frappe.timeout(0.4),
() => cur_dialog.set_value('merge', 1),
() => cur_dialog.set_value('new_name', 'Assessment-group-3'),
() => frappe.tests.click_button('Rename'),
() => frappe.tests.click_button('Close'),
// Checking Collapse and Expand button
() => frappe.timeout(1),
() => frappe.timeout(2),
() => frappe.tests.click_link('Assessment-group-4'),
() => frappe.click_button('Collapse'),
() => frappe.tests.click_link('All Assessment Groups'),

3
erpnext/hr/doctype/branch/test_branch.js
View File

@ -9,7 +9,8 @@ QUnit.test("Test: Branch [HR]", function (assert) {
() => frappe.set_route("List", "Branch", "List"),
() => frappe.new_doc("Branch"),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("branch", "Test Branch"),
// save form

3
erpnext/hr/doctype/department/test_department.js
View File

@ -9,7 +9,8 @@ QUnit.test("Test: Department [HR]", function (assert) {
() => frappe.set_route("List", "Department", "List"),
() => frappe.new_doc("Department"),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("department_name", "Test Department"),
() => cur_frm.set_value("leave_block_list", "Test Leave block list"),
// save form

3
erpnext/hr/doctype/designation/test_designation.js
View File

@ -9,7 +9,8 @@ QUnit.test("Test: Designation [HR]", function (assert) {
() => frappe.set_route("List", "Designation", "List"),
() => frappe.new_doc("Designation"),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("designation_name", "Test Designation"),
() => cur_frm.set_value("description", "This designation is just for testing."),
// save form

2
erpnext/hr/doctype/employee_loan_application/test_employee_loan_application.js
View File

@ -12,7 +12,7 @@ QUnit.test("Test: Employee Loan Application [HR]", function (assert) {
employee_name = r.message.name;
},
() => {
frappe.tests.make('Employee Loan Application', [
return frappe.tests.make('Employee Loan Application', [
{ company: 'For Testing'},
{ employee: employee_name},
{ employee_name: 'Test Employee 1'},

3
erpnext/hr/doctype/employment_type/test_employment_type.js
View File

@ -9,7 +9,8 @@ QUnit.test("Test: Employment type [HR]", function (assert) {
() => frappe.set_route("List", "Employment Type", "List"),
() => frappe.new_doc("Employment Type"),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("employee_type_name", "Test Employment type"),
// save form
() => cur_frm.save(),

2
erpnext/hr/doctype/expense_claim_type/test_expense_claim_type.js
View File

@ -12,7 +12,7 @@ QUnit.test("Test: Expense Claim Type [HR]", function (assert) {
{ accounts: [
[
{ company: 'For Testing'},
{ default_account: 'Round Off - FT'}
{ default_account: 'Rounded Off - FT'}
]
]},
]);

18
erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
View File

@ -3,6 +3,7 @@ QUnit.module('HR');
QUnit.test("test: Payroll Entry", function (assert) {
assert.expect(5);
let done = assert.async();
let employees, docname;
frappe.run_serially([
() => {
@ -20,6 +21,11 @@ QUnit.test("test: Payroll Entry", function (assert) {
assert.equal(cur_frm.doc.posting_date, frappe.datetime.add_days(frappe.datetime.nowdate(), 0));
assert.equal(cur_frm.doc.cost_center, 'Main - FT');
},
() => frappe.click_button('Get Employee Details'),
() => {
employees = cur_frm.doc.employees.length;
docname = cur_frm.doc.name;
},
() => frappe.click_button('Submit'),
() => frappe.timeout(1),
@ -28,9 +34,9 @@ QUnit.test("test: Payroll Entry", function (assert) {
() => frappe.click_button('View Salary Slip'),
() => frappe.timeout(2),
() => assert.equal(cur_list.data[0].docstatus, 0),
() => assert.equal(cur_list.data.length, employees),
() => frappe.set_route('Form', 'Payroll Entry', 'Payroll 0001'),
() => frappe.set_route('Form', 'Payroll Entry', docname),
() => frappe.timeout(2),
() => frappe.click_button('Submit Salary Slip'),
() => frappe.timeout(3),
@ -41,7 +47,13 @@ QUnit.test("test: Payroll Entry", function (assert) {
() => frappe.click_button('View Salary Slip'),
() => frappe.timeout(2),
() => {
assert.ok(cur_list.data[0].docstatus == 1, "Salary slip submitted");
let count = 0;
for(var i = 0; i < employees; i++) {
if(cur_list.data[i].docstatus == 1){
count++;
}
}
assert.equal(count, employees, "Salary Slip submitted for all employees");
},
() => done()

6
erpnext/hr/doctype/salary_slip/test_salary_slip.js
View File

@ -44,6 +44,12 @@ QUnit.test("test salary slip", function(assert) {
() => frappe.timeout(6),
() => salary_slip('Test Employee 3'),
() => frappe.timeout(5),
() => frappe.set_route('List', 'Salary Slip', 'List'),
() => frappe.timeout(2),
() => {$('.list-select-all').click();},
() => frappe.timeout(2),
() => frappe.click_button('Delete'),
() => frappe.click_button('Yes'),
() => done()
]);
});

6
erpnext/manufacturing/doctype/operation/test_operation.js
View File

@ -7,7 +7,7 @@ QUnit.test("test: operation", function (assert) {
// Create a Keyboard operation
() => {
frappe.tests.make(
return frappe.tests.make(
"Operation", [
{__newname: "Assemble Keyboard"},
{workstation: "Keyboard assembly workstation"}
@ -24,7 +24,7 @@ QUnit.test("test: operation", function (assert) {
// Create a Screen operation
() => {
frappe.tests.make(
return frappe.tests.make(
"Operation", [
{__newname: 'Assemble Screen'},
{workstation: "Screen assembly workstation"}
@ -35,7 +35,7 @@ QUnit.test("test: operation", function (assert) {
// Create a CPU operation
() => {
frappe.tests.make(
return frappe.tests.make(
"Operation", [
{__newname: 'Assemble CPU'},
{workstation: "CPU assembly workstation"}

6
erpnext/manufacturing/doctype/production_order/test_production_order.js
View File

@ -15,7 +15,7 @@ QUnit.test("test: production order", function (assert) {
frappe.run_serially([
// test production order
() => frappe.set_route("List", "Production Order"),
() => frappe.set_route("List", "Production Order", "List"),
() => frappe.timeout(3),
// Create a laptop production order
@ -65,7 +65,7 @@ QUnit.test("test: production order", function (assert) {
() => frappe.timeout(2.5),
// Start the production order process
() => frappe.set_route("List", "Production Order"),
() => frappe.set_route("List", "Production Order", "List"),
() => frappe.timeout(2),
() => frappe.click_link("Laptop"),
() => frappe.timeout(1),
@ -118,7 +118,7 @@ QUnit.test("test: production order", function (assert) {
() => frappe.timeout(1),
// Manufacturing finished
() => frappe.set_route("List", "Production Order"),
() => frappe.set_route("List", "Production Order", "List"),
() => frappe.timeout(1),
() => frappe.click_link("Laptop"),
() => frappe.timeout(1),

14
erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
View File

@ -10,13 +10,15 @@ QUnit.test("test: Volunteer Type", function (assert) {
frappe.run_serially([
// insert a new Member
() => frappe.tests.make('Volunteer Type', [
// values to be set
{volunteer_type: 'Test Work'},
{amount: 500}
]),
() => {
assert.equal(cur_frm.doc.volunteer_type, 'Test Work');
return frappe.tests.make('Volunteer Type', [
// values to be set
{__newname: 'Test Work'},
{amount: 500}
]);
},
() => {
assert.equal(cur_frm.doc.name, 'Test Work');
assert.equal(cur_frm.doc.amount, 500);
},
() => done()

2
erpnext/patches.txt
View File

@ -1,5 +1,6 @@
execute:import unidecode # new requirement
erpnext.patches.v8_0.move_perpetual_inventory_setting
erpnext.patches.v10_0.rename_schools_to_education
erpnext.patches.v4_0.validate_v3_patch
erpnext.patches.v4_0.fix_employee_user_id
erpnext.patches.v4_0.remove_employee_role_if_no_employee
@ -470,7 +471,6 @@ erpnext.patches.v9_1.create_issue_opportunity_type
erpnext.patches.v9_2.rename_translated_domains_in_en
erpnext.patches.v9_0.set_shipping_type_for_existing_shipping_rules
erpnext.patches.v9_0.update_multi_uom_fields_in_material_request
erpnext.patches.v10_0.rename_schools_to_education
erpnext.patches.v9_2.repost_reserved_qty_for_production
erpnext.patches.v9_2.remove_company_from_patient
erpnext.patches.v9_2.set_item_name_in_production_order

3
erpnext/projects/doctype/activity_type/test_activity_type.js
View File

@ -8,7 +8,8 @@ QUnit.test("test: Activity Type", function (assert) {
() => frappe.set_route("List", "Activity Type", "List"),
() => frappe.new_doc("Activity Type"),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("activity_type", "Test Activity"),
() => frappe.click_button('Save'),
() => frappe.timeout(1),

21
erpnext/projects/doctype/task/tests/test_task_tree.js
View File

@ -6,7 +6,7 @@ QUnit.test("test: Task Tree", function (assert) {
let done = assert.async();
// number of asserts
assert.expect(5);
assert.expect(4);
frappe.run_serially([
// insert a new Task
@ -21,9 +21,8 @@ QUnit.test("test: Task Tree", function (assert) {
() => frappe.timeout(0.5),
// Creating child nodes
() => frappe.tests.click_link('task'),
() => frappe.tests.click_link('All Tasks'),
() => frappe.map_group.make('Test-1'),
() => frappe.map_group.make('Test-2'),
() => frappe.map_group.make('Test-3', 1),
() => frappe.timeout(1),
() => frappe.tests.click_link('Test-3'),
@ -33,8 +32,9 @@ QUnit.test("test: Task Tree", function (assert) {
() => frappe.timeout(0.5),
() => frappe.tests.click_link('Test-1'),
() => frappe.tests.click_button('Edit'),
() => frappe.timeout(0.5),
() => {assert.deepEqual(frappe.get_route(), ["Form", "Task", "Test-1"], "Edit route checks");},
() => frappe.timeout(1),
() => frappe.db.get_value('Task', {'subject': 'Test-1'}, 'name'),
(task) => {assert.deepEqual(frappe.get_route(), ["Form", "Task", task.message.name], "Edit route checks");},
// Deleting child Node
() => frappe.set_route('Tree', 'Task'),
@ -54,17 +54,6 @@ QUnit.test("test: Task Tree", function (assert) {
() => {assert.equal(cur_dialog.title, 'Message', 'Error thrown correctly');},
() => frappe.tests.click_button('Close'),
// Renaming Child node
() => frappe.timeout(0.5),
() => frappe.tests.click_link('Test-2'),
() => frappe.tests.click_button('Rename'),
() => frappe.timeout(1),
() => cur_dialog.set_value('new_name', 'Test-5'),
() => frappe.timeout(1.5),
() => cur_dialog.get_primary_btn().click(),
() => frappe.timeout(1),
() => {assert.equal($(`a:contains("Test-5"):visible`).length, 1, 'Rename successfull');},
// Add multiple child tasks
() => frappe.tests.click_link('Test-3'),
() => frappe.timeout(0.5),

9
erpnext/restaurant/doctype/restaurant/test_restaurant.js
View File

@ -7,9 +7,18 @@ QUnit.test("test: Restaurant", function (assert) {
// number of asserts
assert.expect(2);
let customer = {
"Test Customer 1": [
{customer_name: "Test Customer 1"}
],
"Test Customer 2": [
{customer_name: "Test Customer 2"}
]
};
frappe.run_serially([
// insert a new Restaurant
() => frappe.tests.setup_doctype('Customer', customer),
() => {
return frappe.tests.make('Restaurant', [
// values to be set

2
erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
View File

@ -11,7 +11,7 @@ QUnit.test("test quotation with margin", function(assert) {
{currency: 'USD'},
{items: [
[
{'item_code': 'Test Product 3'},
{'item_code': 'Test Product 4'},
{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
{'qty': 1},
{'margin_type': 'Percentage'},

6
erpnext/selling/doctype/sales_order/tests/test_sales_order_with_bypass_credit_limit_check.js
View File

@ -7,7 +7,8 @@ QUnit.test("test_sales_order_with_bypass_credit_limit_check", function(assert) {
frappe.run_serially([
() => frappe.new_doc('Customer'),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("customer_name", "Test Customer 10"),
() => cur_frm.set_value("credit_limit", 100.00),
() => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 1),
@ -17,7 +18,8 @@ QUnit.test("test_sales_order_with_bypass_credit_limit_check", function(assert) {
() => frappe.new_doc('Item'),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("item_code", "Test Product 10"),
() => cur_frm.set_value("item_group", "Products"),
() => cur_frm.set_value("standard_rate", 100),

2
erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js
View File

@ -11,7 +11,7 @@ QUnit.test("test sales order with margin", function(assert) {
{currency: 'USD'},
{items: [
[
{'item_code': 'Test Product 3'},
{'item_code': 'Test Product 4'},
{'delivery_date': frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1)},
{'qty': 1},
{'margin_type': 'Amount'},

3
erpnext/selling/doctype/sales_order/tests/test_sales_order_without_bypass_credit_limit_check.js
View File

@ -7,7 +7,8 @@ QUnit.test("test_sales_order_without_bypass_credit_limit_check", function(assert
frappe.run_serially([
() => frappe.new_doc('Customer'),
() => frappe.timeout(1),
() => frappe.click_link('Edit in full page'),
() => frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(),
() => frappe.timeout(1),
() => cur_frm.set_value("customer_name", "Test Customer 11"),
() => cur_frm.set_value("credit_limit", 100.00),
() => cur_frm.set_value("bypass_credit_limit_check_at_sales_order", 0),

2
erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
View File

@ -11,7 +11,7 @@ QUnit.test("test delivery note with margin", function(assert) {
{currency: 'USD'},
{items: [
[
{'item_code': 'Test Product 3'},
{'item_code': 'Test Product 4'},
{'qty': 1},
{'margin_type': 'Amount'},
{'margin_rate_or_amount': 10}

4
erpnext/stock/doctype/item_price/test_item_price.js
View File

@ -7,13 +7,13 @@ QUnit.test("test item price", function(assert) {
() => {
return frappe.tests.make('Item Price', [
{price_list:'Test-Selling-USD'},
{item_code: 'Test Product 3'},
{item_code: 'Test Product 4'},
{price_list_rate: 200}
]);
},
() => cur_frm.save(),
() => {
assert.ok(cur_frm.doc.item_name == 'Test Product 3', "Item name correct");
assert.ok(cur_frm.doc.item_name == 'Test Product 4', "Item name correct");
assert.ok(cur_frm.doc.price_list_rate == 200, "Price list rate correct");
},
() => frappe.timeout(0.3),

2
erpnext/stock/get_item_details.py
View File

@ -312,7 +312,7 @@ def get_price_list_rate(args, item_doc, out):
out.price_list_rate = flt(price_list_rate) * flt(args.plc_conversion_rate) \
/ flt(args.conversion_rate)
if args.price_list_uom_dependant == 0:
if not args.price_list_uom_dependant:
out.price_list_rate = flt(out.price_list_rate * (args.conversion_factor or 1.0))
if not out.price_list_rate and args.transaction_type=="buying":

48
erpnext/tests/ui/tests.txt
View File

@ -1,5 +1,4 @@
erpnext/tests/ui/make_fixtures.js #long
erpnext/setup/doctype/company/tests/test_company.js
erpnext/accounts/doctype/account/tests/test_account.js
erpnext/accounts/doctype/account/tests/test_make_tax_account.js
erpnext/accounts/doctype/account/tests/test_account_with_number.js
@ -7,9 +6,7 @@ erpnext/accounts/doctype/pricing_rule/test_pricing_rule.js
erpnext/accounts/doctype/sales_taxes_and_charges_template/test_sales_taxes_and_charges_template.js
erpnext/accounts/doctype/purchase_taxes_and_charges_template/test_purchase_taxes_and_charges_template.js
erpnext/accounts/doctype/shipping_rule/test_shipping_rule.js
erpnext/crm/doctype/lead/test_lead.js
erpnext/crm/doctype/opportunity/test_opportunity.js
erpnext/setup/doctype/company/tests/test_company_production.js
erpnext/stock/doctype/item/tests/test_item.js
erpnext/selling/doctype/quotation/tests/test_quotation_with_discount_on_grand_total.js
erpnext/selling/doctype/quotation/tests/test_quotation_with_item_wise_discount.js
@ -42,13 +39,6 @@ erpnext/hr/doctype/leave_type/test_leave_type.js
erpnext/hr/doctype/leave_control_panel/test_leave_control_panel.js
erpnext/hr/doctype/leave_allocation/test_leave_allocation.js
erpnext/hr/doctype/leave_application/test_leave_application.js
erpnext/education/doctype/academic_year/test_academic_year.js
erpnext/education/doctype/academic_term/test_academic_term.js
erpnext/education/doctype/education_settings/test_education_settings.js
erpnext/education/doctype/student_batch_name/test_student_batch_name.js
erpnext/education/doctype/student_category/test_student_category.js
erpnext/education/doctype/room/test_room.js
erpnext/education/doctype/instructor/test_instructor.js
erpnext/stock/doctype/warehouse/test_warehouse.js
erpnext/manufacturing/doctype/production_order/test_production_order.js #long
erpnext/accounts/page/pos/test_pos.js
@ -95,26 +85,6 @@ erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_item_wise_d
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_taxes_and_charges.js
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_receipt.js
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.js
erpnext/education/doctype/grading_scale/test_grading_scale.js
erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js
erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js
erpnext/education/doctype/course/test_course.js
erpnext/education/doctype/program/test_program.js
erpnext/education/doctype/guardian/test_guardian.js
erpnext/education/doctype/student_admission/test_student_admission.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js
erpnext/education/doctype/student_log/test_student_log.js
erpnext/education/doctype/student_group/test_student_group.js
erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js
erpnext/education/doctype/student_leave_application/test_student_leave_application.js
erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js
erpnext/education/doctype/student_attendance/test_student_attendance.js
erpnext/education/doctype/assessment_group/test_assessment_group.js
erpnext/education/doctype/assessment_plan/test_assessment_plan.js
erpnext/education/doctype/assessment_result/test_assessment_result.js
erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js
erpnext/accounts/doctype/journal_entry/test_journal_entry.js
erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.js
erpnext/accounts/doctype/payment_entry/tests/test_payment_entry.js
@ -129,10 +99,6 @@ erpnext/stock/doctype/stock_entry/tests/test_stock_entry_for_repack.js
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_serialize_item.js
erpnext/accounts/doctype/payment_entry/tests/test_payment_against_invoice.js
erpnext/buying/doctype/purchase_order/tests/test_purchase_order_with_last_purchase_rate.js
erpnext/restaurant/doctype/restaurant/test_restaurant.js
erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js
erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js
erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js
erpnext/projects/doctype/task/tests/test_task_tree.js
erpnext/stock/doctype/item_price/test_item_price.js
erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js
@ -141,17 +107,3 @@ erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js
erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js
erpnext/hr/doctype/payroll_entry/test_set_salary_components.js
erpnext/hr/doctype/payroll_entry/test_payroll_entry.js
erpnext/agriculture/doctype/land_unit/test_land_unit.js
erpnext/agriculture/doctype/fertilizer/test_fertilizer.js
erpnext/agriculture/doctype/water_analysis/test_water_analysis.js
erpnext/agriculture/doctype/disease/test_disease.js
erpnext/agriculture/doctype/soil_texture/test_soil_texture.js
erpnext/agriculture/doctype/crop/test_crop.js
erpnext/agriculture/doctype/crop_cycle/test_crop_cycle.js
erpnext/non_profit/doctype/membership_type/test_membership_type.js
erpnext/non_profit/doctype/member/test_member.js
erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
erpnext/non_profit/doctype/volunteer/test_volunteer.js
erpnext/non_profit/doctype/donor_type/test_donor_type.js
erpnext/non_profit/doctype/donor/test_donor.js
erpnext/non_profit/doctype/grant_application/test_grant_application.js

46
erpnext/tests/ui/tests2.txt Normal file
View File

@ -0,0 +1,46 @@
erpnext/setup/doctype/company/tests/test_company.js
erpnext/crm/doctype/lead/tests/test_lead_individual.js
erpnext/crm/doctype/lead/tests/test_lead_organization.js
erpnext/setup/doctype/company/tests/test_company_production.js
erpnext/hr/doctype/leave_block_list/test_leave_block_list.js
erpnext/hr/doctype/department/test_department.js
erpnext/hr/doctype/designation/test_designation.js
erpnext/education/doctype/academic_year/test_academic_year.js
erpnext/education/doctype/academic_term/test_academic_term.js
erpnext/education/doctype/education_settings/test_education_settings.js
erpnext/education/doctype/student_batch_name/test_student_batch_name.js
erpnext/education/doctype/student_category/test_student_category.js
erpnext/education/doctype/room/test_room.js
erpnext/education/doctype/instructor/test_instructor.js
erpnext/education/doctype/grading_scale/test_grading_scale.js
erpnext/education/doctype/assessment_criteria_group/test_assessment_criteria_group.js
erpnext/education/doctype/assessment_criteria/test_assessment_criteria.js
erpnext/education/doctype/course/test_course.js
erpnext/education/doctype/program/test_program.js
erpnext/education/doctype/guardian/test_guardian.js
erpnext/education/doctype/student_admission/test_student_admission.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant_dummy_data.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant.js
erpnext/education/doctype/student_applicant/tests/test_student_applicant_options.js
erpnext/education/doctype/student_log/test_student_log.js
erpnext/education/doctype/student_group/test_student_group.js
erpnext/education/doctype/student_group_creation_tool/test_student_group_creation_tool.js
erpnext/education/doctype/student_leave_application/test_student_leave_application.js
erpnext/education/doctype/student_attendance_tool/test_student_attendance_tool.js
erpnext/education/doctype/student_attendance/test_student_attendance.js
erpnext/education/doctype/assessment_group/test_assessment_group.js
erpnext/education/doctype/assessment_plan/test_assessment_plan.js
erpnext/education/doctype/assessment_result/test_assessment_result.js
erpnext/education/doctype/assessment_result_tool/test_assessment_result_tool.js
erpnext/projects/doctype/task/tests/test_task_tree.js
erpnext/restaurant/doctype/restaurant/test_restaurant.js
erpnext/restaurant/doctype/restaurant_table/test_restaurant_table.js
erpnext/restaurant/doctype/restaurant_menu/test_restaurant_menu.js
erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.js
erpnext/non_profit/doctype/membership_type/test_membership_type.js
erpnext/non_profit/doctype/member/test_member.js
erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js
erpnext/non_profit/doctype/volunteer/test_volunteer.js
erpnext/non_profit/doctype/donor_type/test_donor_type.js
erpnext/non_profit/doctype/donor/test_donor.js
erpnext/non_profit/doctype/grant_application/test_grant_application.js