Solidity Coverage Fix (#328)

* Updated test script

* Updated travis script

* Mac Compatibility

* Ignored mocks and oracles in test coverage

Author: maxsam4

.solcover.js

@@ -4,5 +4,6 @@ module.exports = {
     copyPackages: ['openzeppelin-solidity'],
     testCommand: 'node ../node_modules/.bin/truffle test `find test/*.js ! -name a_poly_oracle.js -and ! -name s_v130_to_v140_upgrade.js` --network coverage',
     deepSkip: true,
-    skipFiles: ['external', 'flat', 'helpers']
+    skipFiles: ['external', 'flat', 'helpers', 'mocks', 'oracles'],
+    forceParse: ['mocks', 'oracles']
 };

.travis.yml

@@ -12,6 +12,7 @@ before_install:
   - sudo apt-get -y install solc
 before_script:
   - truffle version
+  - wget -O node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js
 script:
   - npm run test
 notifications:

scripts/test.sh

@@ -94,25 +94,16 @@ else
 fi
 
 if ! [ -z "${TRAVIS_PULL_REQUEST+x}" ] && [ "$TRAVIS_PULL_REQUEST" != false ]; then
-  mkdir tempPoly
-  mv contracts/modules/TransferManager/SingleTradeVolumeRestrictionManager.sol tempPoly/SingleTradeVolumeRestrictionManager.sol
-  mv contracts/modules/TransferManager/SingleTradeVolumeRestrictionManagerFactory.sol tempPoly/SingleTradeVolumeRestrictionManagerFactory.sol
-  mv test/x_single_trade_volume_restriction.js tempPoly/x_single_trade_volume_restriction.js
+  curl -o node_modules/solidity-coverage/lib/app.js https://raw.githubusercontent.com/maxsam4/solidity-coverage/relative-path/lib/app.js
   node_modules/.bin/solidity-coverage
-
   if [ "$CONTINUOUS_INTEGRATION" = true ]; then
     cat coverage/lcov.info | node_modules/.bin/coveralls
   fi
-
-  mv tempPoly/SingleTradeVolumeRestrictionManager.sol contracts/modules/TransferManager/SingleTradeVolumeRestrictionManager.sol
-  mv tempPoly/SingleTradeVolumeRestrictionManagerFactory.sol contracts/modules/TransferManager/SingleTradeVolumeRestrictionManagerFactory.sol
-  mv tempPoly/x_single_trade_volume_restriction.js test/x_single_trade_volume_restriction.js
-  rm -rf tempPoly
 else
   # Do not run a_poly_oracle,js tests unless it is a cron job from travis
   if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
     node_modules/.bin/truffle test `ls test/*.js`
   else
     node_modules/.bin/truffle test `find test/*.js ! -name a_poly_oracle.js -and ! -name s_v130_to_v140_upgrade.js`
   fi
-fi
+fi