[#2494] Add timzone tests for util controller and helper

ckan/tests/controllers/test_util.py

@@ -41,3 +41,32 @@ def test_redirect_no_params_2(self):
             params={'url': ''},
             status=400,
         )
+
+    def test_set_timezone_valid(self):
+        app = self._get_test_app()
+        response = app.get(
+            url=url_for(controller='util', action='set_timezone_offset') + '/600',
+            status=200,
+        )
+        assert_true('utc_timezone_offset: 600' in response)
+
+    def test_set_timezone_string(self):
+        app = self._get_test_app()
+        response = app.get(
+            url=url_for(controller='util', action='set_timezone_offset') + '/test',
+            status=400,
+        )
+
+    def test_set_timezone_too_big(self):
+        app = self._get_test_app()
+        response = app.get(
+            url=url_for(controller='util', action='set_timezone_offset') + '/1000',
+            status=400,
+        )
+
+    def test_set_timezone_too_big(self):
+        app = self._get_test_app()
+        response = app.get(
+            url=url_for(controller='util', action='set_timezone_offset') + '/-841',
+            status=400,
+        )

ckan/tests/legacy/lib/test_helpers.py

@@ -2,7 +2,7 @@
 import datetime
 from nose.tools import assert_equal, assert_raises
 
-from pylons import config
+from pylons import config, session
 
 from ckan.tests.legacy import *
 import ckan.lib.helpers as h
@@ -26,6 +26,10 @@ def test_render_datetime(self):
         res = h.render_datetime(datetime.datetime(2008, 4, 13, 20, 40, 20, 123456))
         assert_equal(res, 'April 13, 2008')
 
+    def test_render_datetime_with_hours(self):
+        res = h.render_datetime(datetime.datetime(2008, 4, 13, 20, 40, 20, 123456), with_hours=True)
+        assert_equal(res, 'April 13, 2008, 20:40')
+
     def test_render_datetime_but_from_string(self):
         res = h.render_datetime('2008-04-13T20:40:20.123456')
         assert_equal(res, 'April 13, 2008')
@@ -34,6 +38,11 @@ def test_render_datetime_blank(self):
         res = h.render_datetime(None)
         assert_equal(res, '')
 
+    def test_render_datetime_with_utc_offset_from_session(self):
+        session['utc_timezone_offset'] = 120
+        res = h.render_datetime(datetime.datetime(2008, 4, 13, 20, 40, 20, 123456), with_hours=True)
+        assert_equal(res, 'April 13, 2008, 22:40')
+
     def test_datetime_to_date_str(self):
         res = datetime.datetime(2008, 4, 13, 20, 40, 20, 123456).isoformat()
         assert_equal(res, '2008-04-13T20:40:20.123456')