Merge master into prod #614

Merged
merged 9 commits into from Mar 28, 2013
@@ -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
@@ -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")
@@ -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):
@@ -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())