From 63c8751e066f6ad6aaf8f2ae90040674832944fd Mon Sep 17 00:00:00 2001 From: Matt Condon Date: Mon, 4 Dec 2017 17:08:28 +0200 Subject: [PATCH] fix: linter errors --- test/RBAC.test.js | 81 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/test/RBAC.test.js b/test/RBAC.test.js index 19f72e1f5..3db66ad9b 100644 --- a/test/RBAC.test.js +++ b/test/RBAC.test.js @@ -1,99 +1,98 @@ -const RBACMock = artifacts.require('./mocks/RBACMock.sol') +import expectThrow from './helpers/expectThrow'; +import expectEvent from './helpers/expectEvent'; -import expectThrow from './helpers/expectThrow' -import expectEvent from './helpers/expectEvent' +const RBACMock = artifacts.require('./mocks/RBACMock.sol'); require('chai') .use(require('chai-as-promised')) - .should() + .should(); const ROLE_ADVISOR = 'advisor'; -contract('RBAC', function(accounts) { - let mock +contract('RBAC', function (accounts) { + let mock; const [ admin, anyone, futureAdvisor, ...advisors - ] = accounts + ] = accounts; before(async () => { - mock = await RBACMock.new(advisors, { from: admin }) - }) + mock = await RBACMock.new(advisors, { from: admin }); + }); context('in normal conditions', () => { it('allows admin to call #onlyAdminsCanDoThis', async () => { await mock.onlyAdminsCanDoThis({ from: admin }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('allows admin to call #onlyAdvisorsCanDoThis', async () => { await mock.onlyAdvisorsCanDoThis({ from: admin }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('allows advisors to call #onlyAdvisorsCanDoThis', async () => { await mock.onlyAdvisorsCanDoThis({ from: advisors[0] }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('allows admin to call #eitherAdminOrAdvisorCanDoThis', async () => { await mock.eitherAdminOrAdvisorCanDoThis({ from: admin }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('allows advisors to call #eitherAdminOrAdvisorCanDoThis', async () => { await mock.eitherAdminOrAdvisorCanDoThis({ from: advisors[0] }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('does not allow admins to call #nobodyCanDoThis', async () => { expectThrow( mock.nobodyCanDoThis({ from: admin }) - ) - }) + ); + }); it('does not allow advisors to call #nobodyCanDoThis', async () => { expectThrow( mock.nobodyCanDoThis({ from: advisors[0] }) - ) - }) + ); + }); it('does not allow anyone to call #nobodyCanDoThis', async () => { expectThrow( mock.nobodyCanDoThis({ from: anyone }) - ) - }) + ); + }); it('allows an admin to remove an advisor\'s role', async () => { await mock.removeAdvisor(advisors[0], { from: admin }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('allows admins to #adminRemoveRole', async () => { await mock.adminRemoveRole(advisors[3], ROLE_ADVISOR, { from: admin }) - .should.be.fulfilled - }) + .should.be.fulfilled; + }); it('announces a RoleAdded event on addRole', async () => { expectEvent.inTransaction( mock.adminAddRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), 'RoleAdded' - ) - }) + ); + }); it('announces a RoleRemoved event on removeRole', async () => { expectEvent.inTransaction( mock.adminRemoveRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), 'RoleRemoved' - ) - }) - }) + ); + }); + }); context('in adversarial conditions', () => { it('does not allow an advisor to remove another advisor', async () => { expectThrow( mock.removeAdvisor(advisors[1], { from: advisors[0] }) - ) - }) + ); + }); it('does not allow "anyone" to remove an advisor', async () => { expectThrow( mock.removeAdvisor(advisors[0], { from: anyone }) - ) - }) - }) - -}) + ); + }); + }); +});