TestEngineering/Web/Automation/Gaia UI Testing: Difference between revisions

Line 76: Line 76:
## Check against the expected style of the gaia-ui-tests.
## Check against the expected style of the gaia-ui-tests.
## Check for pep8 errors.
## Check for pep8 errors.
## The commit message should be pre-populated with the commit message from when the changes were committed to master. Leave this commit message intact. You may add a second line to the message to indicate that this is an uplift to the branch of interest.
## If any problems are found, add comments to the pull request and flag the attachment on the bug as ''-'' to indicate it did not pass your review.
# Push your changes to your Github repo:
## If you got this far and there are no problems with the pull request, flag the attachment on the bug as ''+'' to indicate it passed your review.
## <code>git push origin branch_name</code>
# Merge the pull request:
# When the pull request for the uplift has been merged, set the ''status-b2g-v1.2'' flag to ''fixed'' and close the bug.
## If you are the second reviewer to ''r+'' the pull request then you may merge it. See merging pull requests for details.
# Go to Github and issue a pull request against your branch.
## Make sure the pull request is being issued against the correct upstream branch (e.g., v1.2). This will likely not be the default so you will have to change it manually.
# Attach the pull request to the bug.
## This can be done from the pull request if you have the [https://github.com/autonome/Github-Bugzilla-Tweaks Github Bugzilla Tweaks add-on] installed.
## This can also be done by pasting the url to the Github pull request into an attachment to the bug using 'paste text as attachment'.
## Flag the attachment for review and add a comment that this patch is to uplift to the branch of interest.


= Keeping Branches in Sync with Master =
= Keeping Branches in Sync with Master =
Confirmed users
425

edits