summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2016-12-01 17:20:36 -0200
committerTulio Casagrande <tcasagra@thoughtworks.com>2016-12-01 17:20:36 -0200
commit8b26f3f40e3f5d04a02528c81616a231d8f8428a (patch)
treea98e12a1fe0406d8dcc5279b36c1ba8905e4ed0a
parente4fd5581c91e97940fe893eda42a8f200d1e8d22 (diff)
[#849] Change unauthorized message
-rw-r--r--service/pixelated/resources/login_resource.py4
-rw-r--r--service/test/integration/test_multi_user_login.py2
-rw-r--r--service/test/unit/resources/test_login_resource.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index aadc435e..ed0cb54e 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -145,10 +145,10 @@ class LoginResource(BaseResource):
self._complete_bootstrap(user_auth, request)
def render_error(error):
- log.info('Login Error for %s' % request.args['username'][0])
+ log.info('Login error for %s' % request.args['username'][0])
log.info('%s' % error)
request.setResponseCode(UNAUTHORIZED)
- return self._render_template(request, 'Invalid credentials')
+ return self._render_template(request, 'Invalid username or password')
d = self._handle_login(request)
d.addCallbacks(render_response, render_error)
diff --git a/service/test/integration/test_multi_user_login.py b/service/test/integration/test_multi_user_login.py
index af2a81ac..fe456583 100644
--- a/service/test/integration/test_multi_user_login.py
+++ b/service/test/integration/test_multi_user_login.py
@@ -51,4 +51,4 @@ class MultiUserLoginTest(MultiUserSoledadTestBase):
response, login_request = self.app_test_client.login('username', 'wrong_password')
response_str = yield response
self.assertEqual(401, login_request.responseCode)
- self.assertIn('Invalid credentials', login_request.written)
+ self.assertIn('Invalid username or password', login_request.written)
diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py
index d3d7ba64..45036f8d 100644
--- a/service/test/unit/resources/test_login_resource.py
+++ b/service/test/unit/resources/test_login_resource.py
@@ -206,7 +206,7 @@ class TestLoginPOST(unittest.TestCase):
mock_authenticate.assert_called_once_with(self.username, self.password)
self.assertEqual(401, self.request.responseCode)
written_response = ''.join(self.request.written)
- self.assertIn('Invalid credentials', written_response)
+ self.assertIn('Invalid username or password', written_response)
self.assertFalse(mock_user_bootstrap_setup.called)
self.assertFalse(self.resource.get_session(self.request).is_logged_in())