Move tests in lib

Author: SamyPesse

.eslintrc

@@ -13,7 +13,11 @@
     "env": {
         "node": true,
         "mocha": true,
-        "browser": false
+        "browser": false,
+        "jasmine": true
+    },
+    "globals": {
+        "fixtures": true
     },
     "extends": "eslint:recommended"
 }

README.md

@@ -12,12 +12,6 @@ $ npm install gitkit
 
 ## Usage
 
-#### Examples
-
-| Example | Description |
-| ------- | ----------- |
-| [Clone](./examples/clone.js) | Clone a remote git repository |
-
 #### API
 
 ```js
@@ -31,21 +25,12 @@ var fs = NodeFS(process.cwd());
 var repo = Repository.createWithFS(fs, isBare);
 ```
 
-#### Command line Usage
-
-```
-# List commits on the current branch
-$ gitkit log
-
-# List entries in a tree
-$ gitkit ls-tree [sha]
+#### Examples
 
-# Print an object (blob / tree / commit)
-$ gitkit cat-file [sha]
+| Example | Description |
+| ------- | ----------- |
+| [Clone](./examples/clone.js) | Clone a remote git repository |
 
-# List all files in working directory
-$ gitkit ls-files
-```
 
 ## Thanks
 

test/applyDelta.js renamed to lib/TransferUtils/__tests__/applyDelta.js

@@ -1,5 +1,5 @@
 var Buffer = require('buffer').Buffer;
-var applyDelta = require('../lib/TransferUtils/applyDelta');
+var applyDelta = require('../applyDelta');
 
 var DELTA = 'mwKaApA1KGQyNWNhMjVhYWJmOTkzZTg1MjdkN2I4NGFhNjMxODkxZjJlZWVmNDiRXUAFMDY5NTORokouMDY5NTMzIC0wODAwCgphZGQgYXNzZXJ0LmVuZCgpIHRvIHV0aWxzIHRlc3RzCg==';
 var BASE = 'dHJlZSA0YWRlOTdjMTgxMjNjNTdhNTBlM2I5OTIzZDA1M2ZkMmRiNGY2MDVmCnBhcmVudCA3N2ZlMTg0OTRiNGI3ZWJmMGVjY2E0ZDBjY2Y4NTA3M2ZiMjFiZGZiCmF1dGhvciBDaHJpcyBEaWNraW5zb24gPGNocmlzdG9waGVyLnMuZGlja2luc29uQGdtYWlsLmNvbT4gMTM1NjY1NDMwMyAtMDgwMApjb21taXR0ZXIgQ2hyaXMgRGlja2luc29uIDxjaHJpc3RvcGhlci5zLmRpY2tpbnNvbkBnbWFpbC5jb20+IDEzNTY2NTQzMDMgLTA4MDAKCmJ1bXAgdmVyc2lvbiBmb3IgY2kudGVzdGxpbmcuY29tCg==';
@@ -12,6 +12,6 @@ describe('applyDelta', function() {
         var base = new Buffer(BASE, 'base64');
 
         var out = applyDelta(base, delta);
-        out.toString('base64').should.equal(OUTPUT);
+        expect(out.toString('base64'), OUTPUT);
     });
 });

lib/TransferUtils/__tests__/parseDiscovery.js

@@ -0,0 +1,36 @@
+var parseDiscovery = require('../parseDiscovery');
+
+describe('parseDiscovery', function() {
+    it('should parse capabilities and refs', function() {
+        var stream = fixtures.createReadStream('discovery-http-output');
+
+        return parseDiscovery(
+            stream
+        )
+        .then(function(out) {
+            expect(out).toExist();
+            expect(out.capabilities).toExist();
+            expect(out.capabilities).toEqual([
+                'multi_ack',
+                'thin-pack',
+                'side-band',
+                'side-band-64k',
+                'ofs-delta',
+                'shallow',
+                'no-progress',
+                'include-tag',
+                'multi_ack_detailed',
+                'no-done',
+                'symref=HEAD:refs/heads/master',
+                'agent=git/2:2.6.5+github-1394-g163a735'
+            ]);
+
+            expect(out.refs).toExist();
+            expect(out.refs.size).toBe(422);
+
+            expect(out.refs.get('HEAD').getCommit()).toBe('ba182ce8e430f08bd8c60865b9c853875a3d6483');
+            expect(out.refs.get('refs/heads/master').getCommit()).toBe('ba182ce8e430f08bd8c60865b9c853875a3d6483');
+            expect(out.refs.get('refs/tags/2.5.1').getCommit()).toBe('3388be9db6c6ae2173652df20eb98f36186c1f9a');
+        });
+    });
+});

