Merge branch 'integration'

Testing/Testing in BrowserStack/Test_FloorChangeDropdown.java

@@ -0,0 +1,55 @@
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.How;
+
+import java.net.URL;
+
+//BrowserStack Testing using Windows10 and Chrome57
+//this test locates the Search bar, search "B 1200", find drop down, **switch to second floor pending
+public class Test_FloorChangeDropdown {
+  public static final String USERNAME = "margaretmuse1";
+  public static final String AUTOMATE_KEY = "TkXzjX1qfdisxpdSMPb1";
+  public static final String URL = "https://" + USERNAME + ":" + AUTOMATE_KEY + "@hub-cloud.browserstack.com/wd/hub";
+
+  public static void main(String[] args) throws Exception {
+
+    DesiredCapabilities caps = new DesiredCapabilities();
+    //set capabilities for desired browser
+    caps.setCapability("browser", "Chrome");
+    caps.setCapability("browser_version", "57.0");
+    caps.setCapability("os", "Windows");
+    caps.setCapability("os_version", "10");
+    caps.setCapability("resolution", "1024x768");
+
+    //set debugging element to true to enable console logging
+    caps.setCapability("browserstack.debug", "true");
+
+    //create new webdriver
+    WebDriver driver = new RemoteWebDriver(new URL(URL), caps);
+    driver.get("https://soft-eng-practicum.github.io/ggcmaps/#Campus");
+    //search for b 1200
+    WebElement searchbar = driver.findElement(By.id("roomSearch"));
+    searchbar.sendKeys("B 1200");
+    //select search
+
+     WebElement searchgo = driver.findElement(By.id("search"));
+     searchgo.click();
+
+     WebElement floordropdown = driver.findElement(By.id("floor"));
+     floordropdown.click();
+
+    // WebElement searchgo = driver.findElement(By.id("search"));
+    // searchgo.click();
+
+
+    System.out.println(driver.getTitle());
+    driver.quit();
+
+  }
+}

help.html

@@ -6,7 +6,16 @@ <h4>Help</h4>
   </div> <!-- title -->
   <div class="menu-section"></div>
   <div class="tab-content">
-    <h5>Campus Map</h5>
+    <h5>Quick Tips</h5>
+    <ul>
+    <li>Select a building by clicking on it to view rooms.</li>
+    <li>To Search, enter "Building + Room Number" or the name of a place into the search bar.</li></ul>
+    <h5>Features</h5>
+    <p>list more features here....</p>
+
+
+
+    <h5>More About GGC Map</h5>
     <p>If you want to view a specific building, click on it. You will know it can be selected by hovering over the building in question because it will darken as the mouse hovers on it.</p>
     <h5>Building</h5>
     <p>After selecting a building, you will now see the inside of the building including rooms, hallways, doors, labels, restrooms, and elevators. Rooms that are labeled and are selectable will show a lighter shade of green. Clicking on a room highlights it yellow.</p>

index.html

@@ -157,11 +157,11 @@ <h1 onclick="changeFloor('Campus')">GGCMaps</h1>
 				<li onclick="searchFromMenu('c1260')"><a>Cisco Auditorium</a></li>
 				<li onclick="subMenu('dining');"><a>Dining Services</a></li>
 				<ul class="dining">
-					<li onclick="searchFromMenu('a1800')"><a>Chick-fil-A</a></li>
+					<li onclick="searchFromMenu('chick-fil-a')"><a>Chick-fil-A</a></li>
 					<li onclick="searchFromMenu('dining-hall')"><a>Dining Hall</a></li>
 					<li onclick="searchFromMenu('einstein-bros-bagels')"><a>Einstein Bros Bagels</a></li>
-					<li onclick="searchFromMenu('a1800')"><a>Moe's Southwest Grill</a></li>
-					<li onclick="searchFromMenu('a1800')"><a>Panda Express</a></li>
+					<li onclick="searchFromMenu('moes')"><a>Moe's Southwest Grill</a></li>
+					<li onclick="searchFromMenu('panda-express')"><a>Panda Express</a></li>
 					<li onclick="searchFromMenu('a1825')"><a>P.O.D. Market</a></li>
 					<li onclick="searchFromMenu('l1102')"><a>Starbucks</a></li>
 				</ul>