Skip to content

Commit 251fa14

Browse files
committed
added tests
1 parent e3a8c64 commit 251fa14

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

osf_tests/test_merging_users.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from website import settings
99
from website.util.metrics import OsfSourceTags
1010
from framework.auth import Auth
11+
from framework.auth.views import send_confirm_email
1112

1213
from osf_tests.factories import (
1314
UserFactory,
@@ -18,8 +19,8 @@
1819
)
1920
from importlib import import_module
2021
from django.conf import settings as django_conf_settings
21-
from osf.models import UserSessionMap
22-
from tests.utils import run_celery_tasks
22+
from osf.models import UserSessionMap, NotificationType
23+
from tests.utils import run_celery_tasks, capture_notifications
2324
from waffle.testutils import override_flag
2425
from osf.features import ENABLE_GV
2526

@@ -288,3 +289,15 @@ def test_merge_doesnt_send_signal(self):
288289
with override_flag(ENABLE_GV, active=True):
289290
self.user.merge_user(other_user)
290291
assert other_user.merged_by._id == self.user._id
292+
293+
def test_send_confirm_email_emits_merge_notification(self):
294+
merger = UserFactory()
295+
merge_target = UserFactory()
296+
target_email = merge_target.username
297+
298+
merger.add_unconfirmed_email(target_email)
299+
merger.save()
300+
with capture_notifications() as notifications:
301+
send_confirm_email(merger, target_email)
302+
assert len(notifications['emits']) == 1
303+
assert notifications['emits'][0]['type'] == NotificationType.Type.USER_CONFIRM_MERGE

0 commit comments

Comments
 (0)