Update create_and_login_user not to call save

arikfr · arikfr · commit ecbed0087e2b · 2016-12-07T12:01:34.000+02:00
diff --git a/redash/authentication/google_oauth.py b/redash/authentication/google_oauth.py
@@ -64,7 +64,7 @@ def create_and_login_user(org, name, email):
         if user_object.name != name:
             logger.debug("Updating user name (%r -> %r)", user_object.name, name)
             user_object.name = name
-            user_object.save()
+            models.db.session.commit()
     except NoResultFound:
         logger.debug("Creating user object (%r)", name)
         user_object = models.User(org=org, name=name, email=email, group_ids=[org.default_group.id])
diff --git a/tests/test_authentication.py b/tests/test_authentication.py
@@ -132,6 +132,13 @@ def test_creates_vaild_new_user(self):
             user = models.User.query.filter(models.User.email == email).one()
             self.assertEqual(user.email, email)
 
+    def test_updates_user_name(self):
+        user = self.factory.create_user(email='test@example.com')
+
+        with patch('redash.authentication.google_oauth.login_user') as login_user_mock:
+            create_and_login_user(self.factory.org, "New Name", user.email)
+            login_user_mock.assert_called_once_with(user, remember=True)
+
 
 class TestVerifyProfile(BaseTestCase):
     def test_no_domain_allowed_for_org(self):
