jenkins-bot has submitted this change and it was merged.
Change subject: QA: Make image clicking tests more generic
......................................................................
QA: Make image clicking tests more generic
Use the first image on the page as the basis for the test
The previous setup enforced that the wiki had to run on wiki/ prefix
which is not always the case (mine for instance runs on w/index.php)
It also unnecessarily expects an exact image.
Change-Id: I5f0647727a27fe7a127796132d516c62ceb792d2
---
M tests/browser/features/step_definitions/image_resolves_steps.rb
M tests/browser/features/support/pages/article_page.rb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/image_resolves_steps.rb
b/tests/browser/features/step_definitions/image_resolves_steps.rb
index 7afc6d7..21420cf 100644
--- a/tests/browser/features/step_definitions/image_resolves_steps.rb
+++ b/tests/browser/features/step_definitions/image_resolves_steps.rb
@@ -1,5 +1,5 @@
When /^I click on this image$/ do
- on(ArticlePage).springfield_image_element.when_present.click
+ on(ArticlePage).image_link_element.when_present.click
end
When /^I expand Presidential Campaign Section$/ do
@@ -7,5 +7,5 @@
end
Then /^I go to the image's page$/ do
- @browser.url.should match
Regexp.escape("File:Flickr_Obama_Springfield_01.jpg")
+ @browser.url.should match Regexp.escape("File:")
end
diff --git a/tests/browser/features/support/pages/article_page.rb
b/tests/browser/features/support/pages/article_page.rb
index 388338f..f85b4d6 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -43,6 +43,6 @@
span(:external_links_section, id:"External_links")
span(:pres_campaign_section, id:"Presidential_campaigns")
a(:ext_whitehouse_link, href:
"http://www.whitehouse.gov/administration/president_obama/";)
- a(:springfield_image, href: "/wiki/File:Flickr_Obama_Springfield_01.jpg")
+ a(:image_link, class:"image")
end
--
To view, visit https://gerrit.wikimedia.org/r/109098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f0647727a27fe7a127796132d516c62ceb792d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
