From 33605551e558c267f0759020aa9d287401ee6931 Mon Sep 17 00:00:00 2001 From: Maksandre Date: Mon, 10 Jun 2024 09:29:42 +0000 Subject: [PATCH] fix(tests): resolve review comments --- --- a/js-packages/.vscode/settings.json +++ b/js-packages/.vscode/settings.json @@ -4,7 +4,6 @@ "RUN_XCM_TESTS": "1" }, "mochaExplorer.files": "tests/**/*.test.ts", - "mochaExplorer.require": "ts-node/register", "mochaExplorer.esmLoader": true, "mochaExplorer.nodeArgv": ["--loader", "ts-node/esm"], "eslint.format.enable": true, --- a/js-packages/test-utils/util.ts +++ b/js-packages/test-utils/util.ts @@ -117,7 +117,6 @@ Identity = 'identity', Democracy = 'democracy', Council = 'council', - FinancialCouncil = 'financialcouncil', //CouncilMembership = 'councilmembership', TechnicalCommittee = 'technicalcommittee', Fellowship = 'fellowshipcollective', --- a/js-packages/tests/sub/governance/financialCouncil.test.ts +++ b/js-packages/tests/sub/governance/financialCouncil.test.ts @@ -1,5 +1,5 @@ import type {IKeyringPair} from '@polkadot/types/types'; -import {usingPlaygrounds, itSub, expect, Pallets, requirePalletsOrSkip, describeGov} from '@unique/test-utils/util.js'; +import {usingPlaygrounds, itSub, expect, describeGov} from '@unique/test-utils/util.js'; import {Event} from '@unique/test-utils'; import {democracyFastTrackVotingPeriod, IFinCounselors, clearTechComm, dummyProposalCall, initFinCouncil, clearFinCouncil, democracyLaunchPeriod, initFellowship, dummyProposal, fellowshipPropositionOrigin, defaultEnactmentMoment, initCouncil, clearCouncil, clearFellowship} from './util.js'; @@ -13,7 +13,6 @@ before(async function() { await usingPlaygrounds(async (helper, privateKey) => { - requirePalletsOrSkip(this, helper, [Pallets.FinancialCouncil]); sudoer = await privateKey('//Alice'); donor = await privateKey({url: import.meta.url}); }); @@ -227,7 +226,14 @@ )).to.be.rejectedWith('BadOrigin'); }); - itSub('[Negative] FinCouncil member can\'t add a Fellowship member', async ({helper}) => { + itSub('[Negative] FinCouncil cannot add a Fellowship member', async ({helper}) => { + const newFellowshipMember = helper.arrange.createEmptyAccount(); + const addMemberProposal = helper.fellowship.collective.addMemberCall(newFellowshipMember.address); + + await expect(proposalFromAllFinCouncil(addMemberProposal)).to.be.rejectedWith('BadOrigin'); + }); + + itSub('[Negative] FinCouncil member cannot add a Fellowship member', async ({helper}) => { const newFellowshipMember = helper.arrange.createEmptyAccount(); await expect(helper.finCouncil.collective.execute( finCounselors.andy, --- a/js-packages/tests/sub/governance/technicalCommittee.test.ts +++ b/js-packages/tests/sub/governance/technicalCommittee.test.ts @@ -133,10 +133,10 @@ itSub('[Negative] TechComm can\'t add FinCouncil member', async ({helper}) => { const newFinCouncilMember = helper.arrange.createEmptyAccount(); const addMemberProposal = helper.finCouncil.membership.addMemberCall(newFinCouncilMember.address); - await proposalFromAllCommittee(addMemberProposal); + await expect(proposalFromAllCommittee(addMemberProposal)).rejectedWith('BadOrigin'); const finCouncilMembers = await helper.finCouncil.membership.getMembers(); - expect(finCouncilMembers).to.contains(newFinCouncilMember.address); + expect(finCouncilMembers).to.not.contains(newFinCouncilMember.address); }); -- gitstuff