Skip to content

Webhooktest #2505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Webhooktest #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8d59e56
Mercury skin selector change
Oct 12, 2018
21c0035
sdfg
Oct 12, 2018
522a914
Increase offset by 100px as a workaround
Oct 12, 2018
0abf18b
fds
Oct 12, 2018
8488e58
Added optional fandom domain in assertion in testDiscussLinkOnWikiWit…
Oct 13, 2018
f3cdf52
Removed language as this test was not skipped for lang different than…
Oct 13, 2018
ac3e694
Added optional fandom domain in assertion for testExploreMenuLinks
Oct 13, 2018
9c7b9e9
Merge branch 'master' of github.com:Wikia/selenium-tests into FandomA…
Oct 13, 2018
281fe60
Fixed reset tracking options button's selector
Oct 13, 2018
2292b0c
A hack to make every login/signup test work
Oct 14, 2018
673efd4
Revert "A hack to make every login/signup test work"
Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/java/com/wikia/webdriver/common/core/elemnt/JavascriptActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private int getOffset() {
offset += searchComponent.getHeight();
}

return offset;
return offset + 200;
}

public void scrollToSpecificElement(WebElement element) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/wikia/webdriver/elements/communities/desktop/pages/PrivacyPolicyPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/com/wikia/webdriver/pageobjectsfactory/pageobject/WikiBasePageObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MAJOR This block of commented-out lines of code should be removed. rule

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");
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/wikia/webdriver/testcases/desktop/navigation/global/GlobalNavigationLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
6 changes: 3 additions & 3 deletions ...est/java/com/wikia/webdriver/testcases/desktop/navigation/local/CommunityHeaderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down