missed push

ibourn · Jun 25, 2023 · a4ec224 · a4ec224
1 parent ec43e61
commit a4ec224
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/4. Truffle & CI-CD/VotingTest/test/Test_02_RegisterVoter.js b/4. Truffle & CI-CD/VotingTest/test/Test_02_RegisterVoter.js
@@ -5,7 +5,7 @@ const Voting = artifacts.require("Voting");
 const { getMockVoters, workflow } = require("./Test_VotingHelpers.js");
 
 contract("Voting / Test_02", (accounts) => {
-  const { owner, voter1 } = getMockVoters(accounts);
+  const { owner, voter1, voter2 } = getMockVoters(accounts);
 
   const curStatusId = 0;
   const nextStatusId = 1;
@@ -26,6 +26,19 @@ contract("Voting / Test_02", (accounts) => {
       expect(status.toNumber()).to.equal(curStatusId);
     });
 
+    it("should revert to get Voter1 when Voter1 not registered", async function () {
+      await expectRevert(
+        votingInstance.getVoter(voter1, { from: voter1 }),
+        "You're not a voter"
+      );
+    });
+
+    it("checks voter2 is not registered", async function () {
+      await votingInstance.addVoter(voter1, { from: owner });
+      const voter = await votingInstance.getVoter(voter2, { from: voter1 });
+      expect(voter.isRegistered).to.equal(false);
+    });
+
     describe("adding a voter", () => {
       beforeEach(async () => {
         receipt = await votingInstance.addVoter(voter1, { from: owner });

diff --git a/4. Truffle & CI-CD/VotingTest/test/Test_04_VotingSesson.js b/4. Truffle & CI-CD/VotingTest/test/Test_04_VotingSesson.js
@@ -61,21 +61,27 @@ contract("Voting / Test_04", (accounts) => {
       const testProposals = [0, 1, 2, 3];
       testProposals.forEach(function (t) {
         it(`checks that the ${t} proposal has no vote`, async function () {
-          const receipt = await votingInstance.getOneProposal(t, {
+          const proposal = await votingInstance.getOneProposal(t, {
             from: voter1,
           });
-          const voteCount = receipt[1];
-          expect(voteCount).to.not.equal(0);
+          expect(proposal.voteCount).to.be.bignumber.equal(new BN(0));
         });
       });
       const testVoters = [voter1, voter2, voter3];
       testVoters.forEach(function (t) {
         it(`checks that the ${t} voter has no voted proposal`, async function () {
-          const receipt = await votingInstance.getVoter(t, {
+          const voter = await votingInstance.getVoter(t, {
             from: voter1,
           });
-          const votedProposal = receipt[2];
-          expect(votedProposal).to.not.equal(0);
+          expect(voter.hasVoted).to.equal(false);
+        });
+      });
+      testVoters.forEach(function (t) {
+        it(`checks that the ${t} voter votedProposalId is default value: 0`, async function () {
+          const voter = await votingInstance.getVoter(t, {
+            from: voter1,
+          });
+          expect(voter.votedProposalId).to.be.bignumber.equal(new BN(0));
         });
       });
     });

diff --git a/4. Truffle & CI-CD/VotingTest/test/Test_VotingHelpers.js b/4. Truffle & CI-CD/VotingTest/test/Test_VotingHelpers.js
@@ -37,7 +37,7 @@ module.exports = {
     return votingInstance;
   },
   mockEndProposal: async (votingInstance, owner, voter1, voter2, voter3) => {
-    await votingInstance.addProposal("first propsoal", {
+    await votingInstance.addProposal("first proposal", {
       from: voter1,
     });
     await votingInstance.addProposal("second proposal", {