Adds decoding of option values, and some more tests.

Author: FranciscoCanas

src/freeseer/frontend/controller/configuration.py

@@ -21,7 +21,6 @@
 
 # For support, questions, suggestions or any other inquiries, visit:
 # http://wiki.github.com/Freeseer/freeseer/
-
 import signal
 
 from flask import Blueprint, request
@@ -42,6 +41,22 @@
 }
 
 
+def update_config(config, changes):
+    """
+    Helper to update Config instances with request data.
+    """
+    for key, value in changes.items():
+        try:
+            opt_instance = config.options[key]
+            value = opt_instance.decode(value)
+            setattr(config, key, value)
+        except KeyError:
+            raise HTTPError('Invalid Option: {}'.format(key), 400)
+        except InvalidOptionValueError:
+            raise HTTPError('Invalid Value: {}'.format(value), 400)
+    config.save()
+
+
 @configuration.before_app_first_request
 def configure_configuration():
     """
@@ -122,13 +137,7 @@ def modify_profile(profile):
     """
     config = load_configuration(profile)
     changes = request.form
-    for key, value in changes.items():
-        try:
-            setattr(config, key, value)
-        except InvalidOptionValueError:
-            raise HTTPError('Invalid Argument', 400)
-
-    config.save()
+    update_config(config, changes)
     return ''
 
 #

src/freeseer/tests/frontend/controller/test_configuration.py

@@ -32,17 +32,7 @@
 from freeseer.frontend.controller import server
 
 
-def unimplemented(response):
-    response_data = json.loads(response.data)
-    if response_data['error_code'] != 501:
-        return False
-    if response.status_code != 501:
-        return False
-    return True
-
-
 class TestConfigurationApp:
-
     @pytest.fixture(scope='module')
     def test_client(self):
         server.app.config['TESTING'] = True
@@ -91,7 +81,7 @@ def test_delete_profile(self, test_client):
     def test_modify_profile(self, test_client, configuration):
         response = test_client.patch('/profiles/testing',
                                      data={
-                                         'default_language': 'tr_en_FR.qm'
+                                         'default_language': 'tr_en_FR.qm',
                                      })
 
         assert response.status_code == 200
@@ -107,8 +97,44 @@ def test_modify_profile_arg_needs_encoding(self, test_client):
                                      data={
                                          'auto_hide': True
                                      })
-        # Note: Currently returns 'Invalid Args' because config's
-        # set_value method does not encode the value of the option.
-        # In this case, the request object has encoded the boolean
-        # True as the string 'true', so BooleanOption rejects it.
-        assert response.status_code == 400
+        assert response.status_code == 200
+
+    def test_modify_profile_invalid_option(self, test_client):
+        response = test_client.patch('/profiles/testing',
+                                     data={
+                                         'not_a_real_option': True
+                                     })
+        response_data = json.loads(response.data)
+        assert response_data == {
+            'error_message': 'Invalid Option: not_a_real_option',
+            'error_code': 400
+        }
+
+    def test_view_general_configuration(self, test_client, configuration):
+        response = test_client.get('/profiles/testing/general')
+        response_data = json.loads(response.data)
+
+        general = configuration.profile.get_config('freeseer.conf',
+                                                   settings.FreeseerConfig,
+                                                   ['Global'],
+                                                   read_only=True)
+        assert response_data == {
+            'default_language': general.default_language,
+            'auto_hide': general.auto_hide,
+        }
+
+        assert response.status_code == 200
+
+    def test_modify_general_configuration(self, test_client, configuration):
+        response = test_client.patch('/profiles/testing',
+                                     data={
+                                         'default_language': 'tr_en_FR.qm',
+                                     })
+
+        assert response.status_code == 200
+
+        configuration.config = configuration.profile.get_config('freeseer.conf',
+                                                                settings.FreeseerConfig,
+                                                                ['Global'],
+                                                                read_only=True)
+        assert configuration.config.default_language == 'tr_en_FR.qm'