Approvals Fixed

Author: Argon

Infrastructure/Sessions/00010203-0405-0607-0809-0a0b0c0d0e0f

@@ -108,3 +108,6 @@ def get_dojo_session_id(self):
 
     def get_dojo_topic_root(self):
         return self.code_dojo.get("topic root", "MobTimer")
+
+    def get_general_enable_unobtrusive_mode_bouncing_screen(self):
+        return self.general_settings_.getboolean("enable unobtrusive mode bouncing screen", False)

Infrastructure/SettingsManager.py

@@ -23,6 +23,7 @@ use logo image = False
 logo image name = company-logo.png
 auto theme logo = False
 enable unobtrusive mode = False
+enable unobtrusive mode bouncing screen = True
 
 [TIMER SETTINGS]
 minutes = 5

MobTimer.cfg

@@ -3,12 +3,14 @@
 import unittest
 
 from approvaltests import Approvals
-from approvaltests.TextDiffReporter import TextDiffReporter
+from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
 
 from Infrastructure.CountdownManager import CountdownManager
 
 
 class TestsCountdownManager(unittest.TestCase):
+    def setUp(self):
+        self.reporter = GenericDiffReporterFactory().get_first_working()
 
     def test_set_countdown_timer(self):
         countdown_manager = CountdownManager(None)
@@ -37,7 +39,7 @@ def time_change_callback(days, minutes, seconds):
         countdown_manager.set_countdown_duration(853, 32)
         countdown_manager.set_countdown_duration(3, 62)
 
-        Approvals.verify(result["result"], TextDiffReporter())
+        Approvals.verify(result["result"], self.reporter)
 
 
 if __name__ == '__main__':

tests/Infrastructure/CountdownManager/TestsCountdownManager.py

@@ -2,13 +2,14 @@
 import random
 import unittest
 from approvaltests import Approvals
-from approvaltests.TextDiffReporter import TextDiffReporter
+from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
 from Infrastructure.MobberManager import MobberManager
 
-os.environ["APPROVALS_TEXT_DIFF_TOOL"] = "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe"
-
 
 class TestsMobberManager(unittest.TestCase):
+    def setUp(self):
+        self.reporter = GenericDiffReporterFactory().get_first_working()
+
     def test_empty_mobber_manager_has_no_items(self):
         mobber_manager = MobberManager()
         self.assertEqual(mobber_manager.mobber_count(), 0)
@@ -147,7 +148,7 @@ def time_change_callback(mobber_list, driver_index, navigator_index):
         mobber_manager.remove_mobber(0)
         mobber_manager.remove_mobber(0)
 
-        Approvals.verify(result["result"], TextDiffReporter())
+        Approvals.verify(result["result"], self.reporter)
 
     def test_subscribe_to_mobber_list_changes_random(self):
         random.seed(0)
@@ -192,7 +193,7 @@ def time_change_callback(mobber_list, driver_index, navigator_index):
         mobber_manager.remove_mobber(0)
         mobber_manager.remove_mobber(0)
 
-        Approvals.verify(result["result"], TextDiffReporter())
+        Approvals.verify(result["result"], self.reporter)
 
     def test_navigator1_driver0_index(self):
         mobber_manager = MobberManager()

…t_subscribe_to_time_changes.approved.txt …t_subscribe_to_time_changes.approved.txttests/Infrastructure/CountdownManager/tests.Infrastructure.CountdownManager.TestsCountdownManager.test_subscribe_to_time_changes.approved.txt renamed to tests/Infrastructure/CountdownManager/TestsCountdownManager.test_subscribe_to_time_changes.approved.txt tests/Infrastructure/CountdownManager/tests.Infrastructure.CountdownManager.TestsCountdownManager.test_subscribe_to_time_changes.approved.txt renamed to tests/Infrastructure/CountdownManager/TestsCountdownManager.test_subscribe_to_time_changes.approved.txt

@@ -2,12 +2,15 @@
 import unittest
 
 from approvaltests import Approvals
-from approvaltests.TextDiffReporter import TextDiffReporter
+from approvaltests.GenericDiffReporterFactory import GenericDiffReporterFactory
 
 from Infrastructure.TimeSettingsManager import TimeSettingsManager
 
 
 class TestsTimeOptionsManager(unittest.TestCase):
+    def setUp(self):
+        self.reporter = GenericDiffReporterFactory().get_first_working()
+
     def test_default_time_10_minutes(self):
         time_options_manager = TimeSettingsManager()
         result = time_options_manager.get_time_string()
@@ -93,7 +96,7 @@ def time_change_callback(time, minutes, seconds,origin_station_name):
         time_options_manager.increment_minutes()
         time_options_manager.set_countdown_time(3, 14)
 
-        Approvals.verify(result["result"], TextDiffReporter())
+        Approvals.verify(result["result"], self.reporter)
 
 if __name__ == '__main__':
     os.environ["APPROVALS_TEXT_DIFF_TOOL"] = "meld"