Merge branch 'develop' into payroll_entry
diff --git a/erpnext/tests/server/agriculture.txt b/erpnext/tests/server/agriculture.txt
new file mode 100644
index 0000000..3aae85a
--- /dev/null
+++ b/erpnext/tests/server/agriculture.txt
@@ -0,0 +1,5 @@
+Disease
+Crop
+Land Unit
+Crop Cycle
+Soil Texture
\ No newline at end of file
diff --git a/erpnext/tests/ui/agriculture.txt b/erpnext/tests/ui/agriculture.txt
new file mode 100644
index 0000000..4622bc0
--- /dev/null
+++ b/erpnext/tests/ui/agriculture.txt
@@ -0,0 +1,7 @@
+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
\ No newline at end of file
diff --git a/erpnext/tests/ui/tests.txt b/erpnext/tests/ui/tests.txt
index 9040b12..d02cae1 100644
--- a/erpnext/tests/ui/tests.txt
+++ b/erpnext/tests/ui/tests.txt
@@ -141,3 +141,17 @@
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
\ No newline at end of file