Merge pull request #73 from fabn/gitlab-links

Add provider links for gitlab
rafinskipg · Jan 11, 2017 · 6df54f0 · 6df54f0
2 parents 5d469ae + dc3c4ac
commit 6df54f0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/tasks/lib/get-provider-links.js b/tasks/lib/get-provider-links.js
@@ -14,10 +14,21 @@ function getProviderLinks() {
     bitbucket: {
       issue: '[#%s](' + this.options.repo_url + '/issues/%s)',
       commit: '[%s](' + this.options.repo_url + '/commits/%s)'
+    },
+    gitlab: {
+      issue: '[#%s](' + this.options.repo_url + '/issues/%s)',
+      commit: '[%s](' + this.options.repo_url + '/commit/%s)'
     }
   };
 
-  this.provider = this.options.repo_url.indexOf('github.com') !== -1 ? 'github' :'bitbucket';
+  if (this.options.repo_url.match(/bitbucket/)) {
+    this.provider = 'bitbucket';
+  } else if (this.options.repo_url.match(/gitlab/)) {
+    this.provider = 'gitlab';
+  } else {
+    // use github as default provider
+    this.provider = 'github';
+  }
   this.links = providerLinks[this.provider];
 }
 

diff --git a/test/git_changelog_generate.spec.js b/test/git_changelog_generate.spec.js
@@ -154,24 +154,38 @@ describe('git_changelog_generate.js', function() {
         expect(changelog.provider).to.equal('github');
 
         expect(changelog.links.issue).to.contain(repo_url);
-        expect(changelog.links.issue).to.contain('issue');
+        expect(changelog.links.issue).to.contain('issues/%s');
 
         expect(changelog.links.commit).to.contain(repo_url);
-        expect(changelog.links.commit).to.contain('commit');
+        expect(changelog.links.commit).to.contain('commit/%s');
       });
 
       it('should set provider/links to BitBucket', function() {
-        var repo_url = 'https://www.bitbuket.com/owner/repo';
+        var repo_url = 'https://www.bitbucket.com/owner/repo';
         changelog.options.repo_url = repo_url;
         changelog.getProviderLinks();
 
         expect(changelog.provider).to.equal('bitbucket');
 
         expect(changelog.links.issue).to.contain(repo_url);
-        expect(changelog.links.issue).to.contain('issue');
+        expect(changelog.links.issue).to.contain('issues/%s');
 
         expect(changelog.links.commit).to.contain(repo_url);
-        expect(changelog.links.commit).to.contain('commit');
+        expect(changelog.links.commit).to.contain('commits/%s');
+      });
+
+      it('should set provider/links to GitLab', function() {
+        var repo_url = 'https://gitlab.com/owner/repo';
+        changelog.options.repo_url = repo_url;
+        changelog.getProviderLinks();
+
+        expect(changelog.provider).to.equal('gitlab');
+
+        expect(changelog.links.issue).to.contain(repo_url);
+        expect(changelog.links.issue).to.contain('issues/%s');
+
+        expect(changelog.links.commit).to.contain(repo_url);
+        expect(changelog.links.commit).to.contain('commit/%s');
       });
 
     });