branch feature/pollen-riot-js updated (55df734 -> a86254a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 55df734 Amélioration settings new a86254a 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 a86254a1a2bec226e3e566af2ceb63111cd6a56e Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 31 10:46:17 2017 +0100 fix tests Summary of changes: .../src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java | 5 +++-- .../src/test/java/org/chorem/pollen/rest/api/PollApiTest.java | 1 + .../main/java/org/chorem/pollen/services/service/PollService.java | 4 +++- pollen-services/src/main/resources/fixtures.yaml | 1 + .../java/org/chorem/pollen/services/service/PollServiceTest.java | 4 ++-- .../org/chorem/pollen/services/service/VoteCountingServiceTest.java | 2 +- .../org/chorem/pollen/services/service/VoterListServiceTest.java | 4 ++-- pollen-ui-riot-js/src/main/web/js/PollService.js | 4 ++-- 8 files changed, 15 insertions(+), 10 deletions(-) -- 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 feature/pollen-riot-js in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit a86254a1a2bec226e3e566af2ceb63111cd6a56e Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 31 10:46:17 2017 +0100 fix tests --- .../src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java | 5 +++-- .../src/test/java/org/chorem/pollen/rest/api/PollApiTest.java | 1 + .../main/java/org/chorem/pollen/services/service/PollService.java | 4 +++- pollen-services/src/main/resources/fixtures.yaml | 1 + .../java/org/chorem/pollen/services/service/PollServiceTest.java | 4 ++-- .../org/chorem/pollen/services/service/VoteCountingServiceTest.java | 2 +- .../org/chorem/pollen/services/service/VoterListServiceTest.java | 4 ++-- pollen-ui-riot-js/src/main/web/js/PollService.js | 4 ++-- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java index 198bd29..27d4383 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java @@ -22,6 +22,7 @@ package org.chorem.pollen.rest.api.v1; */ import com.google.common.collect.Lists; +import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.services.bean.ChoiceBean; import org.chorem.pollen.services.bean.PaginationParameterBean; @@ -44,9 +45,9 @@ import java.util.List; */ public class PollApi extends WebMotionController { - public PollBean getNewPoll(PollService pollService) { + public PollBean getNewPoll(PollService pollService, ChoiceType choiceType) { - return pollService.getNewPoll(); + return pollService.getNewPoll(choiceType); } diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java index 480c2ee..41c11f1 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollApiTest.java @@ -126,6 +126,7 @@ public class PollApiTest extends AbstractPollenRestApiTest { poll.setVoteVisibility(VoteVisibility.EVERYBODY); poll.setVoteCountingType(1); poll.setTitle("title"); + poll.setChoiceType(ChoiceType.TEXT); List<ChoiceBean> choices = new ArrayList<>(); ChoiceBean choice1 = new ChoiceBean(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 225a3c7..8ed1754 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -23,6 +23,7 @@ package org.chorem.pollen.services.service; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.Choice; +import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenUser; @@ -147,9 +148,10 @@ public class PollService extends PollenServiceSupport { } - public PollBean getNewPoll() { + public PollBean getNewPoll(ChoiceType choiceType) { PollBean pollBean = new PollBean(); + pollBean.setChoiceType(choiceType); // -- default values -- // diff --git a/pollen-services/src/main/resources/fixtures.yaml b/pollen-services/src/main/resources/fixtures.yaml index b2a4219..6f98b9a 100644 --- a/pollen-services/src/main/resources/fixtures.yaml +++ b/pollen-services/src/main/resources/fixtures.yaml @@ -27,6 +27,7 @@ poll_normal: endDate: 1/2/2014 maxChoiceNumber: 2 closed: true + choiceType: TEXT choiceAddAllowed: false anonymousVoteAllowed: false continuousResults: false 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 37faa32..11d0cd6 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 @@ -73,7 +73,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { @Test public void createSafeFreePoll() throws InvalidFormException { - PollBean poll = service.getNewPoll(); + PollBean poll = service.getNewPoll(ChoiceType.TEXT); poll.setPollType(PollType.FREE); poll.setTitle("poll1"); @@ -134,7 +134,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { @Test public void testCreateFreePoll() throws InvalidFormException { - PollBean poll = service.getNewPoll(); + PollBean poll = service.getNewPoll(ChoiceType.TEXT); poll.setPollType(PollType.FREE); 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 821f3db..a86d904 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 @@ -73,7 +73,7 @@ public class VoteCountingServiceTest extends AbstractPollenServiceTest { @Test public void simplePoll() throws InvalidFormException { - PollBean poll = pollService.getNewPoll(); + PollBean poll = pollService.getNewPoll(ChoiceType.TEXT); poll.setBeginDate(DateUtils.addMinutes(serviceContext.getNow(), -1)); poll.setTitle("poll1"); 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 cf79195..adf3caa 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 @@ -112,7 +112,7 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { // create poll and voter list - PollBean poll = pollService.getNewPoll(); + PollBean poll = pollService.getNewPoll(ChoiceType.TEXT); poll.setPollType(PollType.RESTRICTED); poll.setTitle("poll1"); @@ -150,7 +150,7 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { login("jean@pollen.fake", "fake"); - PollBean poll = pollService.getNewPoll(); + PollBean poll = pollService.getNewPoll(ChoiceType.TEXT); poll.setPollType(PollType.RESTRICTED); poll.setTitle("poll1"); diff --git a/pollen-ui-riot-js/src/main/web/js/PollService.js b/pollen-ui-riot-js/src/main/web/js/PollService.js index 9bf692c..8434887 100644 --- a/pollen-ui-riot-js/src/main/web/js/PollService.js +++ b/pollen-ui-riot-js/src/main/web/js/PollService.js @@ -23,8 +23,8 @@ let FetchService = require("./FetchService"); class PollService extends FetchService { - empty() { - return this.get("/v1/polls/new"); + empty(choiceType) { + return this.getWithParams("/v1/polls/new", {choiceType: choiceType}); } create(form, choices) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm