Merged feature/branches-exist into develop

Kyle Smith · Kyle Smith · commit ec7385c72d5c · 2016-01-05T11:22:55.000-07:00
diff --git a/spec/tests/Base-spec.js b/spec/tests/Base-spec.js
@@ -9,17 +9,25 @@ const Config = require('../../src/Config');
 describe('Base', function() {
   beforeEach(function() {
     const repoConfig = {
+      getString(key) {
+        const defaultConfig = Config.getConfigDefault();
+        return defaultConfig[key] || true;
+      },
       setString() {
         return Promise.resolve();
       }
     };
     this.repo = {
       config() {
         return Promise.resolve(repoConfig);
+      },
+      createBranch() {
+        return Promise.resolve();
+      },
+      getBranchCommit() {
+        return Promise.resolve({id(){ return '12345';}});
       }
     };
-
-    spyOn(NodeGit.Branch, 'lookup').and.returnValue(Promise.resolve());
   });
 
   it('should be able to require Base', function() {
@@ -34,6 +42,7 @@ describe('Base', function() {
 
   describe('init', function() {
     it('should throw error if no repository is passed', function(done) {
+      spyOn(NodeGit.Branch, 'lookup').and.returnValue(Promise.resolve());
       return Base.init()
         .then(jasmine.fail)
         .catch((reason) => {
@@ -43,6 +52,7 @@ describe('Base', function() {
     });
 
     it('should return new flow object if repository is passed', function(done) {
+      spyOn(NodeGit.Branch, 'lookup').and.returnValue(Promise.resolve());
       const defaultConfig = Config.getConfigDefault();
       return Base.init(this.repo, defaultConfig)
         .then((flow) => {
@@ -56,12 +66,57 @@ describe('Base', function() {
           done();
         });
     });
+
+    it('develop branch should exist after initialization', function(done) {
+      spyOn(NodeGit.Branch, 'lookup').and.returnValue(Promise.resolve());
+      const defaultConfig = Config.getConfigDefault();
+      return Base.init(this.repo, defaultConfig)
+        .then(() => Base.developBranchExists(this.repo))
+        .then((exists) => {
+          expect(exists).toBeTruthy();
+          done();
+        });
+    });
+
+    it('develop branch should not exist after initialization and delete develop branch', function(done) {
+      const defaultConfig = Config.getConfigDefault();
+      spyOn(NodeGit.Branch, 'lookup').and.callFake((repo, branchName) => {
+        if (branchName === defaultConfig['gitflow.branch.develop']) {
+          return Promise.reject(new Error('Could not find branch'));
+        }
+        return Promise.resolve();
+      });
+      return Base.init(this.repo, defaultConfig)
+        .then(() => Base.developBranchExists(this.repo))
+        .then((exists) => {
+          expect(exists).toBeFalsy();
+          done();
+        });
+    });
+
+    it('master branch should not exist after initialization and delete master branch', function(done) {
+      const defaultConfig = Config.getConfigDefault();
+      spyOn(NodeGit.Branch, 'lookup').and.callFake((repo, branchName) => {
+        if (branchName === defaultConfig['gitflow.branch.master']) {
+          return Promise.reject(new Error('Could not find branch'));
+        }
+        return Promise.resolve();
+      });
+      return Base.masterBranchExists(this.repo)
+        .then((exists) => {
+          expect(exists).toBeFalsy();
+          done();
+        });
+    });
   });
 
   describe('open', function() {
+    beforeEach(function() {
+      spyOn(NodeGit.Branch, 'lookup').and.returnValue(Promise.resolve());
+    });
+
     it('should throw error if no repository is passed', function(done) {
       return Base.open()
-        .then(jasmine.fail)
         .catch((reason) => {
           expect(reason).toEqual(jasmine.any(Error));
           done();
@@ -72,7 +127,6 @@ describe('Base', function() {
       spyOn(Base, 'isInitialized').and.returnValue(Promise.resolve(false));
 
       return Base.open(this.repo)
-        .then(jasmine.fail)
         .catch((reason) => {
           expect(reason).toEqual(jasmine.any(Error));
           done();
diff --git a/src/Base.js b/src/Base.js
@@ -31,6 +31,33 @@ function createFlowInstance(repo) {
  * @class
  */
 class Base {
+  /**
+   * Check if the repo is initialized with git flow and its develop branch exists
+   * @async
+   * @param {Repository}  repo  The nodegit repository instance to check
+   * @return {Boolean} Whether or not the develop branch as specified in the git config exists
+   */
+  static developBranchExists(repo) {
+    if (!repo) {
+      return Promise.reject(new Error(constants.ErrorMessage.REPO_REQUIRED));
+    }
+
+    return this.isInitialized(repo)
+      .then((isInitialized) => {
+        if (!isInitialized) {
+          return Promise.reject(new Error(constants.ErrorMessage.GIT_FLOW_NOT_INITIALIZED));
+        }
+
+        return repo.config()
+          .then((config) => {
+            const developBranchName = config.getString('gitflow.branch.develop');
+            return NodeGit.Branch.lookup(repo, developBranchName, NodeGit.Branch.BRANCH.LOCAL);
+          })
+          .then(() => true)
+          .catch(() => false);
+      });
+  }
+
   /**
    * Initializes the repo to use git flow
    * @async
@@ -108,6 +135,33 @@ class Base {
       });
   }
 
+  /**
+   * Check if the repo is initialized with git flow and its master branch exists
+   * @async
+   * @param {Repository}  repo  The nodegit repository instance to check
+   * @return {Boolean} Whether or not the master branch as specified in the git config exists
+   */
+  static masterBranchExists(repo) {
+    if (!repo) {
+      return Promise.reject(new Error(constants.ErrorMessage.REPO_REQUIRED));
+    }
+
+    return Base.isInitialized(repo)
+      .then((isInitialized) => {
+        if (!isInitialized) {
+          return Promise.reject(new Error(constants.ErrorMessage.GIT_FLOW_NOT_INITIALIZED));
+        }
+
+        return repo.config()
+          .then((config) => {
+            const masterBranchName = config.getString('gitflow.branch.master');
+            return NodeGit.Branch.lookup(repo, masterBranchName, NodeGit.Branch.BRANCH.LOCAL);
+          })
+          .then(() => true)
+          .catch(() => false);
+      });
+  }
+
   /**
    * Creates a Flow instance for a repo that already has git flow initialized
    * @async
diff --git a/src/constants/ErrorMessageConstants.js b/src/constants/ErrorMessageConstants.js
@@ -1,4 +1,5 @@
 const ErrorMessageConstants = {
+  GIT_FLOW_NOT_INITIALIZED: 'Git flow has not been initialized on this repo',
   REPO_REQUIRED: 'A repository is required'
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`const ErrorMessageConstants = {`
	`2`	`+ GIT_FLOW_NOT_INITIALIZED: 'Git flow has not been initialized on this repo',`
`2`	`3`	`REPO_REQUIRED: 'A repository is required'`
`3`	`4`	`};`
`4`	`5`