Merge pull request #1 from pulkitsharma07/changes

Some fixes.

Author: bopes

.gitignore

@@ -12,6 +12,6 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-
+target/
 /.idea/
-*.iml
+*.iml

Makefile

@@ -17,4 +17,7 @@ test_safari:
 	mvn install -Dbrowser=safari
 
 test_chrome:
-	mvn install -Dbrowser=chrome
+	mvn install -Dbrowser=chrome
+
+test_local:
+    mvn install -Dbrowser=chrome -Dlocal=true

pom.xml

@@ -14,7 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cucumber.jvm.parallel.version>2.2.0</cucumber.jvm.parallel.version>
         <surefire.maven.plugin.version>2.19.1</surefire.maven.plugin.version>
-        <acceptance.test.parallel.count>10</acceptance.test.parallel.count>
+        <acceptance.test.parallel.count>1</acceptance.test.parallel.count>
     </properties>
 
     <dependencies>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.browserstack</groupId>
             <artifactId>browserstack-local-java</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
 
     </dependencies>

src/test/java/com/browserstack/stepdefs/SearchSteps.java

@@ -1,5 +1,6 @@
 package com.browserstack.stepdefs;
 
+import com.browserstack.local.Local;
 import com.browserstack.pageobjects.SearchPage;
 import cucumber.api.Scenario;
 import cucumber.api.java.After;
@@ -12,22 +13,34 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class SearchSteps {
     private WebDriver driver;
     private SearchPage searchPage;
+    private Local l;
 
     @Before
     public void setUp(Scenario scenario) throws Exception {
         String USERNAME = System.getenv("BROWSERSTACK_USERNAME");
-        String ACCESS_KEY = System.getenv("BROWSERSTACK_ACCESSKEY");
+        String ACCESS_KEY = System.getenv("BROWSERSTACK_ACCESS_KEY");
         String URL = "https://" + USERNAME + ":" + ACCESS_KEY + "@hub.browserstack.com/wd/hub";
 
         DesiredCapabilities caps = new DesiredCapabilities();
         caps.setCapability("browser", System.getProperty("browser"));
 
+        if (System.getProperty("local") != null && System.getProperty("local").equals("true")) {
+            caps.setCapability("browserstack.local", "true");
+            l = new Local();
+            Map<String, String> options = new HashMap<String, String>();
+            options.put("key", ACCESS_KEY);
+            l.start(options);
+        }
+
         driver = new RemoteWebDriver(new URL(URL), caps);
         searchPage = new SearchPage(driver);
     }
@@ -48,8 +61,14 @@ public void I_should_see_pagetitle(String expectedTitle) throws Throwable {
         assertEquals(expectedTitle, driver.getTitle());
     }
 
+    @Then("the page should contain '(.+)'$")
+    public void page_should_contain(String expectedTitle) throws Throwable {
+        assertTrue(driver.getPageSource().contains(expectedTitle));
+    }
+
     @After
     public void teardown() throws Exception {
         driver.quit();
+        if (l != null) l.stop();
     }
-}
+}

src/test/java/resources/features/Local.feature

@@ -0,0 +1,5 @@
+Feature: Verify Local test
+
+  Scenario: Navigate to Local check page
+    Given I am on the website 'http://bs-local.com:45691/check'
+    Then the page should contain 'Up and running'