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

Selenium Tutorial: Ant Build for Selenium Java project

Ant is a build tool which could be used to have your tests running either from command line or from Hudson CI tool. There is detailed documentation available for ant here but probably you need to know only a little part of it for you selenium tests. The essentials which are needed to know are: Project Target (ant execution point and collection of tasks) Tasks (could be as simple as compilation) And there would usually be following targets for Selenium tools - setClassPath - so that ant knows where you jar files are loadTestNG - so that you could use testng task in ant and use it to execute testng tests from ant init - created the build file clean - delete the build file compile - compiles the selenium tests run - executes the selenium tests Here is my project set up for ant -

Verify email confirmation using Selenium

Note: If you are new to java and selenium then start with selenium java training videos .     Email confirmation seems to be integral part of any registration process. I came across an application which lets you provide your email address. You can follow the sign up link in you mail and then complete the registration process. Lets consider we provide GMail address for it. Now if were to use only Selenium then we would have to follow following steps - Launch GMail using Selenium; Some how search for new mail in the list of available mails; Some how click on it; Parse the mail message; Get the registration link; Follow up with registration process What do you think of an approach in which you can

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