Add additional tests for the callback controller

conwetlab · Sep 26, 2014 · ff73c40 · ff73c40
1 parent bfaba2f
commit ff73c40
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/ckanext/oauth2/controller.py b/ckanext/oauth2/controller.py
@@ -49,9 +49,9 @@ def callback(self):
             if not error_description:
                 if e.message:
                     error_description = e.message
-                elif e.description:
+                elif hasattr(e, 'description') and e.description:
                     error_description = e.description
-                elif e.error:
+                elif hasattr(e, 'error') and e.error:
                     error_description = e.error
                 else:
                     error_description = type(e).__name__

diff --git a/ckanext/oauth2/tests/test_controller.py b/ckanext/oauth2/tests/test_controller.py
@@ -31,6 +31,19 @@
 CAME_FROM_FIELD = 'came_from'
 
 
+class CompleteException(Exception):
+    description = 'Exception description'
+    error = 'Exception error'
+
+
+class ErrorException(Exception):
+    error = 'Exception error 2'
+
+
+class VoidException(Exception):
+    pass
+
+
 class OAuth2PluginTest(unittest.TestCase):
 
     def setUp(self):
@@ -78,15 +91,22 @@ def test_controller_no_errors(self):
     @parameterized.expand([
         (),
         ('/',),
-        ('/about', EXAMPLE_FLASH, EXAMPLE_FLASH)
+        ('/', CompleteException(EXCEPTION_MSG), None, EXCEPTION_MSG),
+        ('/', CompleteException(), None, CompleteException.description),
+        ('/', ErrorException(EXCEPTION_MSG), None, EXCEPTION_MSG),
+        ('/', ErrorException(), None, ErrorException.error),
+        ('/', VoidException(EXCEPTION_MSG), None, EXCEPTION_MSG),
+        ('/', VoidException(), None, type(VoidException()).__name__),
+        ('/about', Exception(EXCEPTION_MSG), EXAMPLE_FLASH, EXAMPLE_FLASH)
     ])
-    def test_controller_errors(self, came_from=None, error_description=None, expected_flash=EXCEPTION_MSG):
+    def test_controller_errors(self, came_from=None, exception=Exception(EXCEPTION_MSG),
+                               error_description=None, expected_flash=EXCEPTION_MSG):
 
         # Recover function
         controller.oauth2.get_came_from = self.get_came_from
 
         oauth2Helper = controller.oauth2.OAuth2Helper.return_value
-        oauth2Helper.get_token.side_effect = Exception(EXCEPTION_MSG)
+        oauth2Helper.get_token.side_effect = exception
 
         controller.toolkit.request.GET = {}
         controller.toolkit.request.GET['state'] = self.generate_state(came_from)