diff --git a/src/test/java/com/wikia/webdriver/common/core/elemnt/JavascriptActions.java b/src/test/java/com/wikia/webdriver/common/core/elemnt/JavascriptActions.java index 61c280a716..904a9a9a7f 100644 --- a/src/test/java/com/wikia/webdriver/common/core/elemnt/JavascriptActions.java +++ b/src/test/java/com/wikia/webdriver/common/core/elemnt/JavascriptActions.java @@ -156,7 +156,7 @@ private int getOffset() { offset += searchComponent.getHeight(); } - return offset; + return offset + 200; } public void scrollToSpecificElement(WebElement element) { diff --git a/src/test/java/com/wikia/webdriver/elements/communities/desktop/pages/PrivacyPolicyPage.java b/src/test/java/com/wikia/webdriver/elements/communities/desktop/pages/PrivacyPolicyPage.java index b40a09a2be..501cf689f4 100644 --- a/src/test/java/com/wikia/webdriver/elements/communities/desktop/pages/PrivacyPolicyPage.java +++ b/src/test/java/com/wikia/webdriver/elements/communities/desktop/pages/PrivacyPolicyPage.java @@ -9,7 +9,7 @@ public class PrivacyPolicyPage extends WikiBasePageObject { private static final String PRIVACY_POLICY_PAGE = "http://www.wikia.com/Privacy_Policy"; - @FindBy(css = "#privacy-settings-button") + @FindBy(css = ".privacy-settings-button") private WebElement resetTrackingButton; public void navigateToPrivacyPolicyPage() { diff --git a/src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/WikiBasePageObject.java b/src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/WikiBasePageObject.java index 778951ebda..a6cbdc02f0 100644 --- a/src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/WikiBasePageObject.java +++ b/src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/WikiBasePageObject.java @@ -67,7 +67,8 @@ private AssertionMessages() { + ".wds-global-navigation__user-logged-in .wds-avatar img"; private static final String WDS_FOOTER_HEADER_CLASS = "wds-global-footer__header"; - private static final By MERCURY_SKIN = By.cssSelector(".mobile-wiki"); +// private static final By MERCURY_SKIN = By.cssSelector("#ember-container, .mobile-wiki"); + private static final By MERCURY_SKIN = By.cssSelector("#ember-container"); private static final String LOGGED_IN_USER_SELECTOR_MERCURY = ".wds-global-navigation__modal-control-user .wds-avatar__inner-border[title=%userName%]"; private static final By BANNER_NOTIFICATION_CONTAINER = By.cssSelector(".banner-notifications-placeholder,.smart-banner"); diff --git a/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/global/GlobalNavigationLayout.java b/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/global/GlobalNavigationLayout.java index 48feada974..892025f5bb 100644 --- a/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/global/GlobalNavigationLayout.java +++ b/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/global/GlobalNavigationLayout.java @@ -117,7 +117,7 @@ public void testLayoutForDeLoggedIn() { @RunOnly(language = "szl") @Test(groups = {"globalNavigationBarLayoutForDeLoggedIn"}) - @Execute(language = "szl", asUser = User.USER_GERMAN) + @Execute(asUser = User.USER_GERMAN) public void testLayoutForLoggedInSzl() { GlobalNavigation globalNavigation = new HomePage().getGlobalNavigation(); diff --git a/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/local/CommunityHeaderTests.java b/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/local/CommunityHeaderTests.java index f61349b1f8..ea2dcc4b86 100644 --- a/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/local/CommunityHeaderTests.java +++ b/src/test/java/com/wikia/webdriver/testcases/desktop/navigation/local/CommunityHeaderTests.java @@ -8,8 +8,8 @@ import com.wikia.webdriver.common.core.configuration.Configuration; import com.wikia.webdriver.common.core.helpers.User; import com.wikia.webdriver.common.templates.NewTestTemplate; -import com.wikia.webdriver.elements.communities.desktop.components.navigation.local.CommunityHeaderDesktop; import com.wikia.webdriver.elements.communities.desktop.components.globalshortcuts.ActionExplorerModal; +import com.wikia.webdriver.elements.communities.desktop.components.navigation.local.CommunityHeaderDesktop; import com.wikia.webdriver.pageobjectsfactory.componentobject.modalwindows.AddMediaModalComponentObject; import com.wikia.webdriver.pageobjectsfactory.componentobject.modalwindows.CreateArticleModalComponentObject; import com.wikia.webdriver.pageobjectsfactory.pageobject.oasis.MainPage; @@ -169,7 +169,7 @@ public void testExploreMenuLinks() { communityHeader.openExploreMenu().clickExploreRandomLink(); Assertion.assertTrue(driver.getCurrentUrl() - .matches(".*\\.wikia\\.com/wiki/(?!Special:Images).*")); + .matches(".*\\.(wikia|fandom)\\.com/wiki/(?!Special:Images).*")); } @RunOnly(language = "szl") @@ -205,7 +205,7 @@ public void testExploreMenuLinksSzl() { public void testDiscussLinkOnWikiWithDiscussionsWithoutForum() { new CommunityHeaderDesktop().clickDiscussLink(); - Assertion.assertStringContains(driver.getCurrentUrl(),"wikia.com/d/f"); + Assertion.assertTrue(driver.getCurrentUrl().matches(".*(wikia|fandom).com/d/f")); } @RunOnly(language = "szl")