branch develop updated (e6f3edcd -> 3670b6e4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e6f3edcd fixes #339 : Vote restreint - impossible de voter authentifié new 3670b6e4 refs #339 fix tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3670b6e4b558adb699edacf1bf6819a5803b6b4a Author: jcouteau <couteau@codelutin.com> Date: Wed May 27 08:22:31 2020 +0200 refs #339 fix tests Summary of changes: pollen-services/src/main/resources/fixtures.yaml | 44 ------------------- .../{fixtures.yaml => restricted-fixtures.yaml} | 49 ---------------------- .../services/service/FavoriteListServiceTest.java | 4 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 4 +- .../pollen/services/service/VoteServiceTest.java | 2 + .../services/service/VoterListServiceTest.java | 4 +- 8 files changed, 17 insertions(+), 98 deletions(-) copy pollen-services/src/main/resources/{fixtures.yaml => restricted-fixtures.yaml} (58%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 3670b6e4b558adb699edacf1bf6819a5803b6b4a Author: jcouteau <couteau@codelutin.com> Date: Wed May 27 08:22:31 2020 +0200 refs #339 fix tests --- pollen-services/src/main/resources/fixtures.yaml | 44 ------------------- .../{fixtures.yaml => restricted-fixtures.yaml} | 49 ---------------------- .../services/service/FavoriteListServiceTest.java | 4 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 4 +- .../pollen/services/service/VoteServiceTest.java | 2 + .../services/service/VoterListServiceTest.java | 4 +- 8 files changed, 17 insertions(+), 98 deletions(-) diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/fixtures.yaml index a911b157..dd58c3f1 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/fixtures.yaml @@ -1,5 +1,3 @@ - - poll_normal: &normal !poll title: Sondage normal @@ -17,22 +15,6 @@ poll_normal: name: poll creator email: poll_creator@pollen.chorem.org -poll_restricted: - &restricted !poll - title: Sondage restricted - description: Sondage restricted de type normal - beginDate: 1/1/2014 - endDate: 1/2/2014 - anonymousVoteAllowed: false - continuousResults: false - pollType: RESTRICTED - voteVisibility: EVERYBODY - commentVisibility: EVERYBODY - resultVisibility: EVERYBODY - creator: !pollen-principal - name: poll creator - email: jean@pollen.org - questionA: &normal_questionA !question poll: *normal @@ -41,14 +23,6 @@ questionA: #choiceType: TEXT choiceAddAllowed: false -questionB: - &restricted_questionB !question - poll: *restricted - title: Question B - voteCountingType: 1 - #choiceType: TEXT - choiceAddAllowed: false - choiceA: &normal_questionA_choixA !choice question: *normal_questionA @@ -63,29 +37,12 @@ choiceB: description: choixB description choiceType: TEXT -choiceC: - &restricted_questionB_choixC !choice - question: *restricted_questionB - choiceValue: choixC - description: choixC description - choiceType: TEXT - -choiceD: - &restricted_questionB_choixD !choice - question: *restricted_questionB - choiceValue: choixD - description: choixD description - choiceType: TEXT - choices: - *normal_questionA_choixA - *normal_questionA_choixB - - *restricted_questionB_choixC - - *restricted_questionB_choixD questions: - *normal_questionA - - *restricted_questionB votes: - normal_vote1 @@ -93,7 +50,6 @@ votes: polls: - *normal - - *restricted pollenUIContext_chorem: &chorem !pollenUIContext diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/restricted-fixtures.yaml similarity index 58% copy from pollen-services/src/main/resources/fixtures.yaml copy to pollen-services/src/main/resources/restricted-fixtures.yaml index a911b157..e8d13df1 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/restricted-fixtures.yaml @@ -1,22 +1,3 @@ - - -poll_normal: - &normal !poll - title: Sondage normal - description: Sondage de type 'normal' - beginDate: 1/1/2014 - endDate: 1/2/2014 - #maxChoiceNumber: 2 - anonymousVoteAllowed: false - continuousResults: false - pollType: FREE - voteVisibility: EVERYBODY - commentVisibility: EVERYBODY - resultVisibility: EVERYBODY - creator: !pollen-principal - name: poll creator - email: poll_creator@pollen.chorem.org - poll_restricted: &restricted !poll title: Sondage restricted @@ -33,14 +14,6 @@ poll_restricted: name: poll creator email: jean@pollen.org -questionA: - &normal_questionA !question - poll: *normal - title: Question A - voteCountingType: 1 - #choiceType: TEXT - choiceAddAllowed: false - questionB: &restricted_questionB !question poll: *restricted @@ -49,20 +22,6 @@ questionB: #choiceType: TEXT choiceAddAllowed: false -choiceA: - &normal_questionA_choixA !choice - question: *normal_questionA - choiceValue: choixA - description: choixA description - choiceType: TEXT - -choiceB: - &normal_questionA_choixB !choice - question: *normal_questionA - choiceValue: choixB - description: choixB description - choiceType: TEXT - choiceC: &restricted_questionB_choixC !choice question: *restricted_questionB @@ -78,21 +37,13 @@ choiceD: choiceType: TEXT choices: - - *normal_questionA_choixA - - *normal_questionA_choixB - *restricted_questionB_choixC - *restricted_questionB_choixD questions: - - *normal_questionA - *restricted_questionB -votes: - - normal_vote1 - - normal_vote2 - polls: - - *normal - *restricted pollenUIContext_chorem: diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java index 93feed56..5e0ba1e3 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java @@ -61,7 +61,9 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { protected PollenUser user; @Before - public void setUp() throws ParseException { + public void setUp() throws Exception { + + loadFixtures("user-fixtures"); loadFixtures("fixtures"); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index 125af8f3..1894c4d9 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java @@ -67,7 +67,9 @@ public class PollServiceTest extends AbstractPollenServiceTest { protected SecurityService securityService; @Before - public void setUp() throws ParseException { + public void setUp() throws Exception { + + loadFixtures("user-fixtures"); loadFixtures("fixtures"); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java index 80c4d071..2c88f2a4 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java @@ -60,7 +60,9 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { protected PollenUser user; @Before - public void setUp() throws ParseException { + public void setUp() throws Exception { + + loadFixtures("user-fixtures"); loadFixtures("fixtures"); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java index 3615f3c9..0501101d 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteCountingServiceTest.java @@ -60,7 +60,9 @@ public class VoteCountingServiceTest extends AbstractPollenServiceTest { private VoteCountingService service; @Before - public void setUp() throws ParseException { + public void setUp() throws Exception { + + loadFixtures("user-fixtures"); loadFixtures("fixtures"); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java index 9a1c2bcd..64e2b7d9 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java @@ -57,6 +57,8 @@ public class VoteServiceTest extends AbstractPollenServiceTest { loadFixtures("fixtures"); + loadFixtures("restricted-fixtures"); + service = newService(VoteService.class); voterListService = newService(VoterListService.class); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java index 59af0d6d..9b75ee12 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java @@ -69,7 +69,9 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { protected PollenUser user; @Before - public void setUp() throws ParseException { + public void setUp() throws Exception { + + loadFixtures("user-fixtures"); loadFixtures("fixtures"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm