Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/93437
Change subject: WIP moving code to the gem ...................................................................... WIP moving code to the gem Bug: 56088 Change-Id: I830ede3c1fa82e0ce307ca7ca687143a19bc76ef --- M lib/mediawiki/selenium.rb R lib/mediawiki/selenium/features/support/env.rb R lib/mediawiki/selenium/features/support/hooks.rb A lib/mediawiki/selenium/features/support/modules/url_module.rb A lib/mediawiki/selenium/features/support/pages/login_page.rb R lib/mediawiki/selenium/features/support/sauce.rb 6 files changed, 64 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium refs/changes/37/93437/1 diff --git a/lib/mediawiki/selenium.rb b/lib/mediawiki/selenium.rb index dbdbc20..5b706e3 100644 --- a/lib/mediawiki/selenium.rb +++ b/lib/mediawiki/selenium.rb @@ -9,8 +9,14 @@ https://github.com/zeljkofilipin/mediawiki-selenium/blob/master/CREDITS. =end -require "mediawiki/selenium/env" -require "mediawiki/selenium/hooks" -require "mediawiki/selenium/sauce" require "mediawiki/selenium/version" +require "mediawiki/selenium/features/support/env" +require "mediawiki/selenium/features/support/hooks" +require "mediawiki/selenium/features/support/sauce" + +require "mediawiki/selenium/features/support/modules/url_module" + +require "mediawiki/selenium/features/support/modules/url_module" + + diff --git a/lib/mediawiki/selenium/env.rb b/lib/mediawiki/selenium/features/support/env.rb similarity index 100% rename from lib/mediawiki/selenium/env.rb rename to lib/mediawiki/selenium/features/support/env.rb diff --git a/lib/mediawiki/selenium/hooks.rb b/lib/mediawiki/selenium/features/support/hooks.rb similarity index 100% rename from lib/mediawiki/selenium/hooks.rb rename to lib/mediawiki/selenium/features/support/hooks.rb diff --git a/lib/mediawiki/selenium/features/support/modules/url_module.rb b/lib/mediawiki/selenium/features/support/modules/url_module.rb new file mode 100644 index 0000000..eb8c7e4 --- /dev/null +++ b/lib/mediawiki/selenium/features/support/modules/url_module.rb @@ -0,0 +1,21 @@ +# +# This file is subject to the license terms in the LICENSE file found in the +# qa-browsertests top-level directory and at +# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of +# qa-browsertests, including this file, may be copied, modified, propagated, or +# distributed except according to the terms contained in the LICENSE file. +# +# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the +# qa-browsertests top-level directory and at +# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS +# +module URL + def self.url(name) + if ENV['MEDIAWIKI_URL'] + mediawiki_url = ENV['MEDIAWIKI_URL'] + else + mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/' + end + "#{mediawiki_url}#{name}" + end +end diff --git a/lib/mediawiki/selenium/features/support/pages/login_page.rb b/lib/mediawiki/selenium/features/support/pages/login_page.rb new file mode 100644 index 0000000..0652827 --- /dev/null +++ b/lib/mediawiki/selenium/features/support/pages/login_page.rb @@ -0,0 +1,34 @@ +# +# This file is subject to the license terms in the LICENSE file found in the +# qa-browsertests top-level directory and at +# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/LICENSE. No part of +# qa-browsertests, including this file, may be copied, modified, propagated, or +# distributed except according to the terms contained in the LICENSE file. +# +# Copyright 2012-2013 by the Mediawiki developers. See the CREDITS file in the +# qa-browsertests top-level directory and at +# https://git.wikimedia.org/blob/qa%2Fbrowsertests/HEAD/CREDITS +# +class LoginPage + include PageObject + + include URL + page_url URL.url('Special:UserLogin') + + div(:feedback, class: 'errorbox') + button(:login, id: 'wpLoginAttempt') + text_field(:password, id: 'wpPassword1') + a(:password_strength, text: 'password strength') + a(:phishing, text: 'phishing') + text_field(:username, id: 'wpName1') + a(:username_displayed, title: /Your user page/) + + def logged_in_as_element + @browser.div(id: 'mw-content-text').p.b + end + def login_with(username, password) + self.username = username + self.password = password + login + end +end diff --git a/lib/mediawiki/selenium/sauce.rb b/lib/mediawiki/selenium/features/support/sauce.rb similarity index 100% rename from lib/mediawiki/selenium/sauce.rb rename to lib/mediawiki/selenium/features/support/sauce.rb -- To view, visit https://gerrit.wikimedia.org/r/93437 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I830ede3c1fa82e0ce307ca7ca687143a19bc76ef Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/selenium Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
