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

How can you save resources when instantiaing driver?

I asked on my previous post about what was wrong in instantiating driver on set up method? And here is the solution video on my YouTube channel (After 5 years of gap I finally added new video tutorial :)) The solution described on video tutorial uses following set up - public class BaseClassOnDemandDriverSetup { private WebDriver driver ; @BeforeMethod public void setupTest () { // Any other set up goes here } @AfterMethod public void teardown () { if ( driver != null ) { driver .quit() ; } } public WebDriver getDriver () { if ( driver == null ) { WebDriverManager. chromedriver ().setup() ; driver = new ChromeDriver() ; } return driver ; } }

Using chrome console to test xPath and css selectors

Since the advent of selenium there have been many plugin to test xPath / css selectors but you don’t need any of them if you have chrome browser. Using Chrome console you can test both xPath and css selectors. Launch website to be tested in chrome browser and hit F-12 and you would see chrome console opened in lower pane of application - Hit escape key and console would open another pane to write element locators - And now you can start writing xPath or css selectors in chrome console and test them - The syntax for writing css id - $$(“ ”) And hit the enter key. If your expression is right then html snippet of the application element corresponding to the css selector would be displayed - If you mouse over the html snippet in chrome console then it would highlight the corresponding element in application - If you want to clean console of previously written element selectors then just hit ctrl+L keys and chrome console would be empty again. Pro

Security Testing and Selenium

I have come across many articles which talk of carrying out security testing with selenium however I found it very cumbersome to set up such tests. This is what this tutorial is going to make easy for you. It cover. My next Security Testing and Selenium YouTube video covers following - Importance of having security testing on CI What is dynamic application security testing Recommended tools from https://owasp.org/www-community/Vulnerability_Scanning_Tools What is https://owasp.org/ ?   Using https://www.zaproxy.org/    Project setup  <dependency> <groupId> org.zaproxy </groupId> <artifactId> zap-clientapi </artifactId> <version> 1.9.0 </version> </dependency> <dependency> <groupId> org.zaproxy </groupId> <artifactId> zap </artifactId> <version> 2.10.0 </version> </dependency> Start ZAP daemom (headless) mode  ./zap.sh -daemon -host 127.0.0.1 -port 8080 -config api.addrs.a