Fix open election no description (#22)

* Fix open election with no description * Make code more readable * Add validation
novom · Aug 17, 2022 · 0921a81 · 0921a81
1 parent 52b5890
commit 0921a81
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/src/lib/belenios/admin/__tests__/openElection.test.js b/src/lib/belenios/admin/__tests__/openElection.test.js
@@ -32,30 +32,23 @@ describe('Tests createElection', () => {
   });
 
   it('Should return an election id. Election with no description', () => {
-    const election = {
+    const election1 = {
       name: 'Name of the election',
       questions: [{
         answers: ['Answer 1', 'Answer 2'], min: 0, max: 1, question: 'Question 1?',
       }, {
         answers: ['Answer 1', 'Answer 2'], blank: true, min: 1, max: 1, question: 'Question 2?',
       }],
     };
-
-    const electionId = openElection(DEFAULT_VOTERS, election);
-    deleteElection(electionId);
-
     const election2 = {
-      description: '',
+      description: null,
+      name: 'Name of the election',
       questions: [{
         answers: ['Answer 1', 'Answer 2'], min: 0, max: 1, question: 'Question 1?',
       }, {
         answers: ['Answer 1', 'Answer 2'], blank: true, min: 1, max: 1, question: 'Question 2?',
       }],
     };
-
-    const electionId2 = openElection(DEFAULT_VOTERS, election2);
-    deleteElection(electionId2);
-
     const election3 = {
       description: { fr: undefined, en: undefined },
       name: 'Name of the election',
@@ -65,8 +58,31 @@ describe('Tests createElection', () => {
         answers: ['Answer 1', 'Answer 2'], blank: true, min: 1, max: 1, question: 'Question 2?',
       }],
     };
+    const election4 = {
+      name: 'Name of the election',
+      description: '',
+      questions: [{
+        answers: ['Answer 1', 'Answer 2'], min: 0, max: 1, question: 'Question 1?',
+      }, {
+        answers: ['Answer 1', 'Answer 2'], blank: true, min: 1, max: 1, question: 'Question 2?',
+      }],
+    };
+
+    const electionId1 = openElection(DEFAULT_VOTERS, election1);
+    deleteElection(electionId1);
+
+    const electionId2 = openElection(DEFAULT_VOTERS, election2);
+    deleteElection(electionId2);
 
     const electionId3 = openElection(DEFAULT_VOTERS, election3);
     deleteElection(electionId3);
+
+    const electionId4 = openElection(DEFAULT_VOTERS, election4);
+    deleteElection(electionId4);
+
+    expect(electionId1).toBeDefined();
+    expect(electionId2).toBeDefined();
+    expect(electionId3).toBeDefined();
+    expect(electionId4).toBeDefined();
   });
 });
diff --git a/src/lib/belenios/admin/makeElection.js b/src/lib/belenios/admin/makeElection.js
@@ -11,7 +11,7 @@ function stringifyTemplate(template) {
     questions,
   } = template;
 
-  const stringifyDescription = JSON.stringify(description);
+  const stringifyDescription = JSON.stringify(description) || '';
   const stringifyName = JSON.stringify(name);
   const stringifyQuestions = questions.map(({
     answers,