- Add test to check that two-factor auth activates a user as expected

- Ensure DB user activation statusupdate only executed when required
- Fix test_should_activate_user_after_verify

app/notify_client/user_api_client.py

@@ -124,5 +124,8 @@ class UserApiClient(BaseAPIClient):
         return True
 
     def activate_user(self, user):
-        user.state = 'active'
-        return self.update_user(user)
+        if user.state == 'pending':
+            user.state = 'active'
+            return self.update_user(user)
+        else:
+            return user