Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Merge master into prod #614

Merged
merged 9 commits into from

4 participants

@AlinT

No description provided.

@stephendonner

Thanks; let's hold off merging this until tomorrow morning, PDT -- so we can maintain current prod coverage, but have it ready for the push on Thursday.

@stephendonner

Merging now to catch the pre-push wave (push to prod today is at 2:30).

@stephendonner stephendonner merged commit 971d110 into prod
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 21, 2013
  1. Added xfail

    Andrei Hutusoru authored
  2. @AlinT

    Merge pull request #610 from AndreiH/add_xfail

    AlinT authored
    Added xfail
  3. @cvan
  4. Changed reviews locator

    Andrei Hutusoru authored
  5. @AndreiH

    Merge pull request #611 from cvan/patch-2

    AndreiH authored
    fix locator to ignore hidden reviews
  6. @AlinT

    Merge pull request #612 from AndreiH/change_reviews_locator

    AlinT authored
    Changed reviews locator
Commits on Mar 22, 2013
  1. @stephendonner
Commits on Mar 27, 2013
  1. changed assert

    Andrei Hutusoru authored
  2. @AlinT
This page is out of date. Refresh to see the latest.
View
2  pages/desktop/addons_site.py
@@ -40,7 +40,7 @@ def is_review_box_visible(self):
class ViewReviews(Base):
- _review_locator = (By.CSS_SELECTOR, "div.primary div.review")
+ _review_locator = (By.CSS_SELECTOR, 'div.review:not(.reply)')
@property
def reviews(self):
View
2  pages/desktop/details.py
@@ -57,7 +57,7 @@ class Details(Base):
_support_link_locator = (By.CSS_SELECTOR, "a.support")
_review_details_locator = (By.CSS_SELECTOR, ".review .description")
_all_reviews_link_locator = (By.CSS_SELECTOR, "#reviews a.more-info")
- _review_locator = (By.CSS_SELECTOR, "div.review:not(.reply)")
+ _review_locator = (By.CSS_SELECTOR, "#reviews > div.review:not(.reply)")
_info_link_locator = (By.CSS_SELECTOR, "li > a.scrollto")
_rating_counter_locator = (By.CSS_SELECTOR, ".grouped_ratings .num_ratings")
View
2  tests/desktop/test_discovery_page.py
@@ -62,7 +62,7 @@ def test_that_featured_themes_go_to_their_landing_page_when_clicked(self, mozweb
discovery_pane = DiscoveryPane(mozwebqa, self.basepath(mozwebqa))
first_theme = discovery_pane.first_theme
theme = discovery_pane.click_on_first_theme()
- Assert.equal(first_theme, theme.theme_title)
+ Assert.contains(first_theme, theme.theme_title)
@pytest.mark.nondestructive
def test_that_more_ways_to_customize_section_is_available(self, mozwebqa):
View
2  tests/mobile/test_home.py
@@ -94,7 +94,7 @@ def test_all_featured_extensions_link(self, mozwebqa):
featured_extensions = home.click_all_featured_addons_link()
- Assert.equal(featured_extensions.title, 'MOBILE ADD-ONS')
+ Assert.equal(featured_extensions.title, 'ADD-ONS')
Assert.equal(featured_extensions.page_header, 'Featured Extensions')
Assert.contains('sort=featured', featured_extensions.get_url_current_page())
Something went wrong with that request. Please try again.