lib/TransferUtils/__tests__/parsePack.js

@@ -0,0 +1,21 @@
+var parsePack = require('../parsePack');
+
+describe('parsePack', function() {
+    it('should output all objects', function(done) {
+        var packCount = 0;
+
+        fixtures.createReadStream('pack')
+        .pipe(parsePack())
+        .on('data', function(line) {
+            packCount++;
+        })
+        .on('error', function(err) {
+            done(err);
+        })
+        .on('finish', function() {
+            expect(packCount).toBe(481);
+
+            done();
+        });
+    });
+});

test/parsePktLines.js renamed to lib/TransferUtils/__tests__/parsePktLines.js

@@ -1,24 +1,20 @@
-var should = require('should');
 var intoStream = require('into-stream');
 
-var parsePktLines = require('../lib/TransferUtils/parsePktLines');
-var parsePktLineMeta = require('../lib/TransferUtils/parsePktLineMeta');
-var fixtures = require('./fixtures');
+var parsePktLines = require('../parsePktLines');
+var parsePktLineMeta = require('../parsePktLineMeta');
 
 var data = [
     '001bhi\0ofs-delta hat party\n',
     '0007hi\n',
     '0032want 0000000000000000000000000000000000000000\n',
     '0000'
-    //'PACK0123456678999'
 ];
 
