From 5cd70bed251218a9880afc928bfb0b79c0e686e7 Mon Sep 17 00:00:00 2001 From: Vishal Date: Thu, 5 Oct 2017 16:20:23 +0530 Subject: [PATCH] [new] Test Cases Added for Non Profit --- .../non_profit/doctype/donor/test_donor.js | 12 ++++++---- .../doctype/donor_type/donor_type.json | 6 ++--- .../doctype/donor_type/test_donor_type.js | 6 ++--- .../grant_application_list.js | 2 +- .../test_grant_application.js | 17 ++++++++++---- erpnext/non_profit/doctype/member/member.json | 2 +- .../non_profit/doctype/member/member_list.js | 2 +- .../non_profit/doctype/member/test_member.js | 9 +++++--- .../doctype/volunteer/test_volunteer.js | 23 +++++++++++++++---- .../volunteer_type/test_volunteer_type.js | 10 ++++---- erpnext/tests/ui/tests.txt | 7 ++++++ 11 files changed, 68 insertions(+), 28 deletions(-) diff --git a/erpnext/non_profit/doctype/donor/test_donor.js b/erpnext/non_profit/doctype/donor/test_donor.js index 02c7dddf76d..e478b343ec7 100644 --- a/erpnext/non_profit/doctype/donor/test_donor.js +++ b/erpnext/non_profit/doctype/donor/test_donor.js @@ -6,16 +6,20 @@ QUnit.test("test: Donor", function (assert) { let done = assert.async(); // number of asserts - assert.expect(1); + assert.expect(3); frappe.run_serially([ - // insert a new Donor + // insert a new Member () => frappe.tests.make('Donor', [ // values to be set - {key: 'value'} + {donor_name: 'Test Donor'}, + {donor_type: 'Test Organization'}, + {email: 'test@example.com'} ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.donor_name, 'Test Donor'); + assert.equal(cur_frm.doc.donor_type, 'Test Organization'); + assert.equal(cur_frm.doc.email, 'test@example.com'); }, () => done() ]); diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.json b/erpnext/non_profit/doctype/donor_type/donor_type.json index 91df68ffe03..5072f641ca8 100644 --- a/erpnext/non_profit/doctype/donor_type/donor_type.json +++ b/erpnext/non_profit/doctype/donor_type/donor_type.json @@ -3,7 +3,7 @@ "allow_guest_to_view": 0, "allow_import": 0, "allow_rename": 0, - "autoname": "field:volunteer_type", + "autoname": "field:donor_type", "beta": 0, "creation": "2017-09-19 16:19:16.639635", "custom": 0, @@ -19,7 +19,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "fieldname": "volunteer_type", + "fieldname": "donor_type", "fieldtype": "Data", "hidden": 0, "ignore_user_permissions": 0, @@ -54,7 +54,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-19 16:19:16.639635", + "modified": "2017-10-05 16:00:57.751338", "modified_by": "Administrator", "module": "Non Profit", "name": "Donor Type", diff --git a/erpnext/non_profit/doctype/donor_type/test_donor_type.js b/erpnext/non_profit/doctype/donor_type/test_donor_type.js index cfab6fa9907..22dc18ed76a 100644 --- a/erpnext/non_profit/doctype/donor_type/test_donor_type.js +++ b/erpnext/non_profit/doctype/donor_type/test_donor_type.js @@ -9,13 +9,13 @@ QUnit.test("test: Donor Type", function (assert) { assert.expect(1); frappe.run_serially([ - // insert a new Donor Type + // insert a new Member () => frappe.tests.make('Donor Type', [ // values to be set - {key: 'value'} + {donor_type: 'Test Organization'}, ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.donor_type, 'Test Organization'); }, () => done() ]); diff --git a/erpnext/non_profit/doctype/grant_application/grant_application_list.js b/erpnext/non_profit/doctype/grant_application/grant_application_list.js index 37da54ca00d..366a93433ac 100644 --- a/erpnext/non_profit/doctype/grant_application/grant_application_list.js +++ b/erpnext/non_profit/doctype/grant_application/grant_application_list.js @@ -1,3 +1,3 @@ frappe.listview_settings['Grant Application'] = { - add_fields: ["grant_application_name", "image"], + add_fields: ["grant_applicant_name", "image"], }; diff --git a/erpnext/non_profit/doctype/grant_application/test_grant_application.js b/erpnext/non_profit/doctype/grant_application/test_grant_application.js index 66681545fcd..89bf35e1ad8 100644 --- a/erpnext/non_profit/doctype/grant_application/test_grant_application.js +++ b/erpnext/non_profit/doctype/grant_application/test_grant_application.js @@ -6,16 +6,25 @@ QUnit.test("test: Grant Application", function (assert) { let done = assert.async(); // number of asserts - assert.expect(1); + assert.expect(4); frappe.run_serially([ - // insert a new Grant Application + // insert a new Member () => frappe.tests.make('Grant Application', [ // values to be set - {key: 'value'} + {organization: 'Test Organization'}, + {grant_applicant_name:'Test Applicant'}, + {email: 'test@example.com'}, + {grant_description:'Test message'}, + {grant_purpose: 'Test Meesage'}, + {amount: 150000}, + {grant_past_record:'NO'} ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.organization, 'Test Organization'); + assert.equal(cur_frm.doc.grant_applicant_name, 'Test Applicant'); + assert.equal(cur_frm.doc.email, 'test@example.com'); + assert.equal(cur_frm.doc.amount, 150000); }, () => done() ]); diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json index 179c868f4be..1dac0dc03d6 100644 --- a/erpnext/non_profit/doctype/member/member.json +++ b/erpnext/non_profit/doctype/member/member.json @@ -386,7 +386,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-09-22 13:03:06.022229", + "modified": "2017-10-05 14:42:21.421863", "modified_by": "Administrator", "module": "Non Profit", "name": "Member", diff --git a/erpnext/non_profit/doctype/member/member_list.js b/erpnext/non_profit/doctype/member/member_list.js index af1b822dcaa..8e41e7fdde8 100644 --- a/erpnext/non_profit/doctype/member/member_list.js +++ b/erpnext/non_profit/doctype/member/member_list.js @@ -1,3 +1,3 @@ frappe.listview_settings['Member'] = { - add_fields: ["member_name", "member_type", "image"], + add_fields: ["member_name", "membership_type", "image"], }; diff --git a/erpnext/non_profit/doctype/member/test_member.js b/erpnext/non_profit/doctype/member/test_member.js index 96df901f69e..f7cca977262 100644 --- a/erpnext/non_profit/doctype/member/test_member.js +++ b/erpnext/non_profit/doctype/member/test_member.js @@ -6,16 +6,19 @@ QUnit.test("test: Member", function (assert) { let done = assert.async(); // number of asserts - assert.expect(1); + assert.expect(2); frappe.run_serially([ // insert a new Member () => frappe.tests.make('Member', [ // values to be set - {key: 'value'} + {member_name: 'Test Member'}, + {membership_type: 'Gold'}, + {email: 'test@example.com'} ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.membership_type, 'Gold'); + assert.equal(cur_frm.doc.email, 'test@example.com'); }, () => done() ]); diff --git a/erpnext/non_profit/doctype/volunteer/test_volunteer.js b/erpnext/non_profit/doctype/volunteer/test_volunteer.js index 21d9bc418a8..2e160a9f877 100644 --- a/erpnext/non_profit/doctype/volunteer/test_volunteer.js +++ b/erpnext/non_profit/doctype/volunteer/test_volunteer.js @@ -6,16 +6,31 @@ QUnit.test("test: Volunteer", function (assert) { let done = assert.async(); // number of asserts - assert.expect(1); + assert.expect(4); frappe.run_serially([ - // insert a new Volunteer + // insert a new Member () => frappe.tests.make('Volunteer', [ // values to be set - {key: 'value'} + {volunteer_name: 'Test Volunteer'}, + {volunteer_type:'Test Work'}, + {email:'test@example.com'}, + {volunteer_availability_table:[ + [ + {'volunteer_availability': 'Weekends'}, + ] + ]}, + {volunteer_skills_table:[ + [ + {'volunteer_skills': 'Fundraiser'}, + ] + ]}, ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.volunteer_name, 'Test Volunteer'); + assert.equal(cur_frm.doc.volunteer_type, 'Test Work'); + assert.equal(cur_frm.doc.email, 'test@example.com'); + assert.equal(cur_frm.doc.volunteer_availability_table[0].volunteer_availability, 'Weekends'); }, () => done() ]); diff --git a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js index 4ae3111f71d..6c29fb535be 100644 --- a/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js +++ b/erpnext/non_profit/doctype/volunteer_type/test_volunteer_type.js @@ -6,16 +6,18 @@ QUnit.test("test: Volunteer Type", function (assert) { let done = assert.async(); // number of asserts - assert.expect(1); + assert.expect(2); frappe.run_serially([ - // insert a new Volunteer Type + // insert a new Member () => frappe.tests.make('Volunteer Type', [ // values to be set - {key: 'value'} + {volunteer_type: 'Test Work'}, + {amount: 500} ]), () => { - assert.equal(cur_frm.doc.key, 'value'); + assert.equal(cur_frm.doc.volunteer_type, 'Test Work'); + assert.equal(cur_frm.doc.amount, 500); }, () => done() ]); diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt index edf1d78ffbd..bcb6a01d2d5 100644 --- a/erpnext/tests/ui/tests.txt +++ b/erpnext/tests/ui/tests.txt @@ -140,3 +140,10 @@ erpnext/stock/doctype/delivery_note/test_delivery_note_with_margin.js erpnext/selling/doctype/sales_order/tests/test_sales_order_with_margin.js erpnext/selling/doctype/quotation/tests/test_quotation_with_margin.js erpnext/accounts/doctype/sales_invoice/tests/test_sales_invoice_with_margin.js +erpnext/non_profit/doctype/membership_type/test_member.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