Merge pull request #100 from ipfs/tests/refactor

just a bit of cleanup

Author: daviddias

karma.conf.js

@@ -8,11 +8,11 @@ module.exports = function (config) {
 
     files: [
       nodeForgePath,
-      'tests/test-core/browser.js'
+      'test/core-tests/browser.js'
     ],
 
     preprocessors: {
-      'tests/test-core/*': ['webpack']
+      'test/core-tests/*': ['webpack']
     },
 
     webpack: {

package.json

@@ -8,21 +8,21 @@
   "main": "src/core/index.js",
   "scripts": {
     "lint": "standard --verbose | snazzy",
-    "coverage": "istanbul cover --print both -- _mocha tests/test-core/index.js",
-    "coverage:http-api": "istanbul cover --print both -- _mocha tests/test-http-api/index.js",
+    "coverage": "istanbul cover --print both -- _mocha test/core-tests/index.js",
+    "coverage:http-api": "istanbul cover --print both -- _mocha test/http-api-tests/index.js",
     "test": "npm run test:node && npm run test:browser",
     "test:node": "npm run test:node:core && npm run test:node:http-api && npm run test:node:cli",
     "test:node:teamcity": "npm run test:node:core:teamcity && npm run test:node:http-api:teamcity && npm run test:node:cli:teamcity",
-    "test:node:cli:teamcity": "mocha --reporter mocha-teamcity-reporter tests/test-cli/index.js",
-    "test:node:core:teamcity": "mocha --reporter mocha-teamcity-reporter tests/test-core/index.js",
-    "test:node:http-api:teamcity": "mocha --reporter mocha-teamcity-reporter tests/test-http-api/index.js",
-    "test:node:cli": "mocha tests/test-cli/index.js",
-    "test:node:core": "mocha tests/test-core/index.js",
-    "test:node:http-api": "mocha tests/test-http-api/index.js",
+    "test:node:cli:teamcity": "mocha --reporter mocha-teamcity-reporter test/cli-tests/index.js",
+    "test:node:core:teamcity": "mocha --reporter mocha-teamcity-reporter test/core-tests/index.js",
+    "test:node:http-api:teamcity": "mocha --reporter mocha-teamcity-reporter test/http-api-tests/index.js",
+    "test:node:cli": "mocha test/cli-tests/index.js",
+    "test:node:core": "mocha test/core-tests/index.js",
+    "test:node:http-api": "mocha test/http-api-tests/index.js",
     "test:browser": "karma start karma.conf.js",
     "test:browser:teamcity": "karma start --reporters teamcity --colors false karma.conf.js",
-    "test:core": "mocha tests/test-core/index.js",
-    "test:cli": "mocha tests/test-cli/index.js"
+    "test:core": "mocha test/core-tests/index.js",
+    "test:cli": "mocha test/cli-tests/index.js"
   },
   "pre-commit": [
     "lint",

src/core/init.js

@@ -10,7 +10,7 @@ module.exports = (repo, opts, callback) => {
   opts.bits = opts.bits || 2048
 
   // Pre-set config values.
-  var config = require('../../default-config.json')
+  var config = require('../init-files/default-config.json')
 
   // Verify repo does not yet exist (or that 'force' is provided).
   repo.exists((err, res) => {
@@ -65,7 +65,7 @@ module.exports = (repo, opts, callback) => {
     const blocks = new IpfsBlocks(repo)
     const dag = new IpfsDagService(blocks)
 
-    const initDocsPath = path.join(__dirname, '../../init-doc')
+    const initDocsPath = path.join(__dirname, '../init-files/init-docs')
 
     importer.import(initDocsPath, dag, {
       recursive: true