From bf8b612b07d0ae89eb176e27a7e12137aff8d404 Mon Sep 17 00:00:00 2001
From: Sriram Angajala <sriram.angajala@gmail.com>
Date: Wed, 24 Jun 2015 21:10:22 +0100
Subject: [PATCH] Ram added new feature @Auto-9

---
 src/main/java/com/web/testlab/BasePage.java   | 16 +++++++++++
 .../java/com/web/testlab/ProjectHomePage.java | 10 ++++++-
 src/test/java/com/testlab/RunTest.java        |  4 ++-
 src/test/java/com/testlab/StepDefs.java       | 27 +++++++++++++++++++
 .../resources/com/testlab/AddProject.feature  | 10 +++----
 5 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/web/testlab/BasePage.java

diff --git a/src/main/java/com/web/testlab/BasePage.java b/src/main/java/com/web/testlab/BasePage.java
new file mode 100644
index 0000000..779f607
--- /dev/null
+++ b/src/main/java/com/web/testlab/BasePage.java
@@ -0,0 +1,16 @@
+package com.web.testlab;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+
+/**
+ * Created by sriramangajala on 24/06/15.
+ */
+public class   BasePage {
+    WebDriver driver = BrowserFactory.getDriver();
+
+    public void gotobackPage() {
+
+        driver.findElement(By.xpath("//button[text()='Back']")).click();
+    }
+}
diff --git a/src/main/java/com/web/testlab/ProjectHomePage.java b/src/main/java/com/web/testlab/ProjectHomePage.java
index 4ba4dae..472504a 100644
--- a/src/main/java/com/web/testlab/ProjectHomePage.java
+++ b/src/main/java/com/web/testlab/ProjectHomePage.java
@@ -3,8 +3,16 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 
-public class ProjectHomePage {
+public class ProjectHomePage extends BasePage{
     WebDriver driver = BrowserFactory.getDriver();
     public void clickTesterTab() {driver.findElement(By.linkText("Testers")).click();
         Utils.sleep(5);}
+
+    public void gotoAddProject() {
+        driver.findElement(By.linkText("Add project")).click();
+    }
+
+    public boolean checkUserIsInHomePage() {
+        return driver.findElement(By.tagName("body")).getText().contains("Welcome");
+    }
 }
diff --git a/src/test/java/com/testlab/RunTest.java b/src/test/java/com/testlab/RunTest.java
index ee1cf43..03bebb9 100644
--- a/src/test/java/com/testlab/RunTest.java
+++ b/src/test/java/com/testlab/RunTest.java
@@ -10,9 +10,10 @@
 @RunWith(Cucumber.class)
 @Cucumber.Options(
 format = {"html:target/cucumber","json:target/cucumber-report.json"},
-tags = {"@ram"})
+tags = {"@chandrika"})
 public class RunTest{
 
+
     static WebDriver driver;
     @BeforeClass
     public static void start()
@@ -26,6 +27,7 @@ public static void start()
 
     }
 
+
     @AfterClass
     public static void stop()
     {
diff --git a/src/test/java/com/testlab/StepDefs.java b/src/test/java/com/testlab/StepDefs.java
index 6327404..ca002f8 100644
--- a/src/test/java/com/testlab/StepDefs.java
+++ b/src/test/java/com/testlab/StepDefs.java
@@ -1070,6 +1070,33 @@ public void the_User_enters_the_Valid_data_in_all_the_fields_tester_test_Testpas
     public void Project_Admin_is_back_in_testers_page() {
         Utils.isTextPresent("Testers");
     }
+
+
+
+    @Given("^I logged in as Admin$")
+    public void i_logged_in_as_Admin() throws Throwable {
+
+        loginPage.login("testlabadmin", "Admin1");
+    }
+
+    @Given("^I navigate to my account page$")
+    public void i_navigate_to_my_account_page() throws Throwable {
+
+        projecthomepage.gotoAddProject();
+    }
+
+    @When("^I go back to my previous page$")
+    public void i_go_back_to_my_previous_page() throws Throwable {
+
+        projecthomepage.gotobackPage();
+    }
+
+    @Then("^I should go back to my main page$")
+    public void i_should_go_back_to_my_main_page() throws Throwable {
+
+        Assert.assertTrue("Checking user is in home page",projecthomepage.checkUserIsInHomePage());
+
+    }
 }
 
 
diff --git a/src/test/resources/com/testlab/AddProject.feature b/src/test/resources/com/testlab/AddProject.feature
index 74d5e0f..dba67ce 100644
--- a/src/test/resources/com/testlab/AddProject.feature
+++ b/src/test/resources/com/testlab/AddProject.feature
@@ -37,10 +37,10 @@ And Admin enters valid description in the 'Project Desc' textbox
 And Admin should click on 'Save' button
 Then Admin should see an error message as 'Project already exist.'
 
+  @chandrika
 Scenario:user can go back to main screen when he clicks back button
 
-Given as a user i am on page2
-And i should see a back button to go back to my main page
-When i click on the back button
-Then i shouldgo back to my main page
-And i should see any changes if i made
\ No newline at end of file
+Given I logged in as Admin
+And I navigate to my account page
+When I go back to my previous page
+Then I should go back to my main page