Merge pull request #227 from RitvikSardana/develop-ritvik-patch-so-si…

…-option

feat: Option for user to create Sales Order Instead of Sales Invoice for generating fees

.github/helper/install.sh

@@ -40,12 +40,15 @@ sed -i 's/schedule:/# schedule:/g' Procfile
 sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
+bench get-app payments --branch ${BRANCH_TO_CLONE%"-hotfix"}
 bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps
 bench get-app education "${GITHUB_WORKSPACE}"
 bench setup requirements --dev
 bench build
 
 bench start &>> ~/frappe-bench/bench_start.log &
+CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes
 
+bench --verbose --site test_site install-app payments
 bench --verbose --site test_site install-app education

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
     # Run everday at midnight UTC / 5:30 IST
     - cron: "0 0 * * *"
 env:
-    EDUCATION_BRANCH: ${{ github.base_ref || github.ref_name }}
+  EDUCATION_BRANCH: ${{ github.base_ref || github.ref_name }}
 
 concurrency:
   group: develop-${{ github.event.number }}
@@ -28,16 +28,13 @@ jobs:
     strategy:
       fail-fast: false
 
-      matrix:
-        container: [1, 2]
-
     name: Python Unit Tests
 
     services:
       mysql:
         image: mariadb:10.6
         env:
-          MARIADB_ROOT_PASSWORD: 'root'
+          MARIADB_ROOT_PASSWORD: "root"
         ports:
           - 3306:3306
         options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
@@ -49,7 +46,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -77,9 +74,38 @@ jobs:
             ${{ runner.os }}-pip-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
       - name: Install
         run: |
           bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
         env:
           BRANCH_TO_CLONE: ${{ env.EDUCATION_BRANCH }}
 
+      - name: Run Tests
+        run: cd ~/frappe-bench/ && bench --site test_site run-tests --app education
+        env:
+          TYPE: server
+          CI_BUILD_ID: ${{ github.run_id }}

education/__init__.py

@@ -1 +1 @@
-__version__ = "15.2.1"
+__version__ = "15.3.0"

education/education/doctype/academic_term/test_academic_term.py

@@ -1,10 +1,10 @@
 # Copyright (c) 2015, Frappe Technologies and Contributors
 # See license.txt
 
-import unittest
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Academic Term')
 
 
-class TestAcademicTerm(unittest.TestCase):
+class TestAcademicTerm(FrappeTestCase):
 	pass

education/education/doctype/academic_year/test_academic_year.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2015, Frappe Technologies and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
+from frappe.tests.utils import FrappeTestCase
 
 
-class TestAcademicYear(unittest.TestCase):
+class TestAcademicYear(FrappeTestCase):
 	def test_date_validation(self):
 		year = frappe.get_doc(
 			{

education/education/doctype/article/test_article.py

@@ -1,8 +1,9 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
+from frappe.tests.utils import FrappeTestCase
 
-class TestArticle(unittest.TestCase):
+
+class TestArticle(FrappeTestCase):
 	pass

education/education/doctype/assessment_criteria/test_assessment_criteria.py

@@ -1,10 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Assessment Criteria')
 
 
-class TestAssessmentCriteria(unittest.TestCase):
+class TestAssessmentCriteria(FrappeTestCase):
 	pass

education/education/doctype/assessment_criteria/test_records.json

@@ -1,8 +1,8 @@
 [
- {
-  "assessment_criteria": "_Test Assessment Criteria"
- }, 
- {
-  "assessment_criteria": "_Test Assessment Criteria 1"
- }
-]
+  {
+    "assessment_criteria": "_Test Assessment Criteria"
+  },
+  {
+    "assessment_criteria": "_Test Assessment Criteria 1"
+  }
+]

education/education/doctype/assessment_criteria_group/test_assessment_criteria_group.py

@@ -1,10 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Assessment Criteria Group')
 
 
-class TestAssessmentCriteriaGroup(unittest.TestCase):
+class TestAssessmentCriteriaGroup(FrappeTestCase):
 	pass

education/education/doctype/assessment_group/test_assessment_group.py

@@ -1,10 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Assessment Group')
 
 
-class TestAssessmentGroup(unittest.TestCase):
+class TestAssessmentGroup(FrappeTestCase):
 	pass

education/education/doctype/assessment_plan/test_assessment_plan.py

@@ -1,10 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Assessment Plan')
 
 
-class TestAssessmentPlan(unittest.TestCase):
+class TestAssessmentPlan(FrappeTestCase):
 	pass

education/education/doctype/assessment_result/test_assessment_result.py

@@ -1,14 +1,22 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+import frappe
+from frappe.tests.utils import FrappeTestCase
 
 from education.education.api import get_grade
+from education.education.test_utils import create_grading_scale
 
 # test_records = frappe.get_test_records('Assessment Result')
 
 
-class TestAssessmentResult(unittest.TestCase):
+class TestAssessmentResult(FrappeTestCase):
+	def setUp(self):
+		create_grading_scale()
+
+	def tearDown(self):
+		frappe.db.rollback()
+
 	def test_grade(self):
 		grade = get_grade("_Test Grading Scale", 80)
 		self.assertEqual("A", grade)

education/education/doctype/assessment_result_tool/test_assessment_result_tool.py

@@ -1,8 +1,9 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
+from frappe.tests.utils import FrappeTestCase
 
-class TestAssessmentResultTool(unittest.TestCase):
+
+class TestAssessmentResultTool(FrappeTestCase):
 	pass

education/education/doctype/course/test_course.py

@@ -1,17 +1,19 @@
 # Copyright (c) 2015, Frappe Technologies and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 
 from education.education.doctype.topic.test_topic import (
-    make_topic, make_topic_and_linked_content)
+	make_topic,
+	make_topic_and_linked_content,
+)
+from frappe.tests.utils import FrappeTestCase
 
 # test_records = frappe.get_test_records('Course')
 
 
-class TestCourse(unittest.TestCase):
+class TestCourse(FrappeTestCase):
 	def setUp(self):
 		make_topic_and_linked_content(
 			"_Test Topic 1", [{"type": "Article", "name": "_Test Article 1"}]

education/education/doctype/course_activity/test_course_activity.py

@@ -1,12 +1,13 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
+
+from frappe.tests.utils import FrappeTestCase
 
 import frappe
 
 
-class TestCourseActivity(unittest.TestCase):
+class TestCourseActivity(FrappeTestCase):
 	pass