Commit c04fcd4
Patrick Hamann
Fixed article integration tests
1 parent 48ebcad commit c04fcd4
3 files changed
Lines changed: 8 additions & 8 deletions
File tree
- front/test
- integration-tests/src/test/java/com/gu/test
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -53,10 +53,10 @@ class RelatedFeatureTest extends FeatureSpec with GivenWhenThen with ShouldMatch | |||
| 53 | 53 | val article = findFirst("li") | |
| 54 | 54 | article.findFirst("a").getAttribute("href").length should be > 0 | |
| 55 | 55 | article.findFirst("h3").getText.length should be > 0 | |
| 56 | - article.findFirst(".trail-text").getText.length should be > 0 | ||
| 56 | + article.findFirst(".trail__text").getText.length should be > 0 | ||
| 57 | 57 | article.findFirst("time").getAttribute("data-timestamp") should be("1344426007000") | |
| 58 | 58 | ||
| 59 | - find("li .trail-text") should have length 5 | ||
| 59 | + find("li .trail__text") should have length 5 | ||
| 60 | 60 | ||
| 61 | 61 | And("I should see the pictures for the first three trails, where they exist") | |
| 62 | 62 | // FIXME - need consistent data, as image can go missing | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -42,7 +42,7 @@ class FrontFeatureTest extends FeatureSpec with GivenWhenThen with ShouldMatcher | |||
| 42 | 42 | ||
| 43 | 43 | Then("I should see the news trailblock") | |
| 44 | 44 | val news = $(".zone-news") | |
| 45 | - news.find(".trail-headline") should have length (4) | ||
| 45 | + news.find(".trail__headline") should have length (4) | ||
| 46 | 46 | } | |
| 47 | 47 | } | |
| 48 | 48 | ||
@@ -86,7 +86,7 @@ class FrontFeatureTest extends FeatureSpec with GivenWhenThen with ShouldMatcher | |||
| 86 | 86 | import browser._ | |
| 87 | 87 | ||
| 88 | 88 | Then("I should see the copyright") | |
| 89 | - findFirst(".footer p").getText should startWith("© Guardian News and Media Limited") | ||
| 89 | + findFirst(".footer__copyright").getText should startWith("© Guardian News and Media Limited") | ||
| 90 | 90 | ||
| 91 | 91 | } | |
| 92 | 92 | } | |
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -119,7 +119,7 @@ public void is_not_displayed(String arg1) throws Throwable { | |||
| 119 | 119 | ||
| 120 | 120 | @Then("^\"([^\"]*)\" section tab show read \"([^\"]*)\"$") | |
| 121 | 121 | public void section_tab_show_read(String arg1, String arg2) throws Throwable { | |
| 122 | - assertTrue(webDriver.isTextPresentByElement(By.className("tabs-selected"), arg2)); | ||
| 122 | + assertTrue(webDriver.isTextPresentByElement(By.className("tabs__tab--selected"), arg2)); | ||
| 123 | 123 | } | |
| 124 | 124 | ||
| 125 | 125 | @When("^I click \"([^\"]*)\" tab at the top of the page$") | |
@@ -166,7 +166,7 @@ public void I_select_the_sections_navigation_button( ) throws Throwable { | |||
| 166 | 166 | ||
| 167 | 167 | @Then("^it should show me a list of sections$") | |
| 168 | 168 | public void it_should_show_a_list_of_sections() throws Throwable { | |
| 169 | - assertEquals("block", webDriver.getElementCssValue(By.className("nav-popup-sections"), "display")); | ||
| 169 | + assertEquals("block", webDriver.getElementCssValue(By.className("nav-popup--sections"), "display")); | ||
| 170 | 170 | } | |
| 171 | 171 | ||
| 172 | 172 | @Then("^another click on the \"([^\"]*)\" \"([^\"]*)\" tab closes the list$") | |
@@ -194,9 +194,9 @@ public void I_can_expand_and_collapse_expanders(String sectionState) throws Thro | |||
| 194 | 194 | WebElement expander = webDriver.waitForElement(By.className("cta")); | |
| 195 | 195 | expander.click(); | |
| 196 | 196 | ||
| 197 | - String expectedTrailblockHeight = (sectionState.equals("expand")) ? "none" : "0"; | ||
| 197 | + String expectedTrailblockHeight = (sectionState.equals("expand")) ? "block" : "none"; | ||
| 198 | 198 | // sections are hidden with css max-height | |
| 199 | - assertTrue(webDriver.waitForCss(By.cssSelector(".related-trails .panel"), "max-height", expectedTrailblockHeight)); | ||
| 199 | + assertTrue(webDriver.waitForCss(By.cssSelector(".related-trails .panel"), "display", expectedTrailblockHeight)); | ||
| 200 | 200 | } | |
| 201 | 201 | ||
| 202 | 202 | @When("^Back to top is selected$") | |
0 commit comments