Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/63857
Change subject: Use composition instead of inheritance ...................................................................... Use composition instead of inheritance Bug: 48142 Change-Id: I511187727d001a4995ad130f0baf50e4f5571534 --- R selenium_cuc/features/support/modules/create_entity_module.rb R selenium_cuc/features/support/modules/entity_module.rb M selenium_cuc/features/support/modules/url_module.rb M selenium_cuc/features/support/pages/create_item_page.rb M selenium_cuc/features/support/pages/item_page.rb 5 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/57/63857/1 diff --git a/selenium_cuc/features/support/pages/create_entity_page.rb b/selenium_cuc/features/support/modules/create_entity_module.rb similarity index 91% rename from selenium_cuc/features/support/pages/create_entity_page.rb rename to selenium_cuc/features/support/modules/create_entity_module.rb index d94ef83..f073923 100644 --- a/selenium_cuc/features/support/pages/create_entity_page.rb +++ b/selenium_cuc/features/support/modules/create_entity_module.rb @@ -6,8 +6,9 @@ # # page object for CreateEntity special page base class -class CreateEntityPage < EntityPage +module CreateEntityPage include PageObject + include EntityPage text_field(:createEntityLabelField, :id => "wb-newentity-label") text_field(:createEntityDescriptionField, :id => "wb-newentity-description") diff --git a/selenium_cuc/features/support/pages/entity_page.rb b/selenium_cuc/features/support/modules/entity_module.rb similarity index 98% rename from selenium_cuc/features/support/pages/entity_page.rb rename to selenium_cuc/features/support/modules/entity_module.rb index 9c9c0a0..eec459f 100644 --- a/selenium_cuc/features/support/pages/entity_page.rb +++ b/selenium_cuc/features/support/modules/entity_module.rb @@ -8,7 +8,7 @@ #require 'ruby_selenium' -class EntityPage# < RubySelenium +module EntityPage include PageObject include SitelinkPage include AliasPage diff --git a/selenium_cuc/features/support/modules/url_module.rb b/selenium_cuc/features/support/modules/url_module.rb index e95d25f..69ba144 100644 --- a/selenium_cuc/features/support/modules/url_module.rb +++ b/selenium_cuc/features/support/modules/url_module.rb @@ -1,3 +1,13 @@ +# -*- encoding : utf-8 -*- +# Wikidata UI tests +# +# Author:: Tobias Gritschacher ([email protected]) +# License:: GNU GPL v2+ +# +# Reused and modified from https://github.com/wikimedia/qa-browsertests/blob/master/features/support/modules/url_module.rb +# +# module for URLs + module URL def self.client_url(name) if ENV['WIKIDATA_CLIENT_URL'] diff --git a/selenium_cuc/features/support/pages/create_item_page.rb b/selenium_cuc/features/support/pages/create_item_page.rb index a15af26..5ef4e77 100644 --- a/selenium_cuc/features/support/pages/create_item_page.rb +++ b/selenium_cuc/features/support/pages/create_item_page.rb @@ -6,8 +6,9 @@ # # page object for CreateItem special page -class CreateItemPage < CreateEntityPage +class CreateItemPage include PageObject + include CreateEntityPage include URL page_url URL.repo_url("Special:NewItem") diff --git a/selenium_cuc/features/support/pages/item_page.rb b/selenium_cuc/features/support/pages/item_page.rb index a49592b..b6d2764 100644 --- a/selenium_cuc/features/support/pages/item_page.rb +++ b/selenium_cuc/features/support/pages/item_page.rb @@ -8,8 +8,9 @@ #require 'ruby_selenium' -class ItemPage < EntityPage +class ItemPage include PageObject + include EntityPage # ***** METHODS ***** # item url navigation -- To view, visit https://gerrit.wikimedia.org/r/63857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I511187727d001a4995ad130f0baf50e4f5571534 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
