restruct test in folders accoridng packages

.travis.yml

@@ -2,8 +2,6 @@ language:
 - node_js:
 before_install:
   - npm install -g lerna
-  - npm install -g nyc
-  - npm install -g codecov
   # Repo for Yarn
   - sudo apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
   - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list

package.json

@@ -8,8 +8,8 @@
   },
   "nyc": {
     "exclude": [
-      "Solidity-IDE/*.js",
-      "test/**/*.js",
+      "packages/etherlime/Solidity-IDE/*.js",
+      "test/**/**/*.js",
       "tmpTest/**/*.js"
     ]
   },
@@ -29,7 +29,6 @@
     "ethers": "^4.0.27",
     "chai-as-promised": "^7.1.1",
     "codecov": "^3.0.2",
-    "lerna": "^3.13.4",
     "nyc": "^13.3.0",
     "openzeppelin-solidity": "^2.1.2",
     "sinon": "^7.1.0",

packages/etherlime-utils/.gitignore

@@ -0,0 +1 @@
+node_modules

packages/etherlime-utils/package.json

@@ -3,16 +3,10 @@
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
-  "scripts": {
-    "test": "nyc --temp-dir '../../.nyc_output' --check-coverage --lines 95 mocha 'test/*.js'"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "devDependencies": {
-    "assert": "^1.4.1",
-    "nyc": "^14.1.0",
-    "sinon": "^7.1.0",
-    "mocha": "5.2.0"
+  "dependencies": {
+    "chalk": "2.4.1"
   }
 }

packages/etherlime/package.json

@@ -44,7 +44,6 @@
     "ganache-cli": "^6.4.1",
     "keen-tracking": "4.0.15",
     "mkdirp": "0.5.1",
-    "mocha": "5.2.0",
     "moment": "2.22.2",
     "node-dir": "0.1.17",
     "original-require": "1.0.1",
@@ -60,13 +59,6 @@
   "bin": {
     "etherlime": "./cli.js"
   },
-  "devDependencies": {
-    "chai-as-promised": "^7.1.1",
-    "codecov": "^3.0.2",
-    "nyc": "^13.3.0",
-    "openzeppelin-solidity": "^2.1.2",
-    "sinon": "^7.1.0"
-  },
   "browser": {
     "fs": false,
     "fs-extra": false,

test/utils/address-utils.js → test/etherlime-utils/utils/address-utils.js

@@ -1,5 +1,5 @@
-const isAddress = require('./../../packages/etherlime-utils/utils/address-utils').isAddress;
-const config = require('./../config.json');
+const isAddress = require('./../../../packages/etherlime-utils/utils/address-utils').isAddress;
+const config = require('./../../config.json');
 const assert = require('assert');
 
 describe('Address utils tests', () => {

test/utils/contract-utils.js → test/etherlime-utils/utils/contract-utils.js

@@ -1,9 +1,9 @@
 const assert = require('assert');
 
-const isValidContract = require('./../../packages/etherlime-utils/utils/contract-utils').isValidContract;
-const isValidBytecode = require('./../../packages/etherlime-utils/utils/contract-utils').isValidBytecode;
+const isValidContract = require('./../../../packages/etherlime-utils/utils/contract-utils').isValidContract;
+const isValidBytecode = require('./../../../packages/etherlime-utils/utils/contract-utils').isValidBytecode;
 
-const ICOTokenContract = require('./../testContracts/ICOToken.json');
+const ICOTokenContract = require('./../../testContracts/ICOToken.json');
 
 describe('Contract utils tests', () => {
 

test/utils/linking-utils.js → test/etherlime-utils/utils/linking-utils.js

@@ -1,10 +1,10 @@
 const assert = require('assert');
 
-const isValidLibrary = require('./../../packages/etherlime-utils/utils/linking-utils').isValidLibrary;
-const linkLibrary = require('./../../packages/etherlime-utils/utils/linking-utils').linkLibrary;
+const isValidLibrary = require('./../../../packages/etherlime-utils/utils/linking-utils').isValidLibrary;
+const linkLibrary = require('./../../../packages/etherlime-utils/utils/linking-utils').linkLibrary;
 
-const DataContract = require('./../testContracts/DataContract.json');
-const Greetings = require('./../testContracts/Greetings.json');
+const DataContract = require('./../../testContracts/DataContract.json');
+const Greetings = require('./../../testContracts/Greetings.json');
 
 describe('Linking library tests', () => {
     it('should return true if library is empty object', () => {

test/utils/number-utils.js → test/etherlime-utils/utils/number-utils.js

@@ -1,4 +1,4 @@
-const isNumber = require('./../../packages/etherlime-utils/utils/number-utils').isNumber;
+const isNumber = require('./../../../packages/etherlime-utils/utils/number-utils').isNumber;
 const assert = require('assert');
 
 describe('Number utils tests', () => {

test/utils/report-utils.js → test/etherlime-utils/utils/report-utils.js

@@ -1,5 +1,5 @@
-const util = require('../../packages/etherlime/cli-commands/util');
-const colors = require('../../packages/etherlime-utils/utils/colors')
+const util = require('../../../packages/etherlime/cli-commands/util');
+const colors = require('../../../packages/etherlime-utils/utils/colors')
 const assert = require('assert');
 const sinon = require('sinon');
 

test/utils/url-utils.js → test/etherlime-utils/utils/url-utils.js

@@ -1,5 +1,5 @@
-const isUrl = require('./../../packages/etherlime-utils/utils/url-utils').isUrl;
-const config = require('./../config.json');
+const isUrl = require('./../../../packages/etherlime-utils/utils/url-utils').isUrl;
+const config = require('./../../config.json');
 const assert = require('assert');
 
 describe('Url utils tests', () => {

test/cli-commands/commands/commands.js → test/etherlime/cli-commands/commands/commands.js

@@ -5,15 +5,15 @@ chai.use(chaiAsPromised);
 const fs = require('fs-extra');
 const runCmdHandler = require('../utils/spawn-child-process').runCmdHandler;
 const sinon = require('sinon');
-const ganache = require('../../../packages/etherlime/cli-commands/ganache/ganache');
-const shape = require('../../../packages/etherlime/cli-commands/shape/shape');
-const ide = require('../../../packages/etherlime/cli-commands/etherlime-ide/etherlime-ide');
-const eventTracker = require('../../../packages/etherlime/cli-commands/event-tracker');
+const ganache = require('../../../../packages/etherlime/cli-commands/ganache/ganache');
+const shape = require('../../../../packages/etherlime/cli-commands/shape/shape');
+const ide = require('../../../../packages/etherlime/cli-commands/etherlime-ide/etherlime-ide');
+const eventTracker = require('../../../../packages/etherlime/cli-commands/event-tracker');
 
-const commands = require('../../../packages/etherlime/cli-commands/commands');
+const commands = require('../../../../packages/etherlime/cli-commands/commands');
 
 
-describe('root calling cli commands', () => {
+describe.only('root calling cli commands', () => {
 
     // it('should throw err if init cli command failed', async function () {
     //     fs.writeFileSync('./deploy.js', 'deployment script')

test/cli-commands/commands/event-tracker.js → test/etherlime/cli-commands/commands/event-tracker.js

@@ -7,7 +7,7 @@ describe('event tracking', () => {
 
     let requireStub;
     beforeEach(() => {
-        delete require.cache[require.resolve('../../../packages/etherlime/cli-commands/event-tracker')]
+        delete require.cache[require.resolve('../../../../packages/etherlime/cli-commands/event-tracker')]
         requireStub = sinon.stub(_module, '_load');
     })
 
@@ -16,7 +16,7 @@ describe('event tracking', () => {
         requireStub.withArgs('nyc').throws(new Error(`Cannot find module 'nyc'`));
         requireStub.callThrough();
 
-        const { analyticsClient, recordEvent } = require('../../../packages/etherlime/cli-commands/event-tracker')
+        const { analyticsClient, recordEvent } = require('../../../../packages/etherlime/cli-commands/event-tracker')
 
         const recordEventStub = sinon.stub(analyticsClient, 'recordEvent')
         recordEventStub.returns(true)
@@ -34,7 +34,7 @@ describe('event tracking', () => {
         requireStub.withArgs('nyc').returns({});
         requireStub.callThrough();
 
-        const { analyticsClient, recordEvent } = require('../../../packages/etherlime/cli-commands/event-tracker')
+        const { analyticsClient, recordEvent } = require('../../../../packages/etherlime/cli-commands/event-tracker')
 
         const recordEventStub = sinon.stub(analyticsClient, 'recordEvent')
         recordEventStub.returns(true)
@@ -51,7 +51,7 @@ describe('event tracking', () => {
         requireStub.withArgs('nyc').throws(new Error('Incorrect Error'));
         requireStub.callThrough();
 
-        assert.throws(() => { require('../../../packages/etherlime/cli-commands/event-tracker') }, 'Incorrect Error')
+        assert.throws(() => { require('../../../../packages/etherlime/cli-commands/event-tracker') }, 'Incorrect Error')
 
 
     })
@@ -63,7 +63,7 @@ describe('event tracking', () => {
         requireStub.withArgs('nyc').throws(new Error(`Cannot find module 'nyc'`));
         requireStub.callThrough();
 
-        const { analyticsClient, recordEvent, optOutUser } = require('../../../packages/etherlime/cli-commands/event-tracker')
+        const { analyticsClient, recordEvent, optOutUser } = require('../../../../packages/etherlime/cli-commands/event-tracker')
 
         optOutUser()