check

daviddias · daviddias · commit 8a5d52d5e880 · 2016-01-25T14:25:51.000Z
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,18 +1,12 @@
 module.exports = function (config) {
   config.set({
-
-    // base path, that will be used to resolve files and exclude
     basePath: '',
-
-    // frameworks to use
     frameworks: ['mocha'],
 
-    // list of files / patterns to load in the browser
     files: [
       'tests/test-core/browser.js'
     ],
 
-    // list of preprocessors
     preprocessors: {
       'tests/test-core/*': ['webpack']
     },
@@ -29,7 +23,8 @@ module.exports = function (config) {
       },
       module: {
         loaders: [
-          { test: /\.json$/, loader: 'json' }
+          { test: /\.json$/, loader: 'json' },
+          { test: /\.js$/, loader: 'transform?brfs' }
         ]
       }
     },
@@ -40,39 +35,13 @@ module.exports = function (config) {
         colors: true
       }
     },
-
-    // test results reporter to use
-    // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
     reporters: ['spec'],
-
-    // web server port
     port: 9876,
-
-    // enable / disable colors in the output (reporters and logs)
     colors: true,
-
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
-
-    // enable / disable watching file and executing tests whenever any file changes
     autoWatch: false,
-
-    // Start these browsers, currently available:
-    // - Chrome
-    // - ChromeCanary
-    // - Firefox
-    // - Opera (has to be installed with `npm install karma-opera-launcher`)
-    // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`)
-    // - PhantomJS
-    // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`)
     browsers: process.env.TRAVIS ? ['Firefox'] : ['Chrome'],
-
-    // If browser does not capture in given timeout [ms], kill it
     captureTimeout: 60000,
-
-    // Continuous Integration mode
-    // if true, it capture browsers, run tests and exit
     singleRun: true
   })
 }
diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
     "async": "^1.5.2",
+    "brfs": "^1.4.3",
     "chai": "^3.4.1",
     "fs-blob-store": "^5.2.1",
     "istanbul": "^0.4.1",
@@ -55,6 +56,7 @@
     "raw-loader": "^0.5.1",
     "rimraf": "^2.4.4",
     "standard": "^5.4.1",
+    "transform-loader": "^0.2.3",
     "webpack": "diasdavid/webpack#81f5994"
   },
   "dependencies": {
diff --git a/src/ipfs-core/index.js b/src/ipfs-core/index.js
@@ -145,8 +145,6 @@ function IPFS (repo) {
         if (err) {
           return callback(err)
         }
-        console.log('->', block.data.length)
-        console.log('->', block.data)
         callback(null, {
           Key: multihash,
           Size: block.data.length
diff --git a/tests/test-core/browser.js b/tests/test-core/browser.js
@@ -13,6 +13,7 @@ describe('core', function () {
 
     var repoData = []
     repoContext.keys().forEach(function (key) {
+      console.log(key)
       repoData.push({
         key: key.replace('./', ''),
         value: repoContext(key)
diff --git a/tests/test-core/test-block.js b/tests/test-core/test-block.js
@@ -8,11 +8,10 @@ const fs = require('fs')
 const IPFS = require('../../src/ipfs-core')
 const Block = require('ipfs-merkle-dag').Block
 
-const isNode = !global.window
+// const isNode = !global.window
 
-const fileA = isNode
-  ? fs.readFileSync(process.cwd() + '/tests/repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data')
-  : new Buffer(require('raw!./../repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data'))
+const fileA = fs.readFileSync(process.cwd() + '/tests/repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data')
+  // : new Buffer(require('raw!./../repo-example/blocks/12207028/122070286b9afa6620a66f715c7020d68af3d10e1a497971629c07606bfdb812303d.data'))
 
 console.log('=>', fileA)
 

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,6 @@ function IPFS (repo) {`
`145`	`145`	`if (err) {`
`146`	`146`	`return callback(err)`
`147`	`147`	`}`
`148`		`- console.log('->', block.data.length)`
`149`		`- console.log('->', block.data)`
`150`	`148`	`callback(null, {`
`151`	`149`	`Key: multihash,`
`152`	`150`	`Size: block.data.length`