Store settings in alot.rc.spec.

- allows users to use $XDG_CONFIG_HOME, as well
- stores information in single places.

1 files changed, 5 insertions, 6 deletions

diff --git a/tests/settings/manager_test.py b/tests/settings/manager_test.py
index c056524b..06200c71 100644
--- a/tests/settings/manager_test.py
+++ b/tests/settings/manager_test.py
@@ -139,8 +139,7 @@ class TestSettingsManager(unittest.TestCase):
 class TestSettingsManagerProcessXDG(unittest.TestCase):
     """ Tests SettingsManager._process_xdg_default """
     setting_name = 'template_dir'
-    def_relative = 'alot/templates'
-    default = os.path.join('$XDG_CONFIG_HOME', def_relative)
+    default = '$XDG_CONFIG_HOME/alot/templates'
     xdg_fallback = '~/.config'
     xdg_config_home = '/foo/bar/.config'
     default_expanded = default.replace('$XDG_CONFIG_HOME', xdg_fallback)
@@ -150,7 +149,7 @@ class TestSettingsManagerProcessXDG(unittest.TestCase):
             if 'XDG_CONFIG_HOME' in os.environ:
                 del os.environ['XDG_CONFIG_HOME']
             manager = SettingsManager()
-            manager._process_xdg_default(self.setting_name, self.def_relative)
+            manager._process_xdg_default(self.setting_name)
             self.assertEqual(manager._config.get(self.setting_name),
                              os.path.expanduser(self.default_expanded))
 
@@ -158,7 +157,7 @@ class TestSettingsManagerProcessXDG(unittest.TestCase):
         with mock.patch.dict('os.environ'):
             os.environ['XDG_CONFIG_HOME'] = ''
             manager = SettingsManager()
-            manager._process_xdg_default(self.setting_name, self.def_relative)
+            manager._process_xdg_default(self.setting_name)
             self.assertEqual(manager._config.get(self.setting_name),
                              os.path.expanduser(self.default_expanded))
 
@@ -166,7 +165,7 @@ class TestSettingsManagerProcessXDG(unittest.TestCase):
         with mock.patch.dict('os.environ'):
             os.environ['XDG_CONFIG_HOME'] = self.xdg_config_home
             manager = SettingsManager()
-            manager._process_xdg_default(self.setting_name, self.def_relative)
+            manager._process_xdg_default(self.setting_name)
             actual = manager._config.get(self.setting_name)
             expected = self.default.replace('$XDG_CONFIG_HOME',
                                             self.xdg_config_home)
@@ -182,7 +181,7 @@ class TestSettingsManagerProcessXDG(unittest.TestCase):
             self.addCleanup(os.unlink, f.name)
 
             manager = SettingsManager(alot_rc=f.name)
-            manager._process_xdg_default(self.setting_name, self.def_relative)
+            manager._process_xdg_default(self.setting_name)
             self.assertEqual(manager._config.get(self.setting_name),
                              os.path.expanduser(user_setting))