From 6a658f2ac85b4a4977288caf738c0306c903dae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= Date: Thu, 17 Jan 2019 20:26:56 -0300 Subject: [PATCH] Move PublicRole.behavior to behavior directory. --- test/access/roles/CapperRole.test.js | 2 +- test/access/roles/MinterRole.test.js | 2 +- test/access/roles/PauserRole.test.js | 2 +- test/access/roles/SignerRole.test.js | 2 +- test/access/roles/WhitelistAdminRole.test.js | 2 +- test/access/roles/WhitelistedRole.test.js | 2 +- test/{ => behavior}/access/roles/PublicRole.behavior.js | 0 test/crowdsale/IndividuallyCappedCrowdsale.test.js | 2 +- test/drafts/SignatureBouncer.test.js | 2 +- test/lifecycle/Pausable.test.js | 2 +- test/token/ERC20/ERC20Mintable.test.js | 2 +- test/token/ERC20/ERC20Pausable.test.js | 2 +- test/token/ERC721/ERC721Pausable.test.js | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename test/{ => behavior}/access/roles/PublicRole.behavior.js (100%) diff --git a/test/access/roles/CapperRole.test.js b/test/access/roles/CapperRole.test.js index a79944a27..903d75472 100644 --- a/test/access/roles/CapperRole.test.js +++ b/test/access/roles/CapperRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const CapperRoleMock = artifacts.require('CapperRoleMock'); contract('CapperRole', function ([_, capper, otherCapper, ...otherAccounts]) { diff --git a/test/access/roles/MinterRole.test.js b/test/access/roles/MinterRole.test.js index b2e70b53a..3c38bf8d4 100644 --- a/test/access/roles/MinterRole.test.js +++ b/test/access/roles/MinterRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const MinterRoleMock = artifacts.require('MinterRoleMock'); contract('MinterRole', function ([_, minter, otherMinter, ...otherAccounts]) { diff --git a/test/access/roles/PauserRole.test.js b/test/access/roles/PauserRole.test.js index 927e46c0b..efb23e538 100644 --- a/test/access/roles/PauserRole.test.js +++ b/test/access/roles/PauserRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const PauserRoleMock = artifacts.require('PauserRoleMock'); contract('PauserRole', function ([_, pauser, otherPauser, ...otherAccounts]) { diff --git a/test/access/roles/SignerRole.test.js b/test/access/roles/SignerRole.test.js index 317c100d7..c7e086b95 100644 --- a/test/access/roles/SignerRole.test.js +++ b/test/access/roles/SignerRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const SignerRoleMock = artifacts.require('SignerRoleMock'); contract('SignerRole', function ([_, signer, otherSigner, ...otherAccounts]) { diff --git a/test/access/roles/WhitelistAdminRole.test.js b/test/access/roles/WhitelistAdminRole.test.js index e59dcd895..e6fd93914 100644 --- a/test/access/roles/WhitelistAdminRole.test.js +++ b/test/access/roles/WhitelistAdminRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const WhitelistAdminRoleMock = artifacts.require('WhitelistAdminRoleMock'); contract('WhitelistAdminRole', function ([_, whitelistAdmin, otherWhitelistAdmin, ...otherAccounts]) { diff --git a/test/access/roles/WhitelistedRole.test.js b/test/access/roles/WhitelistedRole.test.js index e578f6fa2..611540663 100644 --- a/test/access/roles/WhitelistedRole.test.js +++ b/test/access/roles/WhitelistedRole.test.js @@ -1,4 +1,4 @@ -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const WhitelistedRoleMock = artifacts.require('WhitelistedRoleMock'); contract('WhitelistedRole', function ([_, whitelisted, otherWhitelisted, whitelistAdmin, ...otherAccounts]) { diff --git a/test/access/roles/PublicRole.behavior.js b/test/behavior/access/roles/PublicRole.behavior.js similarity index 100% rename from test/access/roles/PublicRole.behavior.js rename to test/behavior/access/roles/PublicRole.behavior.js diff --git a/test/crowdsale/IndividuallyCappedCrowdsale.test.js b/test/crowdsale/IndividuallyCappedCrowdsale.test.js index 40a3bf71c..f9920666d 100644 --- a/test/crowdsale/IndividuallyCappedCrowdsale.test.js +++ b/test/crowdsale/IndividuallyCappedCrowdsale.test.js @@ -2,7 +2,7 @@ const { BN, ether, shouldFail } = require('openzeppelin-test-helpers'); const IndividuallyCappedCrowdsaleImpl = artifacts.require('IndividuallyCappedCrowdsaleImpl'); const SimpleToken = artifacts.require('SimpleToken'); -const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../behavior/access/roles/PublicRole.behavior'); contract('IndividuallyCappedCrowdsale', function ( [_, capper, otherCapper, wallet, alice, bob, charlie, anyone, ...otherAccounts]) { diff --git a/test/drafts/SignatureBouncer.test.js b/test/drafts/SignatureBouncer.test.js index 21aa9d185..2527064f4 100644 --- a/test/drafts/SignatureBouncer.test.js +++ b/test/drafts/SignatureBouncer.test.js @@ -1,6 +1,6 @@ const { shouldFail } = require('openzeppelin-test-helpers'); const { getSignFor } = require('../helpers/sign'); -const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../behavior/access/roles/PublicRole.behavior'); const SignatureBouncerMock = artifacts.require('SignatureBouncerMock'); diff --git a/test/lifecycle/Pausable.test.js b/test/lifecycle/Pausable.test.js index 0b5fe3126..45b6012d6 100644 --- a/test/lifecycle/Pausable.test.js +++ b/test/lifecycle/Pausable.test.js @@ -1,5 +1,5 @@ const { expectEvent, shouldFail } = require('openzeppelin-test-helpers'); -const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../behavior/access/roles/PublicRole.behavior'); const PausableMock = artifacts.require('PausableMock'); diff --git a/test/token/ERC20/ERC20Mintable.test.js b/test/token/ERC20/ERC20Mintable.test.js index 083565d87..f4cc815fd 100644 --- a/test/token/ERC20/ERC20Mintable.test.js +++ b/test/token/ERC20/ERC20Mintable.test.js @@ -1,6 +1,6 @@ const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior'); const ERC20MintableMock = artifacts.require('ERC20MintableMock'); -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); contract('ERC20Mintable', function ([_, minter, otherMinter, ...otherAccounts]) { beforeEach(async function () { diff --git a/test/token/ERC20/ERC20Pausable.test.js b/test/token/ERC20/ERC20Pausable.test.js index 6240f64d1..ea1dd037f 100644 --- a/test/token/ERC20/ERC20Pausable.test.js +++ b/test/token/ERC20/ERC20Pausable.test.js @@ -1,7 +1,7 @@ const { BN, expectEvent, shouldFail } = require('openzeppelin-test-helpers'); const ERC20PausableMock = artifacts.require('ERC20PausableMock'); -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherAccount, ...otherAccounts]) { const initialSupply = new BN(100); diff --git a/test/token/ERC721/ERC721Pausable.test.js b/test/token/ERC721/ERC721Pausable.test.js index d43ea0071..55d315b94 100644 --- a/test/token/ERC721/ERC721Pausable.test.js +++ b/test/token/ERC721/ERC721Pausable.test.js @@ -1,7 +1,7 @@ require('openzeppelin-test-helpers'); const { shouldBehaveLikeERC721PausedToken } = require('./ERC721PausedToken.behavior'); const { shouldBehaveLikeERC721 } = require('./ERC721.behavior'); -const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior'); +const { shouldBehaveLikePublicRole } = require('../../behavior/access/roles/PublicRole.behavior'); const ERC721PausableMock = artifacts.require('ERC721PausableMock.sol');