-var expect = [
+var results = [
     {data:'hi\n', type:'pkt-line', caps:['ofs-delta', 'hat', 'party']},
     {data:'hi\n', type:'pkt-line', caps:['ofs-delta', 'hat', 'party']},
     {data:'want 0000000000000000000000000000000000000000\n', type:'pkt-line', caps:['ofs-delta', 'hat', 'party']},
     {data:'', type:'pkt-flush', caps:['ofs-delta', 'hat', 'party']}
-    //{size:17, data:'PACK0123456678999', type:'packfile', caps:['ofs-delta', 'hat', 'party']}
 ];
 
 describe('parsePktLines and parsePktLineMeta', function() {
@@ -29,16 +25,16 @@ describe('parsePktLines and parsePktLineMeta', function() {
         .pipe(parsePktLines())
         .pipe(parsePktLineMeta())
         .on('data', function(line) {
-            var expectLine = expect[lineIdx];
+            var expectLine = results[lineIdx];
 
-            line.toString('utf8').should.equal(expectLine.data);
-            line.type.should.equal(expectLine.type);
-            should(line.caps).deepEqual(expectLine.caps);
+            expect(line.toString('utf8')).toBe(expectLine.data);
+            expect(line.type).toBe(expectLine.type);
+            expect(line.caps).toEqual(expectLine.caps);
 
             lineIdx++;
         })
         .on('finish', function() {
-            lineIdx.should.equal(expect.length);
+            expect(lineIdx).toBe(results.length);
 
             done();
         });
@@ -53,7 +49,7 @@ describe('parsePktLines and parsePktLineMeta', function() {
             count++;
         })
         .on('finish', function() {
-            count.should.equal(425);
+            expect(count).toBe(425);
 
             done();
         });

lib/TransferUtils/__tests__/parseUploadPack.js

@@ -0,0 +1,23 @@
+var parseUploadPack = require('../parseUploadPack');
+
+describe('parseUploadPack', function() {
+    this.timeout(3000000);
+
+    it('should output all lines', function(done) {
+        var objectCount = 0;
+
+        fixtures.createReadStream('pack-http-output')
+        .pipe(parseUploadPack())
+        .on('data', function() {
+            objectCount++;
+        })
+        .on('error', function(err) {
+            done(err);
+        })
+        .on('finish', function() {
+            expect(objectCount).toBe(12545);
+
+            done();
+        });
+    });
+});

test/blob.js renamed to lib/models/__tests__/blob.js

@@ -1,13 +1,11 @@
-var Git = require('../');
+var Blob = require('../blob');
 
 describe('Blob', function() {
-
     describe('.createFromString', function() {
         it('should create a blob', function() {
-            var blob = Git.Blob.createFromString('Hello World');
-            blob.should.be.an.instanceOf(Git.Blob);
+            var blob = Blob.createFromString('Hello World');
+            expect(blob).toBeA(Blob);
         });
     });
-
 });
 

lib/models/__tests__/object.js

@@ -0,0 +1,13 @@
+var GitObject = require('../object');
+
+describe('Object', function() {
+    describe('.createFromBuffer', function() {
+        it('should read tree', function() {
+            var buf = fixtures.read('object-tree');
+            var obj = GitObject.createFromZip(buf);
+
+            expect(obj.getContent().length).toBe(352);
+            expect(obj.getType()).toBe(GitObject.TYPES.TREE);
+        });
+    });
+});

lib/models/__tests__/tree.js

@@ -0,0 +1,14 @@
+var GitObject = require('../object');
+var Tree = require('../tree');
+
+describe('Tree', function() {
+    it('.createFromBuffer', function() {
+        var buf = fixtures.read('object-tree');
+
+        var obj = GitObject.createFromZip(buf);
+        var tree = Tree.createFromBuffer(obj.getContent());
+
+        var entries = tree.getEntries();
+        expect(entries.size).toBe(10);
+    });
+});

test/workingIndex.js renamed to lib/models/__tests__/workingIndex.js

@@ -1,17 +1,14 @@
-var Git = require('../');
-var fixtures = require('./fixtures');
+var WorkingIndex = require('../workingIndex');
 
 describe('WorkingIndex', function() {
-
     it('.createFromBuffer', function() {
         var buf = fixtures.read('index');
-        var wk = Git.WorkingIndex.createFromBuffer(buf);
+        var wk = WorkingIndex.createFromBuffer(buf);
 
         var version = wk.getVersion();
         var entries = wk.getEntries();
 
-        version.should.equal(2);
-        entries.size.should.equal(94);
+        expect(version).toBe(2);
+        expect(entries.size).toBe(94);
     });
-
 });

package.json

@@ -34,12 +34,14 @@
   },
   "devDependencies": {
     "eslint": "^2.7.0",
+    "expect": "^1.19.0",
     "into-stream": "^2.0.0",
     "mocha": "2.3.4",
     "should": "^8.0.1"
   },
   "scripts": {
-    "test": "node_modules/.bin/mocha -b --reporter spec --bail --timeout 15000 ./test/all.js"
+    "test": "./node_modules/.bin/mocha ./test/setup.js ./lib/**/*/__tests__/*.js --bail --reporter=list",
+    "lint": "eslint ."
   },
   "bin": {
     "gitkit": "./bin/git.js"

test/RepoUtils.js

@@ -0,0 +1,39 @@
+var fs = require('fs');
+var path = require('path');
+
+/*
+    Return path to a fixture
+
+    @param {String}
+    @return {String}
+*/
+function fixturePath(name) {
+    return path.resolve(__dirname, 'data', name);
+}
+
+
+/*
+    Read a fixture as a stream
+
+    @param {String}
+    @return {Stream}
+*/
+function createReadStream(name) {
+    return fs.createReadStream(fixturePath(name));
+}
+
+/*
+    Read a fixture as a buffer
+
+    @param {String}
+    @return {Buffer}
+*/
+function read(name) {
+    return fs.readFileSync(fixturePath(name));
+}
+
+module.exports = {
+    path: fixturePath,
+    read: read,
+    createReadStream: createReadStream
+};