Added some pending scenarios

wakaleo · Sep 28, 2014 · 2f54884 · 2f54884
1 parent 1cabe4c
commit 2f54884
Show file tree

Hide file tree

Showing 30 changed files with 340 additions and 54 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -54,7 +54,9 @@ test {
     systemProperty 'webdriver.base.url', baseUrl
     systemProperty 'webdriver.driver', driver
     systemProperty 'thucydides.resized.image.width', 1000
+    systemProperty 'dashboard.tag.list', 'capabilities, stories, layer'
     useJUnit()
+    maxParallelForks = 4
 }
 
 test.shouldRunAfter clean
@@ -64,6 +66,11 @@ checkOutcomes.mustRunAfter aggregate
 clean {
     delete "target"
 }
+task verify {
+    println "Running acceptance tests"
+}
+verify.dependsOn ':acceptance-tests:clean', ':acceptance-tests:test', ':acceptance-tests:aggregate', ':acceptance-tests:checkOutcomes'
+
 
 class ThucydidesPlugin implements Plugin<Project> {
     void apply(Project project) {

diff --git a/...tests/src/test/java/flyinghigh/services/acceptancetests/CalculatePointsFromPurchases.java b/...tests/src/test/java/flyinghigh/services/acceptancetests/CalculatePointsFromPurchases.java
diff --git a/...ce-tests/src/test/java/flyinghigh/services/acceptancetests/CalculatingRequiredPoints.java b/...ce-tests/src/test/java/flyinghigh/services/acceptancetests/CalculatingRequiredPoints.java
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/EarningPoints.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/EarningPoints.java
@@ -0,0 +1,14 @@
+package flyinghigh.services.acceptancetests;
+
+import net.thucydides.jbehave.ThucydidesJUnitStories;
+import net.thucydides.jbehave.ThucydidesJUnitStory;
+
+/**
+ * Created by john on 18/09/2014.
+ */
+public class EarningPoints extends ThucydidesJUnitStories {
+
+    public EarningPoints() {
+        this.findStoriesIn("stories/earning_points");
+    }
+}
diff --git a/...ance-tests/src/test/java/flyinghigh/services/acceptancetests/ListingAffiliatedHotels.java b/...ance-tests/src/test/java/flyinghigh/services/acceptancetests/ListingAffiliatedHotels.java
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/ListingAirports.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/ListingAirports.java
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/ManagingAirports.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/ManagingAirports.java
@@ -0,0 +1,13 @@
+package flyinghigh.services.acceptancetests;
+
+import net.thucydides.jbehave.ThucydidesJUnitStories;
+
+/**
+ * Created by john on 18/09/2014.
+ */
+public class ManagingAirports extends ThucydidesJUnitStories {
+
+    public ManagingAirports() {
+        this.findStoriesIn("stories/managing_airports");
+    }
+}
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/Partners.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/Partners.java
@@ -0,0 +1,13 @@
+package flyinghigh.services.acceptancetests;
+
+import net.thucydides.jbehave.ThucydidesJUnitStories;
+
+/**
+ * Created by john on 18/09/2014.
+ */
+public class Partners extends ThucydidesJUnitStories {
+
+    public Partners() {
+        this.findStoriesIn("stories/partners");
+    }
+}
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/SpendingPoints.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/SpendingPoints.java
@@ -0,0 +1,13 @@
+package flyinghigh.services.acceptancetests;
+
+import net.thucydides.jbehave.ThucydidesJUnitStories;
+
+/**
+ * Created by john on 18/09/2014.
+ */
+public class SpendingPoints extends ThucydidesJUnitStories {
+
+    public SpendingPoints() {
+        this.findStoriesIn("stories/spending_points");
+    }
+}
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/domain/FrequentFlyer.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/domain/FrequentFlyer.java
@@ -0,0 +1,18 @@
+package flyinghigh.services.acceptancetests.domain;
+
+/**
+ * Created by john on 27/09/2014.
+ */
+public enum FrequentFlyer {
+    Sarah("123456");
+
+    private final String number;
+
+    FrequentFlyer(String number) {
+        this.number = number;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+}
diff --git a/...e-tests/src/test/java/flyinghigh/services/acceptancetests/domain/FrequentFlyerMember.java b/...e-tests/src/test/java/flyinghigh/services/acceptancetests/domain/FrequentFlyerMember.java
@@ -0,0 +1,67 @@
+package flyinghigh.services.acceptancetests.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+/**
+ * Created by john on 27/09/2014.
+ */
+@JsonIgnoreProperties({"_links"})
+public class FrequentFlyerMember {
+    private String id;
+    private String accountNumber;
+    private String firstName;
+    private String lastName;
+    private String homeAirportCode;
+    private int statusPoints;
+
+    public FrequentFlyerMember() {
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public int getStatusPoints() {
+        return statusPoints;
+    }
+
+    public void setStatusPoints(int statusPoints) {
+        this.statusPoints = statusPoints;
+    }
+
+    public String getHomeAirportCode() {
+        return homeAirportCode;
+    }
+
+    public void setHomeAirportCode(String homeAirportCode) {
+        this.homeAirportCode = homeAirportCode;
+    }
+}
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/pages/HomePage.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/pages/HomePage.java
@@ -15,4 +15,5 @@ public List<Airport> getDisplayedAirports() {
                 .map(DisplayedAirport::fromWebElement)
                 .collect(Collectors.toList());
     }
+
 }
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/pages/MyAccountPage.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/pages/MyAccountPage.java
@@ -1,6 +1,7 @@
 package flyinghigh.services.acceptancetests.pages;
 
 import flyinghigh.services.acceptancetests.domain.Airport;
+import javafx.beans.binding.MapExpression;
 import net.thucydides.core.annotations.DefaultUrl;
 import net.thucydides.core.pages.PageObject;
 
@@ -10,8 +11,6 @@
 @DefaultUrl("http://localhost:9001/#/myaccount")
 public class MyAccountPage extends PageObject {
 
-    private int calculatedPoints;
-
     public void selectDepartureCity(String departure) {
         $("#departure").selectByVisibleText(departure);
     }
@@ -23,4 +22,8 @@ public void selectDestinationCity(String destination) {
     public int getCalculatedPoints() {
         return Integer.valueOf($(".requiredPoints").getText());
     }
+
+    public int getPointBalance() {
+        return Integer.valueOf($(".status-points-balance").getText());
+    }
 }
diff --git a/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/rest/RestClient.java b/acceptance-tests/src/test/java/flyinghigh/services/acceptancetests/rest/RestClient.java
@@ -2,8 +2,14 @@
 
 import com.google.common.collect.ImmutableList;
 import flyinghigh.services.acceptancetests.domain.Airport;
+import flyinghigh.services.acceptancetests.domain.FrequentFlyerMember;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.thucydides.core.annotations.Step;
 import org.springframework.web.client.RestTemplate;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 
 public class RestClient {
@@ -22,24 +28,39 @@ public String getBaseFlightUrl() {
     public String getBaseAccountUrl() {
         String environment =  System.getProperty("webservice.environment","local");
         if (environment.equals("local")) {
-            return "http://localhost:8090/";
+            return "http://localhost:8091/";
         } else {
             return "http://" + environment + "-" + "accounts.cfapps.io";
         }
     }
 
+    @Step
     public List<Airport> findAllAirports() {
         return findAllAirports("/rest/api/airports");
     }
 
 
+    @Step
     public List<Airport> findAllAirports(String path) {
         return ImmutableList.copyOf(restTemplate.getForEntity(getBaseFlightUrl() + path, Airport[].class).getBody());
     }
 
 
+    @Step
     public int calculateRequiredPoints(String departureCode, String destinationCode) {
         String points = restTemplate.getForObject(getBaseFlightUrl() + "/rest/api/routes/calculatePoints?departureCode={departure}&destinationCode={destination}", String.class,departureCode,destinationCode);
         return Integer.valueOf(points);
     }
+
+    @Step
+    public void updatePointsFor(String number, int points) throws URISyntaxException {
+        String url = getResultUrl(restTemplate.getForObject(getBaseAccountUrl() + "/accounts/search/findByAccountNumber?number={number}", JSONObject.class, number));
+        FrequentFlyerMember member = restTemplate.getForObject(url, FrequentFlyerMember.class);
+        member.setStatusPoints(points);
+        restTemplate.put(new URI(url), member);
+    }
+
+    private String getResultUrl(JSONObject result) {
+        return ((JSONObject)((JSONArray)result.get("links")).get(0)).get("href").toString();
+    }
 }
diff --git a/.../test/java/flyinghigh/services/acceptancetests/stepdefs/FrequentFlyerStepDefinitions.java b/.../test/java/flyinghigh/services/acceptancetests/stepdefs/FrequentFlyerStepDefinitions.java
@@ -1,15 +1,41 @@
 package flyinghigh.services.acceptancetests.stepdefs;
 
+import flyinghigh.services.acceptancetests.domain.FrequentFlyer;
+import flyinghigh.services.acceptancetests.rest.RestClient;
+import flyinghigh.services.acceptancetests.steps.MyAccountUISteps;
+import net.thucydides.core.annotations.Steps;
 import org.jbehave.core.annotations.Given;
+import org.jbehave.core.annotations.Then;
+import org.jbehave.core.annotations.When;
+
+import java.net.URISyntaxException;
 
 /**
  * Created by john on 24/09/2014.
  */
 public class FrequentFlyerStepDefinitions {
 
+    RestClient restClient = new RestClient();
+
+    @Steps
+    MyAccountUISteps sarah;
+
     @Given("I am a frequent flyer")
     public void givenAFrequentFlyer() {
-        // TODO
     }
 
+    @Given("$frequentFlyer is a Frequent Flyer member with $points points")
+    public void giveSarahSomePoints(FrequentFlyer frequentFlyer, int points) throws URISyntaxException {
+        restClient.updatePointsFor(frequentFlyer.getNumber(), points);
+    }
+
+    @When("Sarah views her account details")
+    public void viewAccountDetails() {
+        sarah.openAccountPage();
+    }
+
+    @Then("she should see an account balance of $expectedPoints points")
+    public void shouldSeePointBalanceOf(int expectedPoints) {
+        sarah.shouldSeeAccountBalanceOf(expectedPoints);
+    }
 }
diff --git a/...ests/src/test/java/flyinghigh/services/acceptancetests/stepdefs/RouteStepDefinitions.java b/...ests/src/test/java/flyinghigh/services/acceptancetests/stepdefs/RouteStepDefinitions.java
@@ -1,6 +1,7 @@
 package flyinghigh.services.acceptancetests.stepdefs;
 
 import flyinghigh.services.acceptancetests.rest.RestClient;
+import net.thucydides.core.annotations.Steps;
 import org.jbehave.core.annotations.Given;
 import org.jbehave.core.annotations.Then;
 import org.jbehave.core.annotations.When;
@@ -12,7 +13,8 @@
  */
 public class RouteStepDefinitions {
 
-    RestClient restClient = new RestClient();
+    @Steps
+    RestClient restClient;
 
     String departure;
     String destination;

diff --git a/...tance-tests/src/test/java/flyinghigh/services/acceptancetests/steps/MyAccountUISteps.java b/...tance-tests/src/test/java/flyinghigh/services/acceptancetests/steps/MyAccountUISteps.java
@@ -3,6 +3,8 @@
 import flyinghigh.services.acceptancetests.pages.MyAccountPage;
 import net.thucydides.core.annotations.Step;
 
+import static org.fest.assertions.api.Assertions.assertThat;
+
 public class MyAccountUISteps {
 
     MyAccountPage myAccountPage;
@@ -18,4 +20,11 @@ public int calculatePointsNeededBetween(String departure, String destination) {
         myAccountPage.selectDestinationCity(destination);
         return myAccountPage.getCalculatedPoints();
     }
+
+    @Step
+    public void shouldSeeAccountBalanceOf(int expectedPoints) {
+        assertThat(myAccountPage.getPointBalance()).isEqualTo(expectedPoints);
+    }
+
+
 }
diff --git a/...ce-tests/src/test/resources/stories/earning_points/earning_extra_points_from_status.story b/...ce-tests/src/test/resources/stories/earning_points/earning_extra_points_from_status.story
@@ -0,0 +1,22 @@
+Earning extra points from Frequent Flyer status
+
+Meta:
+@Versions Release 2
+@tag layer:webservice
+
+Scenario Outline: Earning points on flights by Frequent Flyer status
+Given a member has a status of <initialStatus>
+When I fly on a flight that is worth <base> base points
+Then I should earn a status bonus of <bonus>
+And I should have guaranteed minimum earned points per trip of <minimum>
+And I should earn <total> points in all
+Examples:
+| initialStatus | base | bonus | minimum | total | notes               |
+| Bronze        | 439  | 0     | 0       | 439   |                     |
+| Silver        | 439  | 220   | 500     | 659   | minimum points      |
+| Silver        | 148  | 111   | 500     | 500   | 50% bonus           |
+| Gold          | 474  | 400   | 1000    | 1000  | minimum points      |
+| Gold          | 2041 | 1531  | 1000    | 3572  | 75% bonus           |
+
+
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,4 +15,5 @@ public List<Airport> getDisplayedAirports() { @@
                     .map(DisplayedAirport::fromWebElement)
                     .collect(Collectors.toList());
         }
     }