Confirmed users
425
edits
TestEngineering/Web/Automation/Gaia UI Testing: Difference between revisions
TestEngineering/Web/Automation/Gaia UI Testing (view source)
Revision as of 21:39, 25 November 2013
, 25 November 2013→Uplifting Commits
| Line 94: | Line 94: | ||
## <code> git cherry-pick commit-hash</code> | ## <code> git cherry-pick commit-hash</code> | ||
## The cherry pick may or may not complete without conflicts. If there are conflicts, resolve them manually. | ## The cherry pick may or may not complete without conflicts. If there are conflicts, resolve them manually. | ||
## Please note: Use the commit hash of the original commit of code (the one submitted by the pull request author) as opposed to the commit hash of the merge commit (the one created by the person who merged the pull request). For example, for this [https://github.com/mozilla-b2g/gaia/pull/13644 | pull request], you would choose commit hash ''a9798fc'', which is the hash of Bob's original commit, not commit hash ''42de07a'', which is the commit hash of Zac's merge commit. | |||
# Run the affected test(s) against v1.2 to ensure that they still pass. | # Run the affected test(s) against v1.2 to ensure that they still pass. | ||
## Note that there may be several tests affected which may not be included in the commit. For example, if a locator or method in an app object changes, then any tests that make use of that app object property or method would need to be tested. | ## Note that there may be several tests affected which may not be included in the commit. For example, if a locator or method in an app object changes, then any tests that make use of that app object property or method would need to be tested. | ||