From 5210eaf82f1d22f619917588efa53b1b98d6d384 Mon Sep 17 00:00:00 2001
From: Haythem Sellami <sellamihaythem96@gmail.com>
Date: Wed, 10 Jul 2019 10:58:01 +0100
Subject: [PATCH] modify tests scripts & travis config

---
 .travis.yml                        |  1 +
 apps/contribution/package.json     |  2 +-
 apps/contributor/package-lock.json | 35 ------------------------------
 apps/contributor/package.json      |  5 +++--
 apps/proposal/package.json         |  2 +-
 apps/token/package.json            |  2 +-
 6 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 518c575..56e64cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ install:
 script:
   - npm run lint:wrapper
   - npm run lint:contract-tests
+  - npm run devchain
   - npm test
 
 branches:
diff --git a/apps/contribution/package.json b/apps/contribution/package.json
index d38b57a..2ce67db 100644
--- a/apps/contribution/package.json
+++ b/apps/contribution/package.json
@@ -26,7 +26,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test": "aragon contracts test",
     "test:gas": "GAS_REPORTER=true npm test",
     "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
     "ganache-cli:test": "../../scripts/ganache-cli.sh"
diff --git a/apps/contributor/package-lock.json b/apps/contributor/package-lock.json
index 16bb683..dad8ed1 100644
--- a/apps/contributor/package-lock.json
+++ b/apps/contributor/package-lock.json
@@ -25200,24 +25200,6 @@
         }
       }
     },
-    "eth-ens-namehash": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz",
-      "integrity": "sha1-IprEbsqG1S4MmR58sq74P/D2i88=",
-      "dev": true,
-      "requires": {
-        "idna-uts46-hx": "^2.3.1",
-        "js-sha3": "^0.5.7"
-      },
-      "dependencies": {
-        "js-sha3": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz",
-          "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=",
-          "dev": true
-        }
-      }
-    },
     "eth-gas-reporter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eth-gas-reporter/-/eth-gas-reporter-0.2.0.tgz",
@@ -26259,23 +26241,6 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "idna-uts46-hx": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/idna-uts46-hx/-/idna-uts46-hx-2.3.1.tgz",
-      "integrity": "sha512-PWoF9Keq6laYdIRwwCdhTPl60xRqAloYNMQLiyUnG42VjT53oW07BXIRM+NK7eQjzXjAk2gUvX9caRxlnF9TAA==",
-      "dev": true,
-      "requires": {
-        "punycode": "2.1.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
-          "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
-          "dev": true
-        }
-      }
-    },
     "immediate": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
diff --git a/apps/contributor/package.json b/apps/contributor/package.json
index 3eb3a9b..30a7b15 100644
--- a/apps/contributor/package.json
+++ b/apps/contributor/package.json
@@ -9,7 +9,8 @@
   "devDependencies": {
     "eth-gas-reporter": "^0.2.0",
     "ganache-cli": "^6.4.3",
-    "solidity-coverage": "^0.5.11"
+    "solidity-coverage": "^0.5.11",
+    "@aragon/test-helpers": "^1.0.0"
   },
   "scripts": {
     "start": "npm run start:aragon:ipfs",
@@ -25,7 +26,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test": "aragon contracts test",
     "test:gas": "GAS_REPORTER=true npm test",
     "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
     "ganache-cli:test": "../../scripts/ganache-cli.sh"
diff --git a/apps/proposal/package.json b/apps/proposal/package.json
index a3f4e9a..054d3d2 100644
--- a/apps/proposal/package.json
+++ b/apps/proposal/package.json
@@ -26,7 +26,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test": "aragon contracts test",
     "test:gas": "GAS_REPORTER=true npm test",
     "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
     "ganache-cli:test": "../../scripts/ganache-cli.sh"
diff --git a/apps/token/package.json b/apps/token/package.json
index a45291e..e0168f4 100644
--- a/apps/token/package.json
+++ b/apps/token/package.json
@@ -26,7 +26,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "TRUFFLE_TEST=true PORT=7545 npm run ganache-cli:test",
+    "test": "aragon contracts test",
     "test:gas": "GAS_REPORTER=true npm test",
     "coverage": "SOLIDITY_COVERAGE=true npm run ganache-cli:test",
     "ganache-cli:test": "../../scripts/ganache-cli.sh"