Add branch name tests

Author: mawi12345

fixtures/project/webpack.config.js

@@ -2,15 +2,15 @@ module.exports = {
   entry: './index.js',
 
   output: {
-    publicPath: 'http://cdn.com/assets/[git-revision-version]/[git-revision-hash]',
-    filename: '[name]-[git-revision-version].js'
+    publicPath: 'http://cdn.com/assets/[git-revision-branch]/[git-revision-version]/[git-revision-hash]',
+    filename: '[name]-[git-revision-branch]-[git-revision-version].js'
   },
 
   module: {
     loaders: [
       {
         test: /\.(txt)$/,
-        loader: 'file?name=[name][git-revision-version].[ext]'
+        loader: 'file?name=[name]-[git-revision-branch]-[git-revision-version].[ext]'
       }
     ]
   }

lib/index.integration.spec.js

@@ -52,17 +52,24 @@ describe('git-revision-webpack-plugin (integration)', function () {
     expect(COMMITHASH.toString()).to.eql('9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2')
   })
 
-  describe('[git-revision-version] and [git-revision-hash] templates', function () {
+  it('should create the BRANCH file', function () {
+    var branchPath = path.join(targetBuild, 'BRANCH')
+    var BRANCH = fs.readFileSync(branchPath)
+
+    expect(BRANCH.toString()).to.eql('master')
+  })
+
+  describe('[git-revision-version], [git-revision-hash] and [git-revision-branch] templates', function () {
     it('should support templates in the output.filename', function () {
-      var versionPath = path.join(targetBuild, 'main-v1.0.0-1-g9a15b3b.js')
+      var versionPath = path.join(targetBuild, 'main-master-v1.0.0-1-g9a15b3b.js')
       fs.readFileSync(versionPath)
     })
 
     it('should support setting the public path', function () {
-      var versionPath = path.join(targetBuild, 'main-v1.0.0-1-g9a15b3b.js')
+      var versionPath = path.join(targetBuild, 'main-master-v1.0.0-1-g9a15b3b.js')
       var mainJs = fs.readFileSync(versionPath)
 
-      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/v1.0.0-1-g9a15b3b/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
+      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/master/v1.0.0-1-g9a15b3b/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
 
       expect(mainJs.indexOf(expectedPublicPath) !== -1).to.eql(true)
     })
@@ -78,6 +85,11 @@ describe('git-revision-webpack-plugin (integration)', function () {
       var plugin = new GitRevisionPlugin({ gitWorkTree: targetProject })
       expect(plugin.version()).to.eql('v1.0.0-1-g9a15b3b')
     })
+
+    it('should expose the branch', () => {
+      var plugin = new GitRevisionPlugin({ gitWorkTree: targetProject })
+      expect(plugin.branch()).to.eql('master')
+    })
   })
 })
 
@@ -118,17 +130,24 @@ describe('git-revision-webpack-plugin with lightweightTags option', function ()
     expect(COMMITHASH.toString()).to.eql('9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2')
   })
 
-  describe('[git-revision-version] and [git-revision-hash] templates', function () {
+  it('should create the BRANCH file', function () {
+    var branchPath = path.join(targetBuild, 'BRANCH')
+    var BRANCH = fs.readFileSync(branchPath)
+
+    expect(BRANCH.toString()).to.eql('master')
+  })
+
+  describe('[git-revision-version], [git-revision-hash] and [git-revision-branch] templates', function () {
     it('should support templates in the output.filename', function () {
-      var versionPath = path.join(targetBuild, 'main-v2.0.0-beta.js')
+      var versionPath = path.join(targetBuild, 'main-master-v2.0.0-beta.js')
       fs.readFileSync(versionPath)
     })
 
     it('should support setting the public path', function () {
-      var versionPath = path.join(targetBuild, 'main-v2.0.0-beta.js')
+      var versionPath = path.join(targetBuild, 'main-master-v2.0.0-beta.js')
       var mainJs = fs.readFileSync(versionPath)
 
-      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/v2.0.0-beta/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
+      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/master/v2.0.0-beta/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
 
       expect(mainJs.indexOf(expectedPublicPath) !== -1).to.eql(true)
     })
@@ -144,6 +163,10 @@ describe('git-revision-webpack-plugin with lightweightTags option', function ()
       var plugin = new GitRevisionPlugin({ gitWorkTree: targetProject, lightweightTags: true })
       expect(plugin.version()).to.eql('v2.0.0-beta')
     })
+
+    it('should expose the branch', () => {
+      var plugin = new GitRevisionPlugin({ gitWorkTree: targetProject, lightweightTags: true })
+      expect(plugin.branch()).to.eql('master')
+    })
   })
 })
-

lib/index.spec.js

@@ -72,4 +72,32 @@ describe('git-revision-webpack-plugin (unit)', function () {
       expect(runGitCommand.args[0][1]).to.eql('custom version command')
     })
   })
+
+  describe('on setting custom branch command', function () {
+    it('should run the build on .apply', function () {
+      var buildFile = sinon.spy()
+      GitRevisionPlugin.__set__('buildFile', buildFile)
+
+      new GitRevisionPlugin({
+        branchCommand: 'custom branch command'
+      }).apply()
+
+      var branchCall = buildFile.args.find(function (calls) {
+        return calls[4] === 'BRANCH'
+      })
+
+      expect(branchCall[2]).to.eql('custom branch command')
+    })
+
+    it('should run the custom git command on .version', function () {
+      var runGitCommand = sinon.spy()
+      GitRevisionPlugin.__set__('runGitCommand', runGitCommand)
+
+      new GitRevisionPlugin({
+        branchCommand: 'custom branch command'
+      }).branch()
+
+      expect(runGitCommand.args[0][1]).to.eql('custom branch command')
+    })
+  })
 })