Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86859
Change subject: Moved Cucumber hooks to hooks.rb file
......................................................................
Moved Cucumber hooks to hooks.rb file
Bug: 49812
Change-Id: Ib927b824a8854d1c4257a17db582595a22d70470
---
M tests/browser/features/step_definitions/accept_language_steps.rb
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/support/env.rb
A tests/browser/features/support/hooks.rb
4 files changed, 47 insertions(+), 49 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/59/86859/1
diff --git a/tests/browser/features/step_definitions/accept_language_steps.rb
b/tests/browser/features/step_definitions/accept_language_steps.rb
index 41a6183..b1b7dba 100644
--- a/tests/browser/features/step_definitions/accept_language_steps.rb
+++ b/tests/browser/features/step_definitions/accept_language_steps.rb
@@ -1,5 +1,5 @@
Given(/^that my browser's accept language is (.+)$/) do |language|
- @browser = browser(environment, test_name(@scenario),
ENV['SAUCE_ONDEMAND_USERNAME'], ENV['SAUCE_ONDEMAND_ACCESS_KEY'], language)
+ @browser = browser(environment, test_name(@scenario), language)
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index a879835..2660db3 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -56,28 +56,11 @@
get_font('body')
end
-After('@reset-preferences-after') do |scenario|
- visit(ResetPreferencesPage)
- on(ResetPreferencesPage).submit_element.click
-end
-
def uls_position()
if !defined?($uls_position)
visit(PanelPage)
$uls_position = @browser.execute_script( "return mw.config.get(
'wgULSPosition' )" );
else
$uls_position
- end
-end
-
-Before('@uls-in-sidebar-only') do |scenario|
- if uls_position() != 'interlanguage'
- scenario.skip_invoke!
- end
-end
-
-Before('@uls-in-personal-only') do |scenario|
- if uls_position() != 'personal'
- scenario.skip_invoke!
end
end
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index ca56ddb..e6c0101 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -80,41 +80,10 @@
browser
end
-
def test_name(scenario)
if scenario.respond_to? :feature
"#{scenario.feature.name}: #{scenario.name}"
elsif scenario.respond_to? :scenario_outline
"#{scenario.scenario_outline.feature.name}:
#{scenario.scenario_outline.name}: #{scenario.name}"
end
-end
-
-config = YAML.load_file('config/config.yml')
-mediawiki_username = config['mediawiki_username']
-
-Before('@login') do
- puts "MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding." unless ENV['MEDIAWIKI_PASSWORD']
-end
-
-Before('@language') do |scenario|
- @language = true
- @scenario = scenario
-end
-
-Before do |scenario|
- @config = config
- @random_string = Random.new.rand.to_s
- @mediawiki_username = mediawiki_username
- unless @language
- @browser = browser(environment, test_name(scenario), 'default')
- $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
- end
-end
-
-After do |scenario|
- if environment == :saucelabs
- sauce_api(%Q{{"passed": #{scenario.passed?}}})
- sauce_api(%Q{{"public": true}})
- end
- @browser.close unless ENV['KEEP_BROWSER_OPEN'] == 'true'
end
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
new file mode 100644
index 0000000..ef42a9c
--- /dev/null
+++ b/tests/browser/features/support/hooks.rb
@@ -0,0 +1,46 @@
+config = YAML.load_file('config/config.yml')
+mediawiki_username = config['mediawiki_username']
+
+Before do |scenario|
+ @config = config
+ @random_string = Random.new.rand.to_s
+ @mediawiki_username = mediawiki_username
+ unless @language
+ @browser = browser(environment, test_name(scenario), 'default')
+ $session_id = @browser.driver.instance_variable_get(:@bridge).session_id
+ end
+end
+
+Before('@language') do |scenario|
+ @language = true
+ @scenario = scenario
+end
+
+Before('@login') do
+ puts "MEDIAWIKI_PASSWORD environment variable is not defined! Please export
a value for that variable before proceeding." unless ENV['MEDIAWIKI_PASSWORD']
+end
+
+Before('@uls-in-personal-only') do |scenario|
+ if uls_position() != 'personal'
+ scenario.skip_invoke!
+ end
+end
+
+Before('@uls-in-sidebar-only') do |scenario|
+ if uls_position() != 'interlanguage'
+ scenario.skip_invoke!
+ end
+end
+
+After do |scenario|
+ if environment == :saucelabs
+ sauce_api(%Q{{"passed": #{scenario.passed?}}})
+ sauce_api(%Q{{"public": true}})
+ end
+ @browser.close unless ENV['KEEP_BROWSER_OPEN'] == 'true'
+end
+
+After('@reset-preferences-after') do |scenario|
+ visit(ResetPreferencesPage)
+ on(ResetPreferencesPage).submit_element.click
+end
--
To view, visit https://gerrit.wikimedia.org/r/86859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib927b824a8854d1c4257a17db582595a22d70470
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: 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
