Skip to content

after_merge_steps

Jump to bottom
Vyacheslav Semushin edited this page Mar 5, 2016 · 14 revisions

What to do after your commit has been merged?

Create tickets for technical debt

Unit tests

When you're adding/modifying methods in ru.mystamps.web.service classes you should also add/update unit tests for this code. However, if you didn't provide unit tests then I'm asking you to create an issue for adding them later.

Follow the recommendations:

  • Add title by template: <ClassName>.<methodName>(): add unit tests
  • Add labels: techdebt, area/unit tests
  • Fill comment by template: Tech debt for: <commit> (#<issueNumber>)

Integration tests

When you're adding/modifying application behavior (and especially when it's visible to user) you should also add/update integration tests for this. However, if you didn't provide integration tests then I'm asking you to create an issue for adding them later.

Follow the recommendations:

  • Add title by template: Add integration tests for <short case description>
  • Add labels: techdebt, area/integration tests
  • Describe cases with steps that should be tested
  • Append to line to comment: Tech debt for: <commit> (#<issueNumber>)

Remove merged branch

$ git checkout master
$ git push origin --delete <branchName> # remove remote branch
$ git branch -D <branchName>            # remove local branch
$ git remote prune origin               # remove local copy of remote branch
Clone this wiki locally