issue #142 - combine some test classes that could be combined; remove…

… class_refresh_db from some classes that don't alter DB data

biweeklybudget/tests/acceptance/flaskapp/views/test_budgets.py

@@ -47,7 +47,7 @@
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 class TestBudgets(AcceptanceHelper):
 
     @pytest.fixture(autouse=True)
@@ -102,10 +102,9 @@ def test_initial_data(self, selenium):
 
 @pytest.mark.acceptance
 @pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-@pytest.mark.incremental
-class TestEditPeriodic1(AcceptanceHelper):
+class TestBudgetModals(AcceptanceHelper):
 
-    def test_0_verify_db(self, testdb):
+    def test_00_budget_modal_verify_db(self, testdb):
         b = testdb.query(Budget).get(1)
         assert b is not None
         assert b.name == 'Periodic1'
@@ -115,7 +114,7 @@ def test_0_verify_db(self, testdb):
         assert b.is_active is True
         assert b.is_income is False
 
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_01_budget_modal_populate_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Periodic1 (1)"]')
         link.click()
@@ -142,7 +141,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-    def test_2_update_modal(self, base_url, selenium):
+    def test_02_budget_modal_update_modal(self, base_url, selenium):
         # Fill in the form
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Periodic1 (1)"]')
@@ -183,7 +182,7 @@ def test_2_update_modal(self, base_url, selenium):
             'innerHTML') == '<a href="javascript:budgetModal(1, null)">' \
                             'EditedPeriodic1 (1)</a>'
 
-    def test_3_verify_db(self, testdb):
+    def test_03_budget_modal_verify_db(self, testdb):
         b = testdb.query(Budget).get(1)
         assert b is not None
         assert b.name == 'EditedPeriodic1'
