Merge pull request #57 from job13er/restore-default-behavior

Restore default behavior for master branch
ciena-blueplanet · Sep 15, 2016 · f245b8d · f245b8d
2 parents 4890660 + 32ffda2
commit f245b8d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/utils.js b/lib/utils.js
@@ -44,7 +44,7 @@ function processEnv (config) {
   config.ci.buildNumber = process.env[config.ci.env.buildNumber]
   config.prNumber = process.env[config.ci.env.pr]
   config.isPr = config.prNumber !== 'false'
-  config.branch = process.env[config.ci.env.branch]
+  config.branch = process.env[config.ci.env.branch] || 'master'
 
   logger.log(`pr-bumper::config: prNumber [${config.prNumber}], isPr [${config.isPr}]`)
 

diff --git a/tests/utils-spec.js b/tests/utils-spec.js
@@ -295,6 +295,21 @@ describe('utils', () => {
           expect(config.prNumber).to.be.equal('false')
         })
       })
+
+      describe('when no branch env is given', () => {
+        beforeEach(() => {
+          delete _config.ci.env.branch
+
+          saveEnv(Object.keys(env), realEnv)
+          setEnv(env)
+
+          config = utils.getConfig(_config)
+        })
+
+        it('should default to master branch', () => {
+          expect(config.branch).to.be.equal('master')
+        })
+      })
     })
   })