Upgrade to @openzeppelin/test-helpers@0.5.1 (#1942)

3274d9db · Nicolás Venturo · GitHub · c8665228 · 3274d9db · 3274d9db
Unverified Commit 3274d9db authored Oct 10, 2019 by Nicolás Venturo Committed by GitHub Oct 10, 2019
76 changed files
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
  "devDependencies": {
    "@openzeppelin/gsn-helpers": "^0.2.0",
    "@openzeppelin/gsn-provider": "^0.1.8",
+    "@openzeppelin/test-helpers": "^0.5.1",
    "chai": "^4.2.0",
    "concurrently": "^5.0.0",
    "eslint": "^4.19.1",
@@ -62,7 +63,6 @@
    "lodash.startcase": "^4.4.0",
    "micromatch": "^4.0.2",
    "nodemon": "^1.19.3",
-    "openzeppelin-test-helpers": "^0.4.3",
    "solhint": "2.3.0",
    "solidity-coverage": "github:rotcivegaf/solidity-coverage#5875f5b7bc74d447f3312c9c0e9fc7814b482477",
    "solidity-docgen": "^0.3.4",

--- a/test/GSN/Context.behavior.js
+++ b/test/GSN/Context.behavior.js
-const { BN, expectEvent } = require('openzeppelin-test-helpers');
+const { BN, expectEvent } = require('@openzeppelin/test-helpers');
 const ContextMock = artifacts.require('ContextMock');

--- a/test/GSN/Context.test.js
+++ b/test/GSN/Context.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const ContextMock = artifacts.require('ContextMock');
 const ContextMockCaller = artifacts.require('ContextMockCaller');

--- a/test/GSN/ERC721GSNRecipientMock.test.js
+++ b/test/GSN/ERC721GSNRecipientMock.test.js
-const { constants, expectEvent } = require('openzeppelin-test-helpers');
+const { constants, expectEvent } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const gsn = require('@openzeppelin/gsn-helpers');
 const { fixSignature } = require('../helpers/sign');

--- a/test/GSN/GSNBouncerERC20Fee.test.js
+++ b/test/GSN/GSNBouncerERC20Fee.test.js
-const { ether, expectEvent } = require('openzeppelin-test-helpers');
+const { ether, expectEvent } = require('@openzeppelin/test-helpers');
 const gsn = require('@openzeppelin/gsn-helpers');
 const { expect } = require('chai');

--- a/test/GSN/GSNBouncerSignature.test.js
+++ b/test/GSN/GSNBouncerSignature.test.js
-const { expectEvent, expectRevert, constants } = require('openzeppelin-test-helpers');
+const { expectEvent, expectRevert, constants } = require('@openzeppelin/test-helpers');
 const gsn = require('@openzeppelin/gsn-helpers');
 const { fixSignature } = require('../helpers/sign');
 const { utils: { toBN } } = require('web3');

--- a/test/GSN/GSNRecipient.test.js
+++ b/test/GSN/GSNRecipient.test.js
-const { balance, BN, constants, ether, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, BN, constants, ether, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const gsn = require('@openzeppelin/gsn-helpers');

--- a/test/access/Roles.test.js
+++ b/test/access/Roles.test.js
-const { expectRevert, constants } = require('openzeppelin-test-helpers');
+const { expectRevert, constants } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/behaviors/access/roles/PublicRole.behavior.js
+++ b/test/behaviors/access/roles/PublicRole.behavior.js
-const { expectRevert, constants, expectEvent } = require('openzeppelin-test-helpers');
+const { expectRevert, constants, expectEvent } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/crowdsale/AllowanceCrowdsale.test.js
+++ b/test/crowdsale/AllowanceCrowdsale.test.js
-const { balance, BN, constants, ether, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, BN, constants, ether, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/crowdsale/CappedCrowdsale.test.js
+++ b/test/crowdsale/CappedCrowdsale.test.js
-const { BN, ether, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/Crowdsale.test.js
+++ b/test/crowdsale/Crowdsale.test.js
-const { balance, BN, constants, ether, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, BN, constants, ether, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/crowdsale/FinalizableCrowdsale.test.js
+++ b/test/crowdsale/FinalizableCrowdsale.test.js
-const { BN, expectEvent, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, expectEvent, expectRevert, time } = require('@openzeppelin/test-helpers');
 const FinalizableCrowdsaleImpl = artifacts.require('FinalizableCrowdsaleImpl');
 const ERC20 = artifacts.require('ERC20');

--- a/test/crowdsale/IncreasingPriceCrowdsale.test.js
+++ b/test/crowdsale/IncreasingPriceCrowdsale.test.js
-const { BN, ether, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/IndividuallyCappedCrowdsale.test.js
+++ b/test/crowdsale/IndividuallyCappedCrowdsale.test.js
-const { BN, ether, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/MintedCrowdsale.behavior.js
+++ b/test/crowdsale/MintedCrowdsale.behavior.js
-const { balance, expectEvent } = require('openzeppelin-test-helpers');
+const { balance, expectEvent } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/MintedCrowdsale.test.js
+++ b/test/crowdsale/MintedCrowdsale.test.js
-const { BN, ether, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeMintedCrowdsale } = require('./MintedCrowdsale.behavior');
 const { expect } = require('chai');

--- a/test/crowdsale/PausableCrowdsale.test.js
+++ b/test/crowdsale/PausableCrowdsale.test.js
-const { BN, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, expectRevert } = require('@openzeppelin/test-helpers');
 const PausableCrowdsale = artifacts.require('PausableCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

--- a/test/crowdsale/PostDeliveryCrowdsale.test.js
+++ b/test/crowdsale/PostDeliveryCrowdsale.test.js
-const { BN, ether, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/RefundableCrowdsale.test.js
+++ b/test/crowdsale/RefundableCrowdsale.test.js
-const { balance, BN, ether, expectRevert, time } = require('openzeppelin-test-helpers');
+const { balance, BN, ether, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/RefundablePostDeliveryCrowdsale.test.js
+++ b/test/crowdsale/RefundablePostDeliveryCrowdsale.test.js
-const { BN, ether, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/TimedCrowdsale.test.js
+++ b/test/crowdsale/TimedCrowdsale.test.js
-const { BN, ether, expectEvent, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, ether, expectEvent, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/crowdsale/WhitelistCrowdsale.test.js
+++ b/test/crowdsale/WhitelistCrowdsale.test.js
-const { BN, ether, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const WhitelistCrowdsale = artifacts.require('WhitelistCrowdsaleImpl');
 const SimpleToken = artifacts.require('SimpleToken');

--- a/test/cryptography/ECDSA.test.js
+++ b/test/cryptography/ECDSA.test.js
-const { constants, expectRevert } = require('openzeppelin-test-helpers');
+const { constants, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { toEthSignedMessageHash, fixSignature } = require('../helpers/sign');

--- a/test/cryptography/MerkleProof.test.js
+++ b/test/cryptography/MerkleProof.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { MerkleTree } = require('../helpers/merkleTree.js');
 const { keccak256, bufferToHex } = require('ethereumjs-util');

--- a/test/drafts/Counters.test.js
+++ b/test/drafts/Counters.test.js
-const { expectRevert } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/drafts/ERC1046/ERC20Metadata.test.js
+++ b/test/drafts/ERC1046/ERC20Metadata.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const ERC20MetadataMock = artifacts.require('ERC20MetadataMock');

--- a/test/drafts/ERC20Migrator.test.js
+++ b/test/drafts/ERC20Migrator.test.js
-const { BN, constants, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/drafts/ERC20Snapshot.test.js
+++ b/test/drafts/ERC20Snapshot.test.js
-const { BN, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const ERC20SnapshotMock = artifacts.require('ERC20SnapshotMock');
 const { expect } = require('chai');

--- a/test/drafts/SignedSafeMath.test.js
+++ b/test/drafts/SignedSafeMath.test.js
-const { BN, constants, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectRevert } = require('@openzeppelin/test-helpers');
 const { MAX_INT256, MIN_INT256 } = constants;
 const { expect } = require('chai');

--- a/test/drafts/Strings.test.js
+++ b/test/drafts/Strings.test.js
-const { constants } = require('openzeppelin-test-helpers');
+const { constants } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/drafts/TokenVesting.test.js
+++ b/test/drafts/TokenVesting.test.js
-const { BN, constants, expectEvent, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/examples/SampleCrowdsale.test.js
+++ b/test/examples/SampleCrowdsale.test.js
-const { BN, balance, ether, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, balance, ether, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/examples/SimpleToken.test.js
+++ b/test/examples/SimpleToken.test.js
-const { constants, expectEvent } = require('openzeppelin-test-helpers');
+const { constants, expectEvent } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/introspection/ERC165.test.js
+++ b/test/introspection/ERC165.test.js
-const { expectRevert } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldSupportInterfaces } = require('./SupportsInterface.behavior');
 const ERC165Mock = artifacts.require('ERC165Mock');

--- a/test/introspection/ERC165Checker.test.js
+++ b/test/introspection/ERC165Checker.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/introspection/ERC1820Implementer.test.js
+++ b/test/introspection/ERC1820Implementer.test.js
-const { expectRevert, singletons } = require('openzeppelin-test-helpers');
+const { expectRevert, singletons } = require('@openzeppelin/test-helpers');
 const { bufferToHex, keccak256 } = require('ethereumjs-util');
 const { expect } = require('chai');

--- a/test/introspection/SupportsInterface.behavior.js
+++ b/test/introspection/SupportsInterface.behavior.js
-const { makeInterfaceId } = require('openzeppelin-test-helpers');
+const { makeInterfaceId } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/lifecycle/Pausable.test.js
+++ b/test/lifecycle/Pausable.test.js
-const { expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikePublicRole } = require('../behaviors/access/roles/PublicRole.behavior');
 const { expect } = require('chai');

--- a/test/math/Math.test.js
+++ b/test/math/Math.test.js
-const { BN } = require('openzeppelin-test-helpers');
+const { BN } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/math/SafeMath.test.js
+++ b/test/math/SafeMath.test.js
-const { BN, constants, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectRevert } = require('@openzeppelin/test-helpers');
 const { MAX_UINT256 } = constants;
 const { expect } = require('chai');

--- a/test/ownership/Ownable.behavior.js
+++ b/test/ownership/Ownable.behavior.js
-const { constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/ownership/Ownable.test.js
+++ b/test/ownership/Ownable.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeOwnable } = require('./Ownable.behavior');
 const Ownable = artifacts.require('OwnableMock');

--- a/test/ownership/Secondary.test.js
+++ b/test/ownership/Secondary.test.js
-const { constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/payment/PaymentSplitter.test.js
+++ b/test/payment/PaymentSplitter.test.js
-const { balance, constants, ether, expectEvent, send, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, constants, ether, expectEvent, send, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/payment/PullPayment.test.js
+++ b/test/payment/PullPayment.test.js
-const { balance, ether } = require('openzeppelin-test-helpers');
+const { balance, ether } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/payment/escrow/ConditionalEscrow.test.js
+++ b/test/payment/escrow/ConditionalEscrow.test.js
-const { ether, expectRevert } = require('openzeppelin-test-helpers');
+const { ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeEscrow } = require('./Escrow.behavior');
 const ConditionalEscrowMock = artifacts.require('ConditionalEscrowMock');

--- a/test/payment/escrow/Escrow.behavior.js
+++ b/test/payment/escrow/Escrow.behavior.js
-const { balance, ether, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, ether, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/payment/escrow/Escrow.test.js
+++ b/test/payment/escrow/Escrow.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeEscrow } = require('./Escrow.behavior');
 const Escrow = artifacts.require('Escrow');

--- a/test/payment/escrow/RefundEscrow.test.js
+++ b/test/payment/escrow/RefundEscrow.test.js
-const { balance, constants, ether, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { balance, constants, ether, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC20/ERC20.behavior.js
+++ b/test/token/ERC20/ERC20.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 const { ZERO_ADDRESS } = constants;

--- a/test/token/ERC20/ERC20.test.js
+++ b/test/token/ERC20/ERC20.test.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 const { ZERO_ADDRESS } = constants;

--- a/test/token/ERC20/ERC20Burnable.test.js
+++ b/test/token/ERC20/ERC20Burnable.test.js
-const { BN } = require('openzeppelin-test-helpers');
+const { BN } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC20Burnable } = require('./behaviors/ERC20Burnable.behavior');
 const ERC20BurnableMock = artifacts.require('ERC20BurnableMock');

--- a/test/token/ERC20/ERC20Capped.test.js
+++ b/test/token/ERC20/ERC20Capped.test.js
-const { BN, ether, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, ether, expectRevert } = require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC20Mintable } = require('./behaviors/ERC20Mintable.behavior');
 const { shouldBehaveLikeERC20Capped } = require('./behaviors/ERC20Capped.behavior');

--- a/test/token/ERC20/ERC20Detailed.test.js
+++ b/test/token/ERC20/ERC20Detailed.test.js
-const { BN } = require('openzeppelin-test-helpers');
+const { BN } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/token/ERC20/ERC20Pausable.test.js
+++ b/test/token/ERC20/ERC20Pausable.test.js
-const { BN, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/token/ERC20/SafeERC20.test.js
+++ b/test/token/ERC20/SafeERC20.test.js
-const { expectRevert } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('@openzeppelin/test-helpers');
 const ERC20ReturnFalseMock = artifacts.require('ERC20ReturnFalseMock');
 const ERC20ReturnTrueMock = artifacts.require('ERC20ReturnTrueMock');

--- a/test/token/ERC20/TokenTimelock.test.js
+++ b/test/token/ERC20/TokenTimelock.test.js
-const { BN, expectRevert, time } = require('openzeppelin-test-helpers');
+const { BN, expectRevert, time } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/token/ERC20/behaviors/ERC20Burnable.behavior.js
+++ b/test/token/ERC20/behaviors/ERC20Burnable.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC20/behaviors/ERC20Capped.behavior.js
+++ b/test/token/ERC20/behaviors/ERC20Capped.behavior.js
-const { expectRevert } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/token/ERC20/behaviors/ERC20Mintable.behavior.js
+++ b/test/token/ERC20/behaviors/ERC20Mintable.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC721/ERC721.behavior.js
+++ b/test/token/ERC721/ERC721.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 const { ZERO_ADDRESS } = constants;
 const { shouldSupportInterfaces } = require('../../introspection/SupportsInterface.behavior');

--- a/test/token/ERC721/ERC721.test.js
+++ b/test/token/ERC721/ERC721.test.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC721/ERC721Burnable.test.js
+++ b/test/token/ERC721/ERC721Burnable.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
 const {

--- a/test/token/ERC721/ERC721Full.test.js
+++ b/test/token/ERC721/ERC721Full.test.js
-const { BN, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');

--- a/test/token/ERC721/ERC721Holder.test.js
+++ b/test/token/ERC721/ERC721Holder.test.js
-const { BN } = require('openzeppelin-test-helpers');
+const { BN } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/token/ERC721/ERC721MintBurn.behavior.js
+++ b/test/token/ERC721/ERC721MintBurn.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC721/ERC721Mintable.test.js
+++ b/test/token/ERC721/ERC721Mintable.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
 const { shouldBehaveLikeMintAndBurnERC721 } = require('./ERC721MintBurn.behavior');

--- a/test/token/ERC721/ERC721Pausable.test.js
+++ b/test/token/ERC721/ERC721Pausable.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { shouldBehaveLikeERC721PausedToken } = require('./ERC721PausedToken.behavior');
 const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
 const { shouldBehaveLikePublicRole } = require('../../behaviors/access/roles/PublicRole.behavior');

--- a/test/token/ERC721/ERC721PausedToken.behavior.js
+++ b/test/token/ERC721/ERC721PausedToken.behavior.js
-const { BN, constants, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC777/ERC777.behavior.js
+++ b/test/token/ERC777/ERC777.behavior.js
-const { BN, constants, expectEvent, expectRevert } = require('openzeppelin-test-helpers');
+const { BN, constants, expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
 const { ZERO_ADDRESS } = constants;
 const { expect } = require('chai');

--- a/test/token/ERC777/ERC777.test.js
+++ b/test/token/ERC777/ERC777.test.js
-const { BN, expectEvent, expectRevert, singletons } = require('openzeppelin-test-helpers');
+const { BN, expectEvent, expectRevert, singletons } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/utils/Address.test.js
+++ b/test/utils/Address.test.js
-const { constants } = require('openzeppelin-test-helpers');
+const { constants } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');
 const AddressImpl = artifacts.require('AddressImpl');

--- a/test/utils/Arrays.test.js
+++ b/test/utils/Arrays.test.js
-require('openzeppelin-test-helpers');
+require('@openzeppelin/test-helpers');
 const { expect } = require('chai');

--- a/test/utils/ReentrancyGuard.test.js
+++ b/test/utils/ReentrancyGuard.test.js
-const { expectRevert } = require('openzeppelin-test-helpers');
+const { expectRevert } = require('@openzeppelin/test-helpers');
 const { expect } = require('chai');