[MediaWiki-commits] [Gerrit] Attempt fix for the linkitem selenium tests - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Attempt fix for the linkitem selenium tests .. Attempt fix for the linkitem selenium tests The lazy loading introduced in I9a03c3d974f181e8eadaa30b673e7c662033cb1c broke this. (Untested) Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 --- M client/tests/selenium/interwiki/edit_sitelinks_spec.rb M selenium/lib/pages/client_page.rb 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb index 0ce2b2d..0118b36 100644 --- a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb +++ b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb @@ -43,7 +43,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLink?.should be_true page.clientLinkDialogHeader.should == "You need to be logged in" page.clientLinkDialogClose?.should be_true @@ -60,7 +60,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkDialogHeader.should == "Link with page" page.clientLinkDialogClose?.should be_true page.clientLinkDialogClose @@ -73,7 +73,7 @@ page.navigate_to_article(article_title) page.wait_for_link_item_link page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLanguageInput?.should be_true page.clientLinkItemLanguagePage?.should be_true page.clientLinkItemSubmit?.should be_true diff --git a/selenium/lib/pages/client_page.rb b/selenium/lib/pages/client_page.rb index 224f720..0be7131 100644 --- a/selenium/lib/pages/client_page.rb +++ b/selenium/lib/pages/client_page.rb @@ -118,4 +118,10 @@ clientLinkItemLink? end end + + def wait_for_link_item_dialog +wait_until do + clientLinkDialogHeader? +end + end end -- To view, visit https://gerrit.wikimedia.org/r/60669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.22-wmf3 Gerrit-Owner: Tobias Gritschacher Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt fix for the linkitem selenium tests - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/60669 Change subject: Attempt fix for the linkitem selenium tests .. Attempt fix for the linkitem selenium tests The lazy loading introduced in I9a03c3d974f181e8eadaa30b673e7c662033cb1c broke this. (Untested) Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 --- M client/tests/selenium/interwiki/edit_sitelinks_spec.rb M selenium/lib/pages/client_page.rb 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/69/60669/1 diff --git a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb index 0ce2b2d..0118b36 100644 --- a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb +++ b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb @@ -43,7 +43,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLink?.should be_true page.clientLinkDialogHeader.should == "You need to be logged in" page.clientLinkDialogClose?.should be_true @@ -60,7 +60,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkDialogHeader.should == "Link with page" page.clientLinkDialogClose?.should be_true page.clientLinkDialogClose @@ -73,7 +73,7 @@ page.navigate_to_article(article_title) page.wait_for_link_item_link page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLanguageInput?.should be_true page.clientLinkItemLanguagePage?.should be_true page.clientLinkItemSubmit?.should be_true diff --git a/selenium/lib/pages/client_page.rb b/selenium/lib/pages/client_page.rb index 224f720..0be7131 100644 --- a/selenium/lib/pages/client_page.rb +++ b/selenium/lib/pages/client_page.rb @@ -118,4 +118,10 @@ clientLinkItemLink? end end + + def wait_for_link_item_dialog +wait_until do + clientLinkDialogHeader? +end + end end -- To view, visit https://gerrit.wikimedia.org/r/60669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: mw1.22-wmf3 Gerrit-Owner: Tobias Gritschacher Gerrit-Reviewer: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt fix for the linkitem selenium tests - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Attempt fix for the linkitem selenium tests .. Attempt fix for the linkitem selenium tests The lazy loading introduced in I9a03c3d974f181e8eadaa30b673e7c662033cb1c broke this. (Untested) Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 --- M client/tests/selenium/interwiki/edit_sitelinks_spec.rb M selenium/lib/pages/client_page.rb 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb index 0ce2b2d..0118b36 100644 --- a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb +++ b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb @@ -43,7 +43,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLink?.should be_true page.clientLinkDialogHeader.should == "You need to be logged in" page.clientLinkDialogClose?.should be_true @@ -60,7 +60,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkDialogHeader.should == "Link with page" page.clientLinkDialogClose?.should be_true page.clientLinkDialogClose @@ -73,7 +73,7 @@ page.navigate_to_article(article_title) page.wait_for_link_item_link page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLanguageInput?.should be_true page.clientLinkItemLanguagePage?.should be_true page.clientLinkItemSubmit?.should be_true diff --git a/selenium/lib/pages/client_page.rb b/selenium/lib/pages/client_page.rb index 224f720..0be7131 100644 --- a/selenium/lib/pages/client_page.rb +++ b/selenium/lib/pages/client_page.rb @@ -118,4 +118,10 @@ clientLinkItemLink? end end + + def wait_for_link_item_dialog +wait_until do + clientLinkDialogHeader? +end + end end -- To view, visit https://gerrit.wikimedia.org/r/60448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man Gerrit-Reviewer: Daniel Werner Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Attempt fix for the linkitem selenium tests - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/60448 Change subject: Attempt fix for the linkitem selenium tests .. Attempt fix for the linkitem selenium tests Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 --- M client/tests/selenium/interwiki/edit_sitelinks_spec.rb M selenium/lib/pages/client_page.rb 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/48/60448/1 diff --git a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb index 0ce2b2d..0118b36 100644 --- a/client/tests/selenium/interwiki/edit_sitelinks_spec.rb +++ b/client/tests/selenium/interwiki/edit_sitelinks_spec.rb @@ -43,7 +43,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLink?.should be_true page.clientLinkDialogHeader.should == "You need to be logged in" page.clientLinkDialogClose?.should be_true @@ -60,7 +60,7 @@ page.wait_for_link_item_link page.clientLinkItemLink?.should be_true page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkDialogHeader.should == "Link with page" page.clientLinkDialogClose?.should be_true page.clientLinkDialogClose @@ -73,7 +73,7 @@ page.navigate_to_article(article_title) page.wait_for_link_item_link page.clientLinkItemLink -ajax_wait +page.wait_for_link_item_dialog page.clientLinkItemLanguageInput?.should be_true page.clientLinkItemLanguagePage?.should be_true page.clientLinkItemSubmit?.should be_true diff --git a/selenium/lib/pages/client_page.rb b/selenium/lib/pages/client_page.rb index 224f720..0be7131 100644 --- a/selenium/lib/pages/client_page.rb +++ b/selenium/lib/pages/client_page.rb @@ -118,4 +118,10 @@ clientLinkItemLink? end end + + def wait_for_link_item_dialog +wait_until do + clientLinkDialogHeader? +end + end end -- To view, visit https://gerrit.wikimedia.org/r/60448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If60aff7dd61cf15a93be71a593c3acc20a483d35 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits