Skip to main content

Git Branching

If you use Git version control system then following commands may come handy for creating new branch for selenium tests -

Create new branch and commit tests/features to branch – 

git checkout –b <branchname>

Work on branch and commit

git commit –m “developed awesome feature” 

Merge branch to your local master

git checkout master

pull if remote master is updated and then merge the branch

git pull

If you want to avoid creation of merge commit then rebase else merge and push to remote master

git pull --rebase
 
git merge <branchname>
 
git push

Once done with branch then delete it

git branch –d <branchname>

If you want local branch to be pushed to git so that more than one committer could work on it

git push -u origin <branchname>
If origin does not have a <branchname>, then it is created on the fly. The -u tells git that you want to be able to easily push and pull changes to that branch in the future. This is needed when multiple committers are working on same branch
Now you can commit changes to remote local branch.

If another committer wants to use the <branchname>

git fetch origin
 
git checkout --track origin/<branchname>

The first command updates repository with the changes from the remote repository. The second command creates a local branch  that matches the origin/plugin branch and tells git that new committer wants to be able to easily push and pull from the branch on GitHub.

Deleting branch locally and from git 

git branch –d <branchname>
 
git push origin --delete <branch name>

In case there are conflicts when merging branch to master

  • Resolve conflicts manually
  • git commit
The commit message would be like this “””Merge branch 'branch name’””” and the push -
  • git push

Comments

Popular posts from this blog

Appium and android mobile app automation

Next appium and Android mobile app automation video tutoria l is live. If you are new to appium then please check - appium-tutorial This video tutorial covers - Start vysor (Just for this session and not mobile automation :)) Start appium and start appium inspector Desired Capabilities platformName - Android deviceName - L2N0219828001013 (as seen on "adb devices") Saved Capability Sets Start Session Scan app elements using appium inspector Get appPackage and appActivity using "APK info" app Install "APK info" app and open app whose appPackage and appActivity are required i.e. calculator Check top section of app icon com.android.calculator2 is app package com.android.calculator2.Calculator is app activity testng.xml file settings for running Android app tests Test details com.seleniumtests.tests.mobile.AndroidAppTest and CalculatorScreen class View beautiful STF test report  

Return only first or last element from webelements collection

Note: If you are new to java and selenium then start with selenium java training videos .     We often come across situation when there are multiple elements on a page and we probably like to exercise only a few of them using selenium webdriver. May be just first and last element. For example on a search result page we may like to click on only first and last link and not all. This is when Iterables API comes handy. (By the way I am assuming that you have already completed watching selenium training videos :)). Once we have collection of web element then we can use Iterables to get only first or last element as following - Consider that we fetch collection of element as - List< WebElement > webElements = getDriver().findElements(By. id ( "htmlID" ));   Now we can get the first web element from this collection as -  WebElement firstElement = Iterables. getFirst (webElements,  getDriver().findElement(By. id ( "defaultElement" )));   Herein second

FAQ

Back to Appium Tutorial Index Element Location Strategy  -  Launch UIAutomationViewer as -  uiautomatorviewer & Following is an example for UIAutomationViewer and using it to find elements on Android App. Herein an image of UIAutomationViewer with calculator application -  The Element 64 can be identified as -  driver.findElement(By.name("64")); driver.findElement(By.id("com.android.calculator2:id/formula")); driver.findElement(By.className("android.widget.EditText")); Element location by TagName is deprecated. Refer Stackoverflow  post1  and  post2  for more on this. You can also use xPath strategy to identify element as described in this  post . Appium also supports  Mobile JSON Wire Protocol  locator strategy - -ios uiautomation : a string corresponding to a recursive element search using the UIAutomation library (iOS-only) -android uiautomator : a string corresponding to a recursive element search