Adjust for rebase-caused changes

Author: Joshua Grosso

src/commands/fetch.js

@@ -78,6 +78,7 @@ function fetch(repo, options) {
   const argsString = R.join(' ', args);
   return core.fetch(argsString, { cwd: repo.workdir(), shell: true }, callback)
     .then(({ stdout }) => {
+      const response = generateResponse();
       response.raw = stdout;
       response.fetch = generateFetchStats(stdout);
 
@@ -88,7 +89,7 @@ function fetch(repo, options) {
       }
 
       return response;
-    }, errorCatchHandler(response));
+    }, errorCatchHandler);
 }
 
 export default fetch;

src/commands/pull.js

@@ -77,6 +77,7 @@ function pull(repo, options) {
 
   return core.pull(argsString, { cwd: repo.workdir(), shell: true }, callback)
     .then(({ stdout }) => {
+      const response = generateResponse();
       response.raw = stdout;
       response.pull = generatePullStats(stdout);
 
@@ -87,7 +88,7 @@ function pull(repo, options) {
       }
 
       return response;
-    }, errorCatchHandler(response));
+    }, errorCatchHandler);
 }
 
 export default pull;

src/commands/version.js

@@ -6,8 +6,8 @@ import {
 } from '../constants';
 import generateResponse from '../utils/generateResponse';
 
-const version = () => {
-  return core.version()
+const version = () =>
+  core.version()
     .then(({ stdout, stderr }) => {
       const response = generateResponse();
       response.raw = stdout;

src/utils/execHelper.js

@@ -1,9 +1,9 @@
 import child from 'child_process';
 import R from 'ramda';
 
-const exec = (command, input, opts) => new Promise(
+const exec = (command, input, opts = {}) => new Promise(
   (resolve, reject) => {
-    const options = R.mergeDeepRight((opts || {}), { env: process.env });
+    const options = R.mergeDeepRight(opts, { env: process.env });
 
     if (process.platform !== 'win32' && !R.contains('/usr/local/bin', options.env.PATH)) {
       options.env.PATH = `${options.env.PATH}${':/usr/local/bin'}`;

test/tests/helpers.spec.js

@@ -36,16 +36,18 @@ describe('helpers', () => {
         });
     });
 
-    it('errors if `.gitattributes` does not exist', function () {
-      const {
-        emptyRepo
-      } = this;
+    describe('when `.gitattributes` does not exist', () => {
+      it('errors', function () {
+        const {
+          emptyRepo
+        } = this;
 
-      return helpers.loadGitattributeFiltersFromRepo(emptyRepo)
-        .then(() => fail('Expected promise to fail!'))
-        .catch((err) => {
-          expect(err.message).to.equal('No .gitattributes found');
-        });
+        return helpers.loadGitattributeFiltersFromRepo(emptyRepo)
+          .then(() => fail('Expected promise to fail!'))
+          .catch((err) => {
+            expect(err.message).to.equal('No .gitattributes found');
+          });
+      });
     });
   });
 
@@ -78,4 +80,14 @@ describe('helpers', () => {
       it('returns `false`', todo);
     });
   });
+
+  describe('errorCatchHandler', () => {
+    describe('when the error is from LFS', () => {
+      it('returns a response object', todo);
+    });
+
+    describe('when the error is not from LFS', () => {
+      it('rethrows the error code', todo);
+    });
+  });
 });

test/tests/utils/execHelper.spec.js

@@ -40,7 +40,7 @@ describe('execHelper', () => {
         mockProcess
       } = this;
 
-      const promise = exec('test', '', { foo: 'bar' });
+      const promise = exec('test', '');
       execSpy.firstCall.args[2](null, 'some stdout', 'some stderr');
       return promise
         .then((result) => {