jenkins-bot has submitted this change and it was merged. Change subject: QA: use API to protect page ......................................................................
QA: use API to protect page Change-Id: I400c52e4bb102c85f8619717c10845b7448cd249 --- M tests/browser/Gemfile.lock M tests/browser/features/step_definitions/common_steps.rb 2 files changed, 12 insertions(+), 19 deletions(-) Approvals: Zfilipin: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index ee58976..cb4f6c5 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -17,7 +17,7 @@ diff-lcs (1.2.5) domain_name (0.5.19) unf (>= 0.0.5, < 1.0.0) - faker (1.3.0) + faker (1.4.2) i18n (~> 0.5) faraday (0.9.0) multipart-post (>= 1.2, < 3) @@ -30,15 +30,16 @@ headless (1.0.2) http-cookie (1.0.2) domain_name (~> 0.5) - i18n (0.6.9) + i18n (0.6.11) json (1.8.1) - mediawiki_api (0.1.2) + mediawiki_api (0.1.4) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) - mediawiki_selenium (0.2.24) + mediawiki_selenium (0.2.26) cucumber (~> 1.3, >= 1.3.10) headless (~> 1.0, >= 1.0.1) json (~> 1.8, >= 1.8.1) + mediawiki_api (~> 0.1.3) page-object (~> 1.0) rest-client (~> 1.6, >= 1.6.7) rspec-expectations (~> 2.14, >= 2.14.4) @@ -47,17 +48,19 @@ multi_json (1.10.1) multi_test (0.1.1) multipart-post (2.0.0) + netrc (0.7.7) page-object (1.0) page_navigation (>= 0.9) selenium-webdriver (>= 2.42.0) watir-webdriver (>= 0.6.9) page_navigation (0.9) data_magic (>= 0.14) - rest-client (1.6.7) - mime-types (>= 1.16) - rspec-expectations (2.99.0) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rspec-expectations (2.99.1) diff-lcs (>= 1.1.3, < 2.0) - rubyzip (1.1.4) + rubyzip (1.1.6) selenium-webdriver (2.42.0) childprocess (>= 0.5.0) multi_json (~> 1.0) diff --git a/tests/browser/features/step_definitions/common_steps.rb b/tests/browser/features/step_definitions/common_steps.rb index 409b8da..69920da 100644 --- a/tests/browser/features/step_definitions/common_steps.rb +++ b/tests/browser/features/step_definitions/common_steps.rb @@ -74,17 +74,7 @@ end Given(/^the "(.*?)" page is protected\.$/) do |page| - step 'I am logged into the mobile website' - step 'I am on the "' + page + '" page' - step 'I switch to desktop' - if not on(DesktopArticlePage).unprotect_element.exists? - step 'I click the protect link on the desktop skin' - step 'I select Allow only administrators on the protection page' - step 'I click the submit button on the protection page' - end - step 'I switch to the mobile site' - step 'I click on "Log out" in the main navigation menu' - step 'I am on the "Special:UserLogout" page' + on(APIPage).protect(page, "MobileFrontend Selenium test protected this page") end Given(/^I am viewing the site in tablet mode$/) do -- To view, visit https://gerrit.wikimedia.org/r/146328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I400c52e4bb102c85f8619717c10845b7448cd249 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Cmcmahon <cmcma...@wikimedia.org> Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: JGonera <jgon...@wikimedia.org> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits