Fix test cases after merge & code review feedback

Author: johnhforrest

migrations/6_initialize_721token.js

@@ -23,7 +23,7 @@ module.exports = async (deployer, network, accounts) => {
 
         case 'rinkeby':
           erc20TokenAddress = '0xb05e292f89c6a82f5ed1be694dc7b6444866b364'
-          initialFees = 10 ** 18 // 1 token
+          initialFees = web3.toWei(1, 'ether')
           break
 
         default:

test/helpers/modifyMetadataHashes.js

@@ -25,7 +25,7 @@ export default async function modifyMetadataHashes({
 
   // If fees are enabled, a Transfer event is fired in addition to the Modified event
   const expectedLogsLength = feesEnabled ? 2 : 1
-  const logIndex = feesEnabled ? 1 : 0
+  const expectedEventIndex = feesEnabled ? 1 : 0
 
   const { logs } = await this.token.modifyMetadataHashes(
     this.tokenId,
@@ -50,13 +50,12 @@ export default async function modifyMetadataHashes({
 
   logs.length.should.be.equal(expectedLogsLength)
 
-  logs[logIndex].event.should.be.eq('Modified')
-  logs[logIndex].args._from.should.be.equal(this.creator)
-  logs[logIndex].args._tokenId.should.be.bignumber.equal(this.tokenId)
-  logs[logIndex].args._newNameHash.should.be.equal(tokenData[0])
-  logs[logIndex].args._newDescriptionHash.should.be.equal(tokenData[1])
-  logs[logIndex].args._newFileHashes.should.deep.equal(tokenData[2])
-  logs[logIndex].args._providerId.should.be.equal(providerId)
-  logs[logIndex].args._providerMetadataId.should.be.equal(providerMetadataId)
-
+  logs[expectedEventIndex].event.should.be.eq('Modified')
+  logs[expectedEventIndex].args._from.should.be.equal(this.creator)
+  logs[expectedEventIndex].args._tokenId.should.be.bignumber.equal(this.tokenId)
+  logs[expectedEventIndex].args._newNameHash.should.be.equal(tokenData[0])
+  logs[expectedEventIndex].args._newDescriptionHash.should.be.equal(tokenData[1])
+  logs[expectedEventIndex].args._newFileHashes.should.deep.equal(tokenData[2])
+  logs[expectedEventIndex].args._providerId.should.be.equal(providerId)
+  logs[expectedEventIndex].args._providerMetadataId.should.be.equal(providerMetadataId)
 }

test/token/behaviors/CodexTitle.behavior.js

@@ -169,49 +169,51 @@ export default function shouldBehaveLikeCodexTitle(accounts, metadata, feesEnabl
       })
     })
 
-    describe('metadata', function () {
-      it('should have the correct name', async function () {
-        const name = await this.token.name()
-        name.should.be.equal('Codex Title')
-      })
-
-      it('should have the correct symbol', async function () {
-        const symbol = await this.token.symbol()
-        symbol.should.be.equal('CT')
-      })
-
-      describe('tokenURI', function () {
-        it('should be empty by default', async function () {
-          const tokenURI = await this.token.tokenURI(firstTokenId)
-          tokenURI.should.be.equal('')
+    if (!feesEnabled) {
+      describe('metadata', function () {
+        it('should have the correct name', async function () {
+          const name = await this.token.name()
+          name.should.be.equal('Codex Title')
         })
 
-        describe('tokenURIPrefix', function () {
-          const constantTokenURIPrefix = 'https://codexprotocol.com/token/'
+        it('should have the correct symbol', async function () {
+          const symbol = await this.token.symbol()
+          symbol.should.be.equal('CT')
+        })
 
+        describe('tokenURI', function () {
           it('should be empty by default', async function () {
-            const tokenURIPrefix = await this.token.tokenURIPrefix()
-            tokenURIPrefix.should.be.equal('')
+            const tokenURI = await this.token.tokenURI(firstTokenId)
+            tokenURI.should.be.equal('')
           })
 
-          describe('when set by an address that is not the owner', function () {
-            it('should fail', async function () {
-              await assertRevert(this.token.setTokenURIPrefix(constantTokenURIPrefix, { from: unauthorized }))
+          describe('tokenURIPrefix', function () {
+            const constantTokenURIPrefix = 'https://codexprotocol.com/token/'
+
+            it('should be empty by default', async function () {
+              const tokenURIPrefix = await this.token.tokenURIPrefix()
+              tokenURIPrefix.should.be.equal('')
             })
-          })
 
-          describe('when called by the owner', function () {
-            beforeEach(async function () {
-              await this.token.setTokenURIPrefix(constantTokenURIPrefix)
+            describe('when set by an address that is not the owner', function () {
+              it('should fail', async function () {
+                await assertRevert(this.token.setTokenURIPrefix(constantTokenURIPrefix, { from: unauthorized }))
+              })
             })
 
-            it('should update the URI for all tokens', async function () {
-              const tokenURI = await this.token.tokenURI(firstTokenId)
-              tokenURI.should.be.equal(`${constantTokenURIPrefix}${firstTokenId}`)
+            describe('when called by the owner', function () {
+              beforeEach(async function () {
+                await this.token.setTokenURIPrefix(constantTokenURIPrefix)
+              })
+
+              it('should update the URI for all tokens', async function () {
+                const tokenURI = await this.token.tokenURI(firstTokenId)
+                tokenURI.should.be.equal(`${constantTokenURIPrefix}${firstTokenId}`)
+              })
             })
           })
         })
       })
-    })
+    }
   })
 }

test/token/behaviors/CodexTitleFees.behavior.js

@@ -75,7 +75,7 @@ export default function shouldBehaveLikeCodexTitleWithFees(accounts, metadata) {
             creator,
             hashedMetadata.name,
             hashedMetadata.description,
-            hashedMetadata.files[0],
+            hashedMetadata.files,
             providerId,
             providerMetadataId,
           )
@@ -94,7 +94,7 @@ export default function shouldBehaveLikeCodexTitleWithFees(accounts, metadata) {
           creator,
           hashedMetadata.name,
           hashedMetadata.description,
-          hashedMetadata.files[0],
+          hashedMetadata.files,
           providerId,
           providerMetadataId,
         )