jenkins-bot has submitted this change and it was merged.
Change subject: QA: update navigation test for rspec
......................................................................
QA: update navigation test for rspec
This should be pretty straightforward
* use RSpec3 expect() syntax
* prefer string to regex as argument to match() when appropriate
* use Selenium $browser.back instead of inline javascript
Change-Id: I2e214752224397859a00f11bf9acc5bdc7685464
---
M tests/browser/features/step_definitions/mmv_navigation_steps.rb
M tests/browser/features/step_definitions/mmv_steps.rb
2 files changed, 48 insertions(+), 48 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/step_definitions/mmv_navigation_steps.rb
b/tests/browser/features/step_definitions/mmv_navigation_steps.rb
index 68a569e..5d83e63 100644
--- a/tests/browser/features/step_definitions/mmv_navigation_steps.rb
+++ b/tests/browser/features/step_definitions/mmv_navigation_steps.rb
@@ -9,13 +9,13 @@
end
When /^I press the browser back button$/ do
- on(E2ETestPage).execute_script("window.history.back();");
+ $browser.back
end
Then /^the image and metadata of the next image should appear$/ do
on(E2ETestPage) do |page|
# MMV was launched, article is not visible yet
- page.image1_in_article_element.should_not be_visible
+ expect(page.image1_in_article_element).not_to be_visible
check_elements_in_viewer_for_image3 page
end
end
@@ -23,7 +23,7 @@
Then /^the image and metadata of the previous image should appear$/ do
on(E2ETestPage) do |page|
# MMV was launched, article is not visible yet
- page.image1_in_article_element.should_not be_visible
+ expect(page.image1_in_article_element).not_to be_visible
check_elements_in_viewer_for_image1 page
end
end
@@ -31,13 +31,13 @@
Then /^the wiki article should be scrolled to the same position as before
opening MMV$/ do
on(E2ETestPage) do |page|
@scrollDifference = page.execute_script("return $(window).scrollTop();") -
@articleScrollTop
- @scrollDifference.abs.should be < 2
+ expect(@scrollDifference.abs).to be < 2
end
end
Then /^I should be navigated back to the original wiki article$/ do
on(E2ETestPage) do |page|
- page.image1_in_article_element.should be_visible
- page.mmv_wrapper_element.should_not be_visible
+ expect(page.image1_in_article_element).to be_visible
+ expect(page.mmv_wrapper_element).not_to be_visible
end
end
\ No newline at end of file
diff --git a/tests/browser/features/step_definitions/mmv_steps.rb
b/tests/browser/features/step_definitions/mmv_steps.rb
index 0a6e77e..bdd5817 100644
--- a/tests/browser/features/step_definitions/mmv_steps.rb
+++ b/tests/browser/features/step_definitions/mmv_steps.rb
@@ -55,97 +55,97 @@
# while looking at image1 (Kerala)
def check_elements_in_viewer_for_image1(page)
# Check basic MMV elements are present
- page.mmv_overlay_element.when_present.should be_visible
- page.mmv_wrapper_element.when_present.should be_visible
- page.mmv_image_div_element.should be_visible
+ expect(page.mmv_overlay_element.when_present).to be_visible
+ expect(page.mmv_wrapper_element.when_present).to be_visible
+ expect(page.mmv_image_div_element).to be_visible
# Check image content
- page.mmv_image_div_element.image_element.attribute('src').should match
/Kerala/
+ expect(page.mmv_image_div_element.image_element.attribute('src')).to match
/Kerala/
# Check basic metadata is present
# Title
- page.mmv_metadata_title_element.when_present.text.should match /^Sunrise
over fishing boats$/
+ expect(page.mmv_metadata_title_element.when_present.text).to match /^Sunrise
over fishing boats$/
# License
- page.mmv_metadata_license_element.when_present.attribute('href').should
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
- page.mmv_metadata_license_element.when_present.text.should match /CC BY-SA
3.0/
+ expect(page.mmv_metadata_license_element.when_present.attribute('href')).to
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
+ expect(page.mmv_metadata_license_element.when_present.text).to match 'CC
BY-SA 3.0'
# Credit
- page.mmv_metadata_credit_element.when_present.should be_visible
- page.mmv_metadata_source_element.when_present.text.should match /Own work/
+ expect(page.mmv_metadata_credit_element.when_present).to be_visible
+ expect(page.mmv_metadata_source_element.when_present.text).to match 'Own
work'
# Image metadata
- page.mmv_image_metadata_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_wrapper_element.when_present).to be_visible
# Description
- page.mmv_image_metadata_desc_element.when_present.text.should match /Sunrise
over fishing boats on the beach south of Kovalam/
+ expect(page.mmv_image_metadata_desc_element.when_present.text).to match
'Sunrise over fishing boats on the beach south of Kovalam'
# Image metadata links
- page.mmv_image_metadata_links_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_links_wrapper_element.when_present).to
be_visible
# Details link
- page.mmv_details_page_link_element.when_present.text.should match /More
details/
- page.mmv_details_page_link_element.when_present.attribute('href').should
match /boats_in_Kerala.jpg$/
+ expect(page.mmv_details_page_link_element.when_present.text).to match 'More
details'
+ expect(page.mmv_details_page_link_element.when_present.attribute('href')).to
match /boats_in_Kerala.jpg$/
end
# Helper function that verifies the presence of various elements in viewer
# while looking at image2 (Aquarium)
def check_elements_in_viewer_for_image2(page)
# Check basic MMV elements are present
- page.mmv_overlay_element.when_present.should be_visible
- page.mmv_wrapper_element.when_present.should be_visible
- page.mmv_image_div_element.should be_visible
+ expect(page.mmv_overlay_element.when_present).to be_visible
+ expect(page.mmv_wrapper_element.when_present).to be_visible
+ expect(page.mmv_image_div_element).to be_visible
# Check image content
- page.mmv_image_div_element.image_element.attribute('src').should match
/Offsite/
+ expect(page.mmv_image_div_element.image_element.attribute('src')).to match
'Offsite'
# Check basic metadata is present
# Title
- page.mmv_metadata_title_element.when_present.text.should match /^Tropical
Fish Aquarium$/
+ expect(page.mmv_metadata_title_element.when_present.text).to match
/^Tropical Fish Aquarium$/
# License
- page.mmv_metadata_license_element.when_present.attribute('href').should
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
- page.mmv_metadata_license_element.when_present.text.should match /CC BY-SA
3.0/
+ expect(page.mmv_metadata_license_element.when_present.attribute('href')).to
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
+ expect(page.mmv_metadata_license_element.when_present.text).to match 'CC
BY-SA 3.0'
# Credit
- page.mmv_metadata_credit_element.when_present.should be_visible
- page.mmv_metadata_source_element.when_present.text.should match /Wikimedia
Foundation/
+ expect(page.mmv_metadata_credit_element.when_present).to be_visible
+ expect(page.mmv_metadata_source_element.when_present.text).to match
'Wikimedia Foundation'
# Image metadata
- page.mmv_image_metadata_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_wrapper_element.when_present).to be_visible
# Description
- page.mmv_image_metadata_desc_element.when_present.text.should match /Photo
from Wikimedia Foundation/
+ expect(page.mmv_image_metadata_desc_element.when_present.text).to match
'Photo from Wikimedia Foundation'
# Image metadata links
- page.mmv_image_metadata_links_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_links_wrapper_element.when_present).to
be_visible
# Details link
- page.mmv_details_page_link_element.when_present.text.should match /More
details/
- page.mmv_details_page_link_element.when_present.attribute('href').should
match /All_Hands_Offsite.*\.jpg$/
+ expect(page.mmv_details_page_link_element.when_present.text).to match 'More
details'
+ expect(page.mmv_details_page_link_element.when_present.attribute('href')).to
match /All_Hands_Offsite.*\.jpg$/
end
# Helper function that verifies the presence of various elements in viewer
# while looking at image3 (Hong Kong)
def check_elements_in_viewer_for_image3(page)
# Check basic MMV elements are present
- page.mmv_overlay_element.when_present.should be_visible
- page.mmv_wrapper_element.when_present.should be_visible
- page.mmv_image_div_element.should be_visible
+ expect(page.mmv_overlay_element.when_present).to be_visible
+ expect(page.mmv_wrapper_element.when_present).to be_visible
+ expect(page.mmv_image_div_element).to be_visible
# Check image content
- page.mmv_image_div_element.image_element.attribute('src').should match
/Hong_Kong/
+ expect(page.mmv_image_div_element.image_element.attribute('src')).to match
'Hong_Kong'
# Check basic metadata is present
# Title
- page.mmv_metadata_title_element.when_present.text.should match /^Hong Kong
Harbor at night$/
+ expect(page.mmv_metadata_title_element.when_present.text).to match /^Hong
Kong Harbor at night$/
# License
- page.mmv_metadata_license_element.when_present.attribute('href').should
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
- page.mmv_metadata_license_element.when_present.text.should match /CC BY-SA
3.0/
+ expect(page.mmv_metadata_license_element.when_present.attribute('href')).to
match /^http:\/\/creativecommons\.org\/licenses\/by-sa\/3\.0$/
+ expect(page.mmv_metadata_license_element.when_present.text).to match 'CC
BY-SA 3.0'
# Credit
- page.mmv_metadata_credit_element.when_present.should be_visible
- page.mmv_metadata_source_element.when_present.text.should match /Wikimedia
Foundation/
+ expect(page.mmv_metadata_credit_element.when_present).to be_visible
+ expect(page.mmv_metadata_source_element.when_present.text).to match
'Wikimedia Foundation'
# Image metadata
- page.mmv_image_metadata_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_wrapper_element.when_present).to be_visible
# Description
- page.mmv_image_metadata_desc_element.when_present.text.should match /Photos
from our product team's talks at Wikimania 2013 in Hong Kong./
+ expect(page.mmv_image_metadata_desc_element.when_present.text).to match
/Photos from our product team's talks at Wikimania 2013 in Hong Kong./
# Image metadata links
- page.mmv_image_metadata_links_wrapper_element.when_present.should be_visible
+ expect(page.mmv_image_metadata_links_wrapper_element.when_present).to
be_visible
# Details link
- page.mmv_details_page_link_element.when_present.text.should match /More
details/
- page.mmv_details_page_link_element.when_present.attribute('href').should
match /Wikimania_2013_-_Hong_Kong_-_Photo_090\.jpg$/
+ expect(page.mmv_details_page_link_element.when_present.text).to match 'More
details'
+ expect(page.mmv_details_page_link_element.when_present.attribute('href')).to
match /Wikimania_2013_-_Hong_Kong_-_Photo_090\.jpg$/
end
--
To view, visit https://gerrit.wikimedia.org/r/180644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e214752224397859a00f11bf9acc5bdc7685464
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