@@ -193,12 +192,7 @@ def test_3_verify_db(self, testdb):
         assert b.is_active is False
         assert b.is_income is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditPeriodic2(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_10_populate_edit_periodic_2_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Periodic2 (2)"]')
         link.click()
@@ -225,12 +219,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditPeriodic3(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_11_populate_edit_periodic_3_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath(
             '//a[text()="Periodic3 Inactive (3)"]'
@@ -260,12 +249,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditStanding1(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_12_populate_edit_standing_1_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Standing1 (4)"]')
         link.click()
@@ -292,12 +276,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditStanding2(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_13_populate_edit_standing_2_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Standing2 (5)"]')
         link.click()
@@ -324,12 +303,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditStanding3(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_14_populate_edit_standing_3_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath(
             '//a[text()="Standing3 Inactive (6)"]'
@@ -359,12 +333,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestEditIncome(AcceptanceHelper):
-
-    def test_0_verify_db(self, testdb):
+    def test_20_income_verify_db(self, testdb):
         b = testdb.query(Budget).get(7)
         assert b is not None
         assert b.name == 'Income'
@@ -374,7 +343,7 @@ def test_0_verify_db(self, testdb):
         assert b.is_active is True
         assert b.is_income is True
 
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_21_populate_income_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Income (7)"]')
         link.click()
@@ -400,7 +369,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id('budget_frm_active').is_selected()
         assert selenium.find_element_by_id('budget_frm_income').is_selected()
 
-    def test_2_update_modal(self, base_url, selenium):
+    def test_22_update_income_modal(self, base_url, selenium):
         # Fill in the form
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_xpath('//a[text()="Income (7)"]')
@@ -441,7 +410,7 @@ def test_2_update_modal(self, base_url, selenium):
                             'EditedIncome (7)</a> ' \
                             '<em class="text-success">(income)</em>'
 
-    def test_3_verify_db(self, testdb):
+    def test_23_verify_income_db(self, testdb):
         b = testdb.query(Budget).get(7)
         assert b is not None
         assert b.name == 'EditedIncome'
@@ -451,12 +420,7 @@ def test_3_verify_db(self, testdb):
         assert b.is_active is False
         assert b.is_income is True
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestDirectURLPeriodic1(AcceptanceHelper):
-
-    def test_1_populate_modal(self, base_url, selenium):
+    def test_31_populate_direct_url_modal(self, base_url, selenium):
         self.get(selenium, base_url + '/budgets/1')
         modal, title, body = self.get_modal_parts(selenium)
         self.assert_modal_displayed(modal, title, body)
@@ -481,12 +445,7 @@ def test_1_populate_modal(self, base_url, selenium):
         assert selenium.find_element_by_id(
             'budget_frm_income').is_selected() is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestAddStandingBudget(AcceptanceHelper):
-
-    def test_2_update_modal(self, base_url, selenium):
+    def test_41_add_standing_modal(self, base_url, selenium):
         # Fill in the form
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_id('btn_add_budget')
@@ -528,7 +487,7 @@ def test_2_update_modal(self, base_url, selenium):
             'innerHTML') == '<a href="javascript:budgetModal(8, null)">' \
                             'NewStanding (8)</a>'
 
-    def test_3_verify_db(self, testdb):
+    def test_41_add_standing_verify_db(self, testdb):
         b = testdb.query(Budget).get(8)
         assert b is not None
         assert b.name == 'NewStanding'
@@ -538,12 +497,7 @@ def test_3_verify_db(self, testdb):
         assert b.is_active is True
         assert b.is_income is False
 
-
-@pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
-class TestAddIncomeBudget(AcceptanceHelper):
-
-    def test_2_update_modal(self, base_url, selenium):
+    def test_51_add_income_modal(self, base_url, selenium):
         # Fill in the form
         self.get(selenium, base_url + '/budgets')
         link = selenium.find_element_by_id('btn_add_budget')
@@ -574,7 +528,7 @@ def test_2_update_modal(self, base_url, selenium):
         _, _, body = self.get_modal_parts(selenium)
         x = body.find_elements_by_tag_name('div')[0]
         assert 'alert-success' in x.get_attribute('class')
-        assert x.text.strip() == 'Successfully saved Budget 8 in database.'
+        assert x.text.strip() == 'Successfully saved Budget 9 in database.'
         # dismiss the modal
         selenium.find_element_by_id('modalCloseButton').click()
         self.wait_for_load_complete(selenium)
@@ -583,12 +537,12 @@ def test_2_update_modal(self, base_url, selenium):
         stable = selenium.find_element_by_id('table-periodic-budgets')
         selems = self.tbody2elemlist(stable)
         assert selems[1][1].get_attribute(
-            'innerHTML') == '<a href="javascript:budgetModal(8, null)">' \
-                            'NewIncome (8)</a> <em class="text-success">' \
+            'innerHTML') == '<a href="javascript:budgetModal(9, null)">' \
+                            'NewIncome (9)</a> <em class="text-success">' \
                             '(income)</em>'
 
-    def test_3_verify_db(self, testdb):
-        b = testdb.query(Budget).get(8)
+    def test_52_add_income_verify_db(self, testdb):
+        b = testdb.query(Budget).get(9)
         assert b is not None
         assert b.name == 'NewIncome'
         assert b.is_periodic is True

biweeklybudget/tests/acceptance/flaskapp/views/test_ofx.py

@@ -63,8 +63,7 @@
 @pytest.mark.usefixtures('refreshdb', 'testflask')
 class TestOFX(AcceptanceHelper):
 
-    @pytest.fixture(autouse=True)
-    def get_page(self, base_url, selenium):
+    def test_0_get_page(self, base_url, selenium):
         self.baseurl = base_url
         self.get(selenium, base_url + '/ofx')
 
@@ -367,7 +366,7 @@ def test_modal_auto_displayed(self, selenium):
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 @pytest.mark.incremental
 class TestTransReconciledModal(AcceptanceHelper):
 

biweeklybudget/tests/acceptance/flaskapp/views/test_scheduled.py

@@ -248,7 +248,7 @@ def test_search(self, selenium):
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 class TestSchedTransModalPerPeriod(AcceptanceHelper):
 
     def test_0_verify_db(self, testdb):
@@ -319,7 +319,7 @@ def test_1_modal_on_click(self, base_url, selenium):
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 class TestSchedTransMonthlyURL(AcceptanceHelper):
 
     def test_0_verify_db(self, testdb):

biweeklybudget/tests/acceptance/flaskapp/views/test_transactions.py

@@ -494,7 +494,7 @@ def test_3_verify_db(self, testdb):
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 class TestTransModalByURL(AcceptanceHelper):
 
     def test_0_verify_db(self, testdb):
@@ -704,7 +704,7 @@ def test_4_verify_index_budgets_table(self, base_url, selenium):
 
 
 @pytest.mark.acceptance
-@pytest.mark.usefixtures('class_refresh_db', 'refreshdb', 'testflask')
+@pytest.mark.usefixtures('refreshdb', 'testflask')
 @pytest.mark.incremental
 class TestTransReconciledModal(AcceptanceHelper):