From 833e4c064f39856a645067ab2398bc4d6369b1af Mon Sep 17 00:00:00 2001 From: ESchae Date: Wed, 3 Jan 2018 16:40:57 +0100 Subject: [PATCH 01/35] adjusted that token_id is returned as str in test_list_participants_success and test_list_participants_return_type_success --- tests/test__token.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test__token.py b/tests/test__token.py index 115f90f..e8ea773 100644 --- a/tests/test__token.py +++ b/tests/test__token.py @@ -236,7 +236,7 @@ def test_list_participants_return_type_success(self): """Querying for participants should return attrs with expected types.""" result = self.api.token.list_participants(survey_id=self.survey_id)[0] return_types_top = [ - ("tid", int), + ("tid", str), ("token", str), ("participant_info", dict), ] @@ -282,7 +282,7 @@ def test_list_participants_success(self): result = self.api.token.list_participants(survey_id=self.survey_id) result_token_ids = [x["tid"] for x in result] for token_id in self.token_ids: - self.assertIn(int(token_id), result_token_ids) + self.assertIn(token_id, result_token_ids) def test_list_participants_conditions_failure(self): """Querying with a condition matching none should result in an error.""" From 75ef36c2ffe71cf9f4f5c4103baf6ae1f5400fe3 Mon Sep 17 00:00:00 2001 From: ESchae Date: Thu, 4 Jan 2018 14:11:36 +0100 Subject: [PATCH 02/35] added possibility to name a survey id that should be used for the tests within the config file --- tests/config.ini.tmpl | 1 + tests/test_limesurvey.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/config.ini.tmpl b/tests/config.ini.tmpl index e68d213..da4c81c 100644 --- a/tests/config.ini.tmpl +++ b/tests/config.ini.tmpl @@ -2,3 +2,4 @@ url = http://localhost/limesurvey/index.php/admin/remotecontrol username = admin password = admin +survey_id = 0 diff --git a/tests/test_limesurvey.py b/tests/test_limesurvey.py index afc193a..e099f2d 100644 --- a/tests/test_limesurvey.py +++ b/tests/test_limesurvey.py @@ -28,9 +28,12 @@ def setUpClass(cls): username=cls.username) cls.session_key = None cls.api.open(password=cls.password) - - surveys = sorted(cls.api.survey.list_surveys(), key=itemgetter("sid")) - cls.survey_id = surveys[0].get("sid") + if not confparser['test']['survey_id']: + surveys = sorted(cls.api.survey.list_surveys(), + key=itemgetter("sid")) + cls.survey_id = surveys[0].get("sid") + else: + cls.survey_id = confparser['test']['survey_id'] cls.survey_id_invalid = -1 @classmethod From d98465a8d64bd9967ca982c73be2407793348c09 Mon Sep 17 00:00:00 2001 From: ESchae Date: Thu, 4 Jan 2018 14:45:26 +0100 Subject: [PATCH 03/35] small change in docstring of add_participants --- limesurveyrc2api/_token.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/limesurveyrc2api/_token.py b/limesurveyrc2api/_token.py index 0496e51..db67e86 100644 --- a/limesurveyrc2api/_token.py +++ b/limesurveyrc2api/_token.py @@ -13,7 +13,7 @@ def add_participants( Add participants to the specified survey. Parameters - :param survey_id: ID of survey to delete participants from. + :param survey_id: ID of survey to add participants. :type survey_id: Integer :param participant_data: List of participant detail dictionaries. :type participant_data: List[Dict] From 2aaa9d2277cf7b0ad6bba18c6a80196b9d809f17 Mon Sep 17 00:00:00 2001 From: ESchae Date: Thu, 4 Jan 2018 18:24:02 +0100 Subject: [PATCH 04/35] added lsa txt and xml survey file in fixtures --- ...her_questionnaire_different_fileformat.lsa | Bin 0 -> 9255 bytes ...ame_questionnaire_different_fileformat.txt | 69 +++++++++++++++++ ...ame_questionnaire_different_fileformat.xml | 73 ++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 tests/fixtures/an_other_questionnaire_different_fileformat.lsa create mode 100644 tests/fixtures/same_questionnaire_different_fileformat.txt create mode 100644 tests/fixtures/same_questionnaire_different_fileformat.xml diff --git a/tests/fixtures/an_other_questionnaire_different_fileformat.lsa b/tests/fixtures/an_other_questionnaire_different_fileformat.lsa new file mode 100644 index 0000000000000000000000000000000000000000..e05df2abae00c2197a87d71d878eee25dc3bdc90 GIT binary patch literal 9255 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 Z|1APV8Az!AT!r{MG5=Q08|i