Tobias Gritschacher has submitted this change and it was merged. Change subject: Using user factory for loggin in ......................................................................
Using user factory for loggin in Change-Id: Ie1bd00edf74e7c7c2115a986bf1bcf4f62dfea09 --- M tests/browser/environments.yml M tests/browser/features/step_definitions/entity_steps.rb M tests/browser/features/step_definitions/statement_steps.rb M tests/browser/features/support/pages/property_page.rb 4 files changed, 26 insertions(+), 11 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml index 3b28ccd..561afd1 100644 --- a/tests/browser/environments.yml +++ b/tests/browser/environments.yml @@ -33,6 +33,7 @@ browser: firefox mediawiki_url: https://wikidata.beta.wmflabs.org/wiki/ mediawiki_user: Selenium_user + user_factory: true # mediawiki_password: SET THIS IN THE ENVIRONMENT! test: @@ -40,6 +41,7 @@ browser: firefox mediawiki_url: https://test.wikidata.org/wiki/ mediawiki_user: Selenium_user + user_factory: true # mediawiki_password: SET THIS IN THE ENVIRONMENT! integration: diff --git a/tests/browser/features/step_definitions/entity_steps.rb b/tests/browser/features/step_definitions/entity_steps.rb index aca9451..80ebf6a 100644 --- a/tests/browser/features/step_definitions/entity_steps.rb +++ b/tests/browser/features/step_definitions/entity_steps.rb @@ -7,7 +7,9 @@ # basic steps for entities Given(/^I am logged in to the repo$/) do - visit(RepoLoginPage).login_with(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD']) + as_user(:b) do + visit(RepoLoginPage).login_with(user(:b), password(:b)) + end end Given(/^I am not logged in to the repo$/) do @@ -73,7 +75,14 @@ end Given(/^I have the following properties with datatype:$/) do |props| - @properties = visit(PropertyPage).create_properties(props) + property_data = on(PropertyPage).create_property_data(props) + wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api + + as_user(:b) do + wb_api.log_in(user(:b), password(:b)) + end + + @properties = on(PropertyPage).create_properties(property_data, wb_api) end Given(/^I have the following items:$/) do |handles| @@ -99,7 +108,11 @@ Given(/^The following sitelinks do not exist:$/) do |sitelinks| wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api - wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD']) + + as_user(:b) do + wb_api.log_in(user(:b), password(:b)) + end + sitelinks.raw.each do |sitelink| if wb_api.sitelink_exists?(sitelink[0], sitelink[1]) wb_api.remove_sitelink({ site_id: sitelink[0], title: sitelink[1] }, sitelink[0]) diff --git a/tests/browser/features/step_definitions/statement_steps.rb b/tests/browser/features/step_definitions/statement_steps.rb index 92a8fde..5000fe2 100644 --- a/tests/browser/features/step_definitions/statement_steps.rb +++ b/tests/browser/features/step_definitions/statement_steps.rb @@ -8,7 +8,11 @@ When(/^I have statements with the following properties and values:$/) do |statements| wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api - wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD']) + + as_user(:b) do + wb_api.log_in(user(:b), password(:b)) + end + statements.raw.each do |statement| property_handle = statement[0] value = on(ItemPage).get_string_snak_value(statement[1]) diff --git a/tests/browser/features/support/pages/property_page.rb b/tests/browser/features/support/pages/property_page.rb index 2621dad..ebdb166 100644 --- a/tests/browser/features/support/pages/property_page.rb +++ b/tests/browser/features/support/pages/property_page.rb @@ -30,11 +30,8 @@ property_data end - def create_property(data) - wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api - wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD']) + def create_property(data, wb_api) resp = wb_api.create_property(data) - id = resp['entity']['id'] if resp['entity']['labels'].length > 0 && resp['entity']['labels']['en'] @@ -54,11 +51,10 @@ { 'id' => id, 'url' => url, 'label' => label_en, 'description' => description_en } end - def create_properties(props) - property_data = create_property_data(props) + def create_properties(property_data, wb_api) properties = {} property_data.each do |handle, data| - property = create_property(data) + property = create_property(data, wb_api) properties[handle] = property end -- To view, visit https://gerrit.wikimedia.org/r/301123 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1bd00edf74e7c7c2115a986bf1bcf4f62dfea09 Gerrit-PatchSet: 20 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WMDE-Fisch <christoph.fisc...@wikimedia.de> 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
