From 36c0b132f8e6482dbc8785cbfa17a71731e8d967 Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 22 Nov 2023 13:35:45 +0200 Subject: [PATCH 1/5] change group count value to string --- yal/tests/surveys/test_endline.py | 8 ++++---- yal/tests/test_main.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/yal/tests/surveys/test_endline.py b/yal/tests/surveys/test_endline.py index 20f0c0b8..d926708b 100644 --- a/yal/tests/surveys/test_endline.py +++ b/yal/tests/surveys/test_endline.py @@ -32,7 +32,7 @@ def get_rapidpro_contact(urn): def get_rapidpro_group(name): - return {"count": 100} + return {"count": "100"} @pytest.fixture(autouse=True) @@ -114,7 +114,7 @@ async def test_endline_invitation_i_want_to_answer( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = 100 + get_group_membership_count.return_value = "100" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -188,7 +188,7 @@ async def test_endline_invitation_answer( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = 100 + get_group_membership_count.return_value = "100" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1294,7 +1294,7 @@ async def test_endline_flow(tester: AppTester, rapidpro_mock): async def test_endline_agree_terms_and_condition( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = 100 + get_group_membership_count.return_value = "100" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" tester.user.metadata["terms_accepted"] = True diff --git a/yal/tests/test_main.py b/yal/tests/test_main.py index 9fbd3f21..2c122895 100644 --- a/yal/tests/test_main.py +++ b/yal/tests/test_main.py @@ -166,7 +166,7 @@ def get_aaq_response(answers, next=None, prev=None): def get_rapidpro_group(name): - return {"count": 100} + return {"count": "100"} @pytest.fixture @@ -891,7 +891,7 @@ async def test_state_self_perceived_healthcare_assessment_later( async def test_endline_survey_start_keywords( get_group_membership_count, tester: AppTester, rapidpro_mock, contentrepo_api_mock ): - get_group_membership_count.return_value = 100 + get_group_membership_count.return_value = "100" rapidpro_mock.tstate.contact_fields["onboarding_completed"] = True rapidpro_mock.tstate.contact_fields["terms_accepted"] = True @@ -1593,7 +1593,7 @@ async def test_survey_invite_remind_me_tomorrow( async def test_state_endline_limit_reached( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = 250 + get_group_membership_count.return_value = "250" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1609,7 +1609,7 @@ async def test_state_endline_limit_reached( async def test_state_endline_limit_reached_menu( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = 250 + get_group_membership_count.return_value = "250" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1651,7 +1651,7 @@ async def test_state_endline_limit_reached_aaq( mock_config, get_group_membership_count, tester: AppTester, rapidpro_mock ): mock_config.AAQ_URL = "http://aaq-test.com" - get_group_membership_count.return_value = 250 + get_group_membership_count.return_value = "250" tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" From 2c3764c4ceb1bad819c043953323a7b3da106667 Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 22 Nov 2023 13:44:02 +0200 Subject: [PATCH 2/5] change group count value to string --- yal/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yal/main.py b/yal/main.py index 9252dc2e..2ca7a84b 100644 --- a/yal/main.py +++ b/yal/main.py @@ -243,7 +243,7 @@ async def process_message(self, message): group_name="Endline Survey Completed" ) - if group_count >= int(endline_study_max_participant_count): + if int(group_count) >= int(endline_study_max_participant_count): return await self.go_to_state( EndlineTermsApplication.ENDLINE_LIMIT_REACHED_STATE ) From 6e5ee69996b0ff6e1cc17376a2666f6299a3afc1 Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 22 Nov 2023 13:55:32 +0200 Subject: [PATCH 3/5] change group count value to string --- yal/tests/surveys/test_endline.py | 2 +- yal/tests/test_main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yal/tests/surveys/test_endline.py b/yal/tests/surveys/test_endline.py index d926708b..5b680d9d 100644 --- a/yal/tests/surveys/test_endline.py +++ b/yal/tests/surveys/test_endline.py @@ -77,7 +77,7 @@ def get_global_value(request): { "key": "Endline Study Max Participant Count", "name": "endline_study_max_participant_count", - "value": 250, + "value": "250", "modified_on": "2023-05-30T07:34:06.216776Z", } ], diff --git a/yal/tests/test_main.py b/yal/tests/test_main.py index 2c122895..af06efc0 100644 --- a/yal/tests/test_main.py +++ b/yal/tests/test_main.py @@ -242,7 +242,7 @@ def get_global_value(request): { "key": "Endline Study Max Participant Count", "name": "endline_study_max_participant_count", - "value": 250, + "value": "250", "modified_on": "2023-05-30T07:34:06.216776Z", } ], From a1b9027524f7f4d0c1458186b0b6308e5f2a2e8d Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 22 Nov 2023 14:14:44 +0200 Subject: [PATCH 4/5] change group count value to string --- yal/main.py | 2 +- yal/tests/surveys/test_endline.py | 8 ++++---- yal/tests/test_main.py | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/yal/main.py b/yal/main.py index 2ca7a84b..9252dc2e 100644 --- a/yal/main.py +++ b/yal/main.py @@ -243,7 +243,7 @@ async def process_message(self, message): group_name="Endline Survey Completed" ) - if int(group_count) >= int(endline_study_max_participant_count): + if group_count >= int(endline_study_max_participant_count): return await self.go_to_state( EndlineTermsApplication.ENDLINE_LIMIT_REACHED_STATE ) diff --git a/yal/tests/surveys/test_endline.py b/yal/tests/surveys/test_endline.py index 5b680d9d..725d846e 100644 --- a/yal/tests/surveys/test_endline.py +++ b/yal/tests/surveys/test_endline.py @@ -32,7 +32,7 @@ def get_rapidpro_contact(urn): def get_rapidpro_group(name): - return {"count": "100"} + return {"count": 100} @pytest.fixture(autouse=True) @@ -114,7 +114,7 @@ async def test_endline_invitation_i_want_to_answer( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = "100" + get_group_membership_count.return_value = 100 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -188,7 +188,7 @@ async def test_endline_invitation_answer( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = "100" + get_group_membership_count.return_value = 100 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1294,7 +1294,7 @@ async def test_endline_flow(tester: AppTester, rapidpro_mock): async def test_endline_agree_terms_and_condition( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = "100" + get_group_membership_count.return_value = 100 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" tester.user.metadata["terms_accepted"] = True diff --git a/yal/tests/test_main.py b/yal/tests/test_main.py index af06efc0..9e4d80c2 100644 --- a/yal/tests/test_main.py +++ b/yal/tests/test_main.py @@ -166,7 +166,7 @@ def get_aaq_response(answers, next=None, prev=None): def get_rapidpro_group(name): - return {"count": "100"} + return {"count": 100} @pytest.fixture @@ -891,7 +891,7 @@ async def test_state_self_perceived_healthcare_assessment_later( async def test_endline_survey_start_keywords( get_group_membership_count, tester: AppTester, rapidpro_mock, contentrepo_api_mock ): - get_group_membership_count.return_value = "100" + get_group_membership_count.return_value = 100 rapidpro_mock.tstate.contact_fields["onboarding_completed"] = True rapidpro_mock.tstate.contact_fields["terms_accepted"] = True @@ -1593,7 +1593,7 @@ async def test_survey_invite_remind_me_tomorrow( async def test_state_endline_limit_reached( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = "250" + get_group_membership_count.return_value = 250 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1609,7 +1609,7 @@ async def test_state_endline_limit_reached( async def test_state_endline_limit_reached_menu( get_group_membership_count, tester: AppTester, rapidpro_mock ): - get_group_membership_count.return_value = "250" + get_group_membership_count.return_value = 250 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1651,7 +1651,7 @@ async def test_state_endline_limit_reached_aaq( mock_config, get_group_membership_count, tester: AppTester, rapidpro_mock ): mock_config.AAQ_URL = "http://aaq-test.com" - get_group_membership_count.return_value = "250" + get_group_membership_count.return_value = 250 tester.user.metadata["baseline_survey_completed"] = True tester.user.metadata["endline_survey_started"] = "Pending" @@ -1683,4 +1683,4 @@ async def test_state_endline_limit_reached_aaq( await tester.user_input("Ask a question") - tester.assert_state("state_aaq_start") + tester.assert_state("state_aaq_start") \ No newline at end of file From 08944fbaaf5744e17d73673281322936b1177565 Mon Sep 17 00:00:00 2001 From: Hlamalani Date: Wed, 22 Nov 2023 14:18:36 +0200 Subject: [PATCH 5/5] change group count value to int --- yal/tests/test_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yal/tests/test_main.py b/yal/tests/test_main.py index 9e4d80c2..435626be 100644 --- a/yal/tests/test_main.py +++ b/yal/tests/test_main.py @@ -1683,4 +1683,4 @@ async def test_state_endline_limit_reached_aaq( await tester.user_input("Ask a question") - tester.assert_state("state_aaq_start") \ No newline at end of file + tester.assert_state("state_aaq_start")