Merge pull request #284 from laslabs/bugfix/9.0/sass

[FIX][9.0] travis: Add SASS

.travis.yml

@@ -26,6 +26,11 @@ env:
 virtualenv:
   system_site_packages: true
 
+before_install:
+  - rvm install ruby --latest
+  - gem install bootstrap-sass
+  - gem install compass --pre
+
 install:
   - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}

website_logo/controllers/main.py

@@ -20,14 +20,17 @@
 ##############################################################################
 
 import functools
+import logging
 from cStringIO import StringIO
 
 import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.modules import get_module_resource
 
+
 db_monodb = http.db_monodb
+_logger = logging.getLogger(__name__)
 
 
 class Website(http.Controller):
@@ -79,6 +82,8 @@ def website_logo(self, dbname=None, **kw):
                         response = http.send_file(
                             image, filename=imgname, mtime=mtime)
                         return response
-            except Exception:
-                return http.send_file(placeholder(imgname))
+            except Exception:  # pragma: no cover
+                _logger.exception(openerp._(
+                    'Could not get website logo, falling back to default',
+                ))
         return http.send_file(placeholder(imgname))

website_logo/tests/test_logo.py

@@ -25,7 +25,7 @@ def setUp(self):
         self.image_val = 'Test'.encode('base64')
 
     def test_image_logo_get_domain(self):
-        """ Test logo get w/ domain """
+        """ It should search for logo using defined domain """
         mk = mock.MagicMock()
         mk.execute.side_effect = StopTestException
         expect = 'Test'
@@ -44,7 +44,7 @@ def test_image_logo_get_domain(self):
         )
 
     def test_image_logo_get_no_domain(self):
-        """ Test logo get w/out domain """
+        """ It should search for logo without a domain """
         mk = mock.MagicMock()
         mk.execute.side_effect = StopTestException
         with self.assertRaises(StopTestException):
@@ -81,10 +81,9 @@ def test_image_logo_returns_fetch_io(self, str_mk):
     @mock.patch('%s.StringIO' % imp_cont)
     @mock.patch(imp_req)
     def test_default_on_exception(self, imp_mk, str_mk, http_mk, func_mk):
-        http_mk.send_file.side_effect = StopTestException
+        """ It should send the default logo if there is an exception """
         with mock.patch('%s.openerp' % imp_cont) as mk:
             cr_mk = mk.modules.registry.Registry().cursor().__enter__()
-            cr_mk.execute.side_effect = StopTestException
-            with self.assertRaises(StopTestException):
-                self.cont_obj.website_logo()
-            http_mk.send_file.assert_called_once(func_mk())
+            cr_mk.execute.side_effect = Exception
+            self.cont_obj.website_logo()
+            func_mk.partial().assert_called_once_with('website_nologo.png')