Added tests for handle-input to bring code coverage back up as far as possible (can't mock git CLI right now). Update other tests that use eventually.be.fulfilled to use the new eventually.be.fulfilled() to make sure they truly check async.

DavidTPate · DavidTPate · commit d2ce47d318a0 · 2015-05-11T22:20:56.000-04:00
diff --git a/.jscsrc b/.jscsrc
@@ -39,7 +39,6 @@
     "disallowSpacesInFunctionDeclaration": {
         "beforeOpeningRoundBrace": true
     },
-    "requireMultipleVarDecl": true,
     "requireBlocksOnNewline": 1,
     "disallowEmptyBlocks": true,
     "disallowSpacesInsideArrayBrackets": true,
diff --git a/.jshintrc b/.jshintrc
@@ -16,6 +16,7 @@
   "strict": true,
   "eqnull": true,
   "node": true,
+  "mocha": true,
   "predef": [
     "describe",
     "it",
diff --git a/bin/codacy-coverage.js b/bin/codacy-coverage.js
@@ -44,7 +44,7 @@
         var opts = {
             endpoint: program.endpoint,
             token: program.token,
-            commitId: program.commit,
+            commit: program.commit,
             format: program.format,
             pathPrefix: program.prefix,
             verbose: program.verbose,
diff --git a/lib/handleInput.js b/lib/handleInput.js
@@ -3,24 +3,23 @@
     module.exports = function (input, opts) {
         opts = opts || {};
 
-        var token = opts.token || process.env.CODACY_REPO_TOKEN,
-            commitId = opts.commit,
-            format = opts.format || 'lcov',
-            pathPrefix = opts.prefix || '',
-            loggerImpl;
+        var token = opts.token || process.env.CODACY_REPO_TOKEN;
+        var commit = opts.commit;
+        var format = opts.format || 'lcov';
+        var pathPrefix = opts.prefix || '';
+        var loggerImpl;
 
         loggerImpl = logger({
             verbose: opts.verbose,
             debug: opts.debug
         });
 
         if (!token) {
-            var err = new Error('Token is required');
-            return Promise.reject(err);
+            return Promise.reject(new Error('Token is required'));
         }
 
         // Parse the coverage data for the given format and retrieve the commit id if we don't have it.
-        return Promise.all([parser.getParser(format).parse(pathPrefix, input), getGitData.getCommitId(commitId)]).spread(function (parsedCoverage, commitId) {
+        return Promise.all([parser.getParser(format).parse(pathPrefix, input), getGitData.getCommitId(commit)]).spread(function (parsedCoverage, commitId) {
             // Now that we've parse the coverage data to the correct format, send it to Codacy.
             loggerImpl.trace(parsedCoverage);
             loggerImpl.debug('Sending coverage');
diff --git a/test/getGitData.js b/test/getGitData.js
@@ -6,13 +6,7 @@
 
     describe('Get Git Data', function () {
         beforeEach(function () {
-            process.env.CODACY_GIT_COMMIT = '';
-            process.env.TRAVIS_COMMIT = '';
-            process.env.DRONE_COMMIT = '';
-            process.env.GIT_COMMIT = '';
-            process.env.CIRCLE_SHA1 = '';
-            process.env.CI_COMMIT_ID = '';
-            process.env.WERCKER_GIT_COMMIT = '';
+            helper.clearEnvironmentVariables();
         });
         it('should be able to get the commit id when one is passed', function () {
             return expect(getGitData.getCommitId('1234')).to.eventually.equal('1234');
@@ -52,7 +46,7 @@
             if (actualTravisCommit && process.env.TRAVIS_PULL_REQUEST === 'false') {
                 return expect(getGitData.getCommitId()).to.eventually.equal(actualTravisCommit);
             }
-            return expect(getGitData.getCommitId()).to.eventually.be.fulfilled;
+            return expect(getGitData.getCommitId()).to.eventually.be.fulfilled();
         });
     });
 }(require('util'), require('../lib/getGitData'), require('./helper')));
diff --git a/test/handleInput.js b/test/handleInput.js
@@ -1,12 +1,143 @@
-(function (handleInput, helper) {
+(function (handleInput, helper, Joi, request, fs, path) {
     'use strict';
 
     var expect = helper.chai.expect;
+    var lcovData = fs.readFileSync(__dirname + '/mock/lcov.info').toString();
 
     describe('Handle Input', function () {
-        it('should return a promise', function () {
-            return expect(handleInput()).to.eventually.be.rejected();
+        beforeEach(function () {
+            helper.clearEnvironmentVariables();
+        });
+        it('should be able to use the mock end-point', function () {
+            var bodyValidator = Joi.object({
+                total: Joi.number().valid(50),
+                fileReports: Joi.array().items(Joi.object({
+                    filename: Joi.string().valid('filename'),
+                    total: Joi.number().valid(10),
+                    coverage: Joi.object({
+                        1: Joi.number().valid(1),
+                        2: Joi.number().valid(3)
+                    })
+                }).required())
+            });
+
+            var sampleCoverageData = {
+                total: 50,
+                fileReports: [
+                    {
+                        filename: 'filename',
+                        total: 10,
+                        coverage: {
+                            1: 1,
+                            2: 3
+                        }
+                    }
+                ]
+            };
+
+            return helper.setupMockEndpoint('1234', '4321', bodyValidator)
+                .then(function () {
+                    return expect(request({
+                        url: 'https://www.codacy.com/api/coverage/1234/4321',
+                        method: 'POST',
+                        json: sampleCoverageData,
+                        resolveWithFullResponse: true
+                    }).promise()).to.eventually.satisfy(function (res) {
+                            expect(res.statusCode).to.equal(200);
+                            return true;
+                        });
+                });
+        });
+        it('should be able to parse lcov data', function () {
+            var expectedCoverage = {
+                total: 92,
+                fileReports: Joi.array().items(Joi.compile({
+                    filename: path.normalize('lib/reporter.js'),
+                    coverage: {
+                        1: 1,
+                        25: 1,
+                        39: 1,
+                        40: 3,
+                        44: 3,
+                        48: 3,
+                        50: 3,
+                        52: 3,
+                        54: 3,
+                        55: 3,
+                        61: 3,
+                        63: 3,
+                        67: 3,
+                        73: 2,
+                        74: 1,
+                        75: 1,
+                        76: 1,
+                        77: 1,
+                        79: 2,
+                        81: 1,
+                        82: 1,
+                        83: 1,
+                        84: 1,
+                        87: 3
+                    },
+                    total: 92
+                }))
+            };
+
+            return helper.setupMockEndpoint('1234', '4321', Joi.compile(expectedCoverage))
+                .then(function () {
+                    return expect(handleInput(lcovData, {
+                        token: '1234',
+                        commit: '4321'
+                    })).to.eventually.be.fulfilled();
+                });
+        });
+        it('should be able to parse lcov data with path prefix', function () {
+            var expectedCoverage = {
+                total: 92,
+                fileReports: Joi.array().items(Joi.compile({
+                    filename: path.normalize('my-project/lib/reporter.js'),
+                    coverage: {
+                        1: 1,
+                        25: 1,
+                        39: 1,
+                        40: 3,
+                        44: 3,
+                        48: 3,
+                        50: 3,
+                        52: 3,
+                        54: 3,
+                        55: 3,
+                        61: 3,
+                        63: 3,
+                        67: 3,
+                        73: 2,
+                        74: 1,
+                        75: 1,
+                        76: 1,
+                        77: 1,
+                        79: 2,
+                        81: 1,
+                        82: 1,
+                        83: 1,
+                        84: 1,
+                        87: 3
+                    },
+                    total: 92
+                }))
+            };
+
+            return helper.setupMockEndpoint('1234', '4321', Joi.compile(expectedCoverage))
+                .then(function () {
+                    return expect(handleInput(lcovData, {
+                        token: '1234',
+                        commit: '4321',
+                        prefix: 'my-project/'
+                    })).to.eventually.be.fulfilled();
+                });
+        });
+        it('shouldn\'t be able to send coverage with invalid input', function () {
+            return expect(handleInput()).to.eventually.be.rejectedWith(Error, 'Token is required');
         });
     });
 
-}(require('../lib/handleInput'), require('./helper')));
+}(require('../lib/handleInput'), require('./helper'), require('joi'), require('request-promise'), require('fs'), require('path')));
diff --git a/test/helper.js b/test/helper.js
@@ -27,6 +27,15 @@
 
     module.exports = {
         setupMockEndpoint: setupMockEndpoint,
-        chai: chai
+        chai: chai,
+        clearEnvironmentVariables: function () {
+            process.env.CODACY_GIT_COMMIT = '';
+            process.env.TRAVIS_COMMIT = '';
+            process.env.DRONE_COMMIT = '';
+            process.env.GIT_COMMIT = '';
+            process.env.CIRCLE_SHA1 = '';
+            process.env.CI_COMMIT_ID = '';
+            process.env.WERCKER_GIT_COMMIT = '';
+        }
     };
 }(require('nock'), require('chai'), require('bluebird')));
diff --git a/test/reporter.js b/test/reporter.js
@@ -57,7 +57,7 @@
                 .to.eventually.be.rejectedWith(Error, 'child "fileReports" fails because ["fileReports" does not contain 1 required value(s)]');
         });
         it('shouldn\'t be able to create a reporter with invalid options', function () {
-            expect(function () {
+            return expect(function () {
                 reporter({endpoint: 1});
             }).to.throw(Error, 'child "endpoint" fails because ["endpoint" must be a string]');
         });
@@ -66,7 +66,7 @@
                 .then(function () {
                     return expect(reporter({})
                         .sendCoverage('1234', '4321', sampleCoverageData))
-                        .to.eventually.be.fulfilled;
+                        .to.eventually.be.fulfilled();
                 });
         });
         it('should receive error when non-200 status code', function () {
