From a1a862bfcc5dda9528649e298163f843a8ac8d96 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Yadav Date: Sun, 14 May 2023 11:25:56 +0530 Subject: [PATCH 1/2] fix:send email in unittest --- github_access/tests/test_approve.py | 18 ++++++++++++++++-- github_access/tests/test_user.py | 16 ++++++++++++++-- opsgenie_access/tests/test_user.py | 2 +- zoom_access/tests/test_user.py | 6 +++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/github_access/tests/test_approve.py b/github_access/tests/test_approve.py index ad237e7..6e7b706 100644 --- a/github_access/tests/test_approve.py +++ b/github_access/tests/test_approve.py @@ -14,6 +14,7 @@ def user(mocker): user.email = "test_user@test.com" return user + @pytest.fixture def user_identity(mocker): identity_mock = mocker.MagicMock() @@ -23,6 +24,13 @@ def user_identity(mocker): return identity_mock +@pytest.fixture +def request_obj(mocker): + request_obj = mocker.MagicMock() + request_obj.request_id = "123" + return request_obj + + @pytest.fixture(scope="function") def context(): return {} @@ -208,13 +216,19 @@ def push_labels(): @when("I pass approval request for push", target_fixture="context_output") -def push_approve(user_identity, push_labels): +def push_approve(mocker, user_identity, push_labels, request_obj): + + mocker.patch( + "Access.access_modules.github_access.access.GithubAccess._GithubAccess__send_approve_email", + return_value="" + ) + github_access = access.get_object() return github_access.approve( user_identity, push_labels, "test-approver", - "123" + request_obj ) diff --git a/github_access/tests/test_user.py b/github_access/tests/test_user.py index 2a3853e..d282106 100644 --- a/github_access/tests/test_user.py +++ b/github_access/tests/test_user.py @@ -27,6 +27,13 @@ def user_identity(mocker): return identity_mock +@pytest.fixture +def request_obj(mocker): + request_obj = mocker.MagicMock() + request_obj.request_id = "123" + return request_obj + + @scenario("features/user.feature", "User does not exist on github") def test_user_does_not_exist_on_github(): pass @@ -230,9 +237,14 @@ def repo_does_not_exist(requests_mock, context): @when("I pass approval request", target_fixture="context_output") -def add_user_approve(user, labels, user_identity): +def add_user_approve(mocker, user, labels, user_identity, request_obj): github_access = access.get_object() - return github_access.approve(user_identity, labels, "test-approver", "123") + + mocker.patch( + "Access.access_modules.github_access.access.GithubAccess._GithubAccess__send_approve_email", + return_value="" + ) + return github_access.approve(user_identity, labels, "test-approver", request_obj) @then("return value should be False") diff --git a/opsgenie_access/tests/test_user.py b/opsgenie_access/tests/test_user.py index a73db0d..7e9cfad 100644 --- a/opsgenie_access/tests/test_user.py +++ b/opsgenie_access/tests/test_user.py @@ -184,6 +184,6 @@ def false_value(context_output): @then("return value should be true") def true_value(context_output): - """return value should be False.""" + """return value should be True.""" return_value = context_output[0] assert return_value is True diff --git a/zoom_access/tests/test_user.py b/zoom_access/tests/test_user.py index a9edb00..33e021b 100644 --- a/zoom_access/tests/test_user.py +++ b/zoom_access/tests/test_user.py @@ -108,8 +108,12 @@ def user_name(): @when("I pass approval request", target_fixture="context_output") -def revoke_request(usera, user_identity_a, labels): +def revoke_request(mocker, usera, user_identity_a, labels): zoom_access = access.get_object() + mocker.patch( + "Access.access_modules.zoom_access.access.Zoom._Zoom__send_approve_email", + return_value=True + ) return zoom_access.approve(user_identity_a, labels, "test-approver", usera) From c445a8f5a58e7c4e2b1289ab4d519c5e14c253cc Mon Sep 17 00:00:00 2001 From: Rahul Kumar Yadav Date: Mon, 15 May 2023 10:59:38 +0530 Subject: [PATCH 2/2] add patch for send email --- github_access/tests/test_approve.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/github_access/tests/test_approve.py b/github_access/tests/test_approve.py index 6e7b706..4d17392 100644 --- a/github_access/tests/test_approve.py +++ b/github_access/tests/test_approve.py @@ -198,8 +198,12 @@ def labels(): @when("I pass approval request", target_fixture="context_output") -def add_user_approve(user_identity, labels): +def add_user_approve(mocker, user_identity, labels): github_access = access.get_object() + mocker.patch( + "Access.access_modules.github_access.access.GithubAccess._GithubAccess__send_approve_email", + return_value="" + ) return github_access.approve(user_identity, labels, "test-approver", "123")