Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/63122
Change subject: Refactoring: introduced URL module ...................................................................... Refactoring: introduced URL module Change-Id: I99e4d8831ca770d643b2ba40de36205b7309a46f --- A tests/acceptance/features/support/modules/url_module.rb M tests/acceptance/features/support/pages/beta_page.rb M tests/acceptance/features/support/pages/home_page.rb M tests/acceptance/features/support/pages/login_page.rb M tests/acceptance/features/support/pages/random_page.rb 5 files changed, 18 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/22/63122/1 diff --git a/tests/acceptance/features/support/modules/url_module.rb b/tests/acceptance/features/support/modules/url_module.rb new file mode 100644 index 0000000..5ac84a3 --- /dev/null +++ b/tests/acceptance/features/support/modules/url_module.rb @@ -0,0 +1,10 @@ +module URL + def self.url(name) + if ENV['MEDIAWIKI_URL'] + mediawiki_url = ENV['MEDIAWIKI_URL'] + else + mediawiki_url = 'http://127.0.0.1:80/wiki/' + end + "#{mediawiki_url}#{name}" + end +end diff --git a/tests/acceptance/features/support/pages/beta_page.rb b/tests/acceptance/features/support/pages/beta_page.rb index e28d110..1efe6ff 100644 --- a/tests/acceptance/features/support/pages/beta_page.rb +++ b/tests/acceptance/features/support/pages/beta_page.rb @@ -1,15 +1,8 @@ class BetaPage include PageObject - def self.url - if ENV['MEDIAWIKI_URL'] - mediawiki_url = ENV['MEDIAWIKI_URL'] - else - mediawiki_url = 'http://127.0.0.1:80/wiki/' - end - "#{mediawiki_url}Special:MobileOptions/BetaOptIn" - end - page_url url + include URL + page_url URL.url('Special:MobileOptions/BetaOptIn') div(:beta_parent, class: 'mw-mf-checkbox-css3') span(:beta) do |page| diff --git a/tests/acceptance/features/support/pages/home_page.rb b/tests/acceptance/features/support/pages/home_page.rb index 9e90b8c..f75808d 100644 --- a/tests/acceptance/features/support/pages/home_page.rb +++ b/tests/acceptance/features/support/pages/home_page.rb @@ -1,13 +1,9 @@ class HomePage include PageObject + include URL def self.url - if ENV['MEDIAWIKI_URL'] - mediawiki_url = ENV['MEDIAWIKI_URL'] - else - mediawiki_url = 'http://127.0.0.1:80/wiki/' - end - "#{mediawiki_url}Main_Page" + URL.url('Main_Page') end page_url url diff --git a/tests/acceptance/features/support/pages/login_page.rb b/tests/acceptance/features/support/pages/login_page.rb index 13b865a..583752a 100644 --- a/tests/acceptance/features/support/pages/login_page.rb +++ b/tests/acceptance/features/support/pages/login_page.rb @@ -1,15 +1,8 @@ class LoginPage include PageObject - def self.url - if ENV['MEDIAWIKI_URL'] - mediawiki_url = ENV['MEDIAWIKI_URL'] - else - mediawiki_url = 'http://127.0.0.1:80/wiki/' - end - "#{mediawiki_url}Special:UserLogin" - end - page_url url + include URL + page_url URL.url('Special:UserLogin') div(:feedback, class: 'errorbox') button(:login, id: 'wpLoginAttempt') diff --git a/tests/acceptance/features/support/pages/random_page.rb b/tests/acceptance/features/support/pages/random_page.rb index aa98fe2..4ed37d7 100644 --- a/tests/acceptance/features/support/pages/random_page.rb +++ b/tests/acceptance/features/support/pages/random_page.rb @@ -1,13 +1,6 @@ class RandomPage include PageObject - def self.url - if ENV['MEDIAWIKI_URL'] - mediawiki_url = ENV['MEDIAWIKI_URL'] - else - mediawiki_url = 'http://127.0.0.1:80/wiki/' - end - "#{mediawiki_url}Special:Random" - end - page_url url + include URL + page_url URL.url('Special:Random') end -- To view, visit https://gerrit.wikimedia.org/r/63122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99e4d8831ca770d643b2ba40de36205b7309a46f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
