branch develop updated (1b0f0b0d -> 962c9e64)
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 1b0f0b0d Update fixtures.yaml new dff5e089 fixes #321 Typo new 962c9e64 fixes #323 : fixes tests on CI (why does it work on my machine and not on CI ? The 2 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 962c9e649a382cd59ba617964bece792d86b0304 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 21 08:40:06 2020 +0200 fixes #323 : fixes tests on CI (why does it work on my machine and not on CI ? commit dff5e089363bb0b6e6dbb733cf65a20c7cdc07e2 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 21 07:04:22 2020 +0200 fixes #321 Typo Summary of changes: .../test/java/org/chorem/pollen/services/service/VoteServiceTest.java | 3 +-- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 3 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit dff5e089363bb0b6e6dbb733cf65a20c7cdc07e2 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 21 07:04:22 2020 +0200 fixes #321 Typo --- pollen-ui-riot-js/src/main/web/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n/en.json b/pollen-ui-riot-js/src/main/web/i18n/en.json index 33de96cf..9e1acb4a 100644 --- a/pollen-ui-riot-js/src/main/web/i18n/en.json +++ b/pollen-ui-riot-js/src/main/web/i18n/en.json @@ -305,7 +305,7 @@ "poll_settings_pollType_FREE_help": "Anyone with the poll link can vote.", "poll_settings_pollType_RESTRICTED": "Restricted", "poll_settings_pollType_RESTRICTED_help": "Only those invited to the next step can vote. An email will be sent to them with a personal link.", - "poll_settings_pollType_REGISTERED": "Registered uusers", + "poll_settings_pollType_REGISTERED": "Registered users", "poll_settings_pollType_REGISTERED_help": "Only registered users can vote.", "poll_settings_pollType_REGISTERED_limitEmail": "Limit to certain email addresses", "poll_settings_pollType_REGISTERED_suffix": "addresse suffix", -- 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 962c9e649a382cd59ba617964bece792d86b0304 Author: jcouteau <couteau@codelutin.com> Date: Tue Apr 21 08:40:06 2020 +0200 fixes #323 : fixes tests on CI (why does it work on my machine and not on CI ? --- .../test/java/org/chorem/pollen/services/service/VoteServiceTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3b7b5f4e..7318dd12 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 @@ -52,8 +52,6 @@ public class VoteServiceTest extends AbstractPollenServiceTest { @Test public void testPurgeOldVotes() { - - getServiceContext().setDate(new Date(1363948427576L)); //TODO should also check that old votes are properly anonymized try { service.purgeOldVotes(); @@ -65,6 +63,7 @@ public class VoteServiceTest extends AbstractPollenServiceTest { @Test public void testEditVote() throws Exception { PaginationParameterBean pagination = PaginationParameterBean.of(0,-1); + getServiceContext().setDate(new Date(1388707200000L)); login("jean@pollen.org", "fake"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm