Visual Testing Platform for Android Apps

• Visual Testing Platform for Android Apps
  • Resources
  • Team specific guidelines
  • 1. Git
    • 1.1 Some Git rules
    • 1.2 Git workflow
    • 1.3 Writing good commit messages
  • 2. Documentation

Resources

• General project guidelines

Team specific guidelines

• Don't modify code that isn't yours, if you think there is an issue with someone else's code, please submit and issue.
• Even though we are using super linter in our pipeline, avoid structuring/pretty format/indent code that were part of previous commits, because this make code reviews quite tedious.
• In general, the more people working on the same code block/file, the more bugs will added, so avoid this practise.

1. Git

1.1 Some Git rules

There are a set of rules to keep in mind:

• Perform work in a feature branch.

  Why:

  Because this way all work is done in isolation on a dedicated branch rather than the main branch. It allows you to submit multiple pull requests without confusion. You can iterate without polluting the master branch with potentially unstable, unfinished code. read more...

• Branch out from develop

  Why:

  This way, you can make sure that code in master will almost always build without problems, and can be mostly used directly for releases (this might be overkill for some projects).

• Never push into develop or master branch. Make a Pull Request.

  Why:

  It notifies team members that they have completed a feature. It also enables easy peer-review of the code and dedicates forum for discussing the proposed feature.

• {NOT ENFORCED} Update your local develop branch and do an interactive rebase before pushing your feature and making a Pull Request. Or squash your pull request with the target branch

  Why:

  Rebasing will merge in the requested branch (master or develop) and apply the commits that you have made locally to the top of the history without creating a merge commit (assuming there were no conflicts). Resulting in a nice and clean history. read more ...

• Resolve potential conflicts while rebasing and before making a Pull Request.

• Delete local and remote feature branches after merging.

  Why:

  It will clutter up your list of branches with dead branches. It ensures you only ever merge the branch back into (master or develop) once. Feature branches should only exist while the work is still in progress.

• Before making a Pull Request, make sure your feature branch builds successfully and passes all tests (including code style checks).

  Why:

  You are about to add your code to a stable branch. If your feature-branch tests fail, there is a high chance that your destination branch build will fail too. Additionally, you need to apply code style check before making a Pull Request. It aids readability and reduces the chance of formatting fixes being mingled in with actual changes.

• Use this .gitignore file.

  Why:

  It already has a list of system files that should not be sent with your code into a remote repository. In addition, it excludes setting folders and files for most used editors, as well as most common dependency folders.

• Protect your develop and master branch.

  Why:

  It protects your production-ready branches from receiving unexpected and irreversible changes. read more... Github, Bitbucket and GitLab

1.2 Git workflow

Because of most of the reasons above, we use Feature-branch-workflow with Interactive Rebasing and some elements of Gitflow (naming and having a develop branch). The main steps are as follows:

• For a new project, initialize a git repository in the project directory. For subsequent features/changes this step should be ignored.

  cd <project directory>
  git init

• Checkout a new feature/bug-fix branch.

  git checkout -b <branchname>

• Make Changes.

  git add <file1> <file2> ...
  git commit

  Why:

  git add <file1> <file2> ... - you should add only files that make up a small and coherent change.

  git commit will start an editor which lets you separate the subject from the body.

  Read more about it in section 1.3.

  Tip:

  You could use git add -p instead, which will give you chance to review all of the introduced changes one by one, and decide whether to include them in the commit or not.

• Sync with remote to get changes you’ve missed.

  git checkout develop
  git pull

  Why:

  This will give you a chance to deal with conflicts on your machine while rebasing (later) rather than creating a Pull Request that contains conflicts.

• Update your feature branch with latest changes from develop by interactive rebase.

  git checkout <branchname>
  git rebase -i --autosquash develop

  Why:

  You can use --autosquash to squash all your commits to a single commit. Nobody wants many commits for a single feature in develop branch. read more...

• If you don’t have conflicts, skip this step. If you have conflicts, resolve them and continue rebase.

  git add <file1> <file2> ...
  git rebase --continue

• Push your branch. Rebase will change history, so you'll have to use -f to force changes into the remote branch. If someone else is working on your branch, use the less destructive --force-with-lease.

  git push -f

  Why:

  When you do a rebase, you are changing the history on your feature branch. As a result, Git will reject normal git push. Instead, you'll need to use the -f or --force flag. read more...

• Make a Pull Request.

• Pull request will be accepted, merged and close by a reviewer.

• Remove your local feature branch if you're done.

  git branch -d <branchname>

  to remove all branches which are no longer on remote

  git fetch -p && for branch in `git branch -vv --no-color | grep ': gone]' | awk '{print $1}'`; do git branch -D $branch; done

1.3 Writing good commit messages

Having a good guideline for creating commits and sticking to it makes working with Git and collaborating with others a lot easier. Here are some rules of thumb (source):

• Separate the subject from the body with a newline between the two.

  Why:

  Git is smart enough to distinguish the first line of your commit message as your summary. In fact, if you try git shortlog, instead of git log, you will see a long list of commit messages, consisting of the id of the commit, and the summary only.

• {NOT ENFORCED} Limit the subject line to 50 characters and Wrap the body at 72 characters.

  why

  Commits should be as fine-grained and focused as possible, it is not the place to be verbose. read more...

• Capitalize the subject line.

• Do not end the subject line with a period.

• {NOT ENFORCED} Use imperative mood in the subject line.

  Why:

  Rather than writing messages that say what a committer has done. It's better to consider these messages as the instructions for what is going to be done after the commit is applied on the repository. read more...

• Use the body to explain what and why as opposed to how.

2. Documentation

• Use this template for README.md, Feel free to add uncovered sections.
• For projects with more than one repository, provide links to them in their respective README.md files.
• Keep README.md updated as a project evolves.
• Comment your code. Try to make it as clear as possible what you are intending with each major section.
• If there is an open discussion on github or stackoverflow about the code or approach you're using, include the link in your comment.
• Don't use comments as an excuse for a bad code. Keep your code clean.
• Don't use clean code as an excuse to not comment at all.
• Keep comments relevant as your code evolves.