jenkins-bot has submitted this change and it was merged.
Change subject: Make site-specific Cucumber tag optional
......................................................................
Make site-specific Cucumber tag optional
Core does not have any site-specific Cucumber tags. To make it possible
to run it’s Cucumber/Selenium tests in Jenkins, `site_tag: false` is
used:
MediawikiSelenium::RakeTask.new(site_tag: false)
Bug: T128190
Change-Id: I73f43740606ad85c61271c963fde5d39ed3a159f
---
M README.md
M lib/mediawiki_selenium/rake_task.rb
2 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index 4c61190..ab192a5 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,19 @@
require 'mediawiki_selenium/rake_task'
MediawikiSelenium::RakeTask.new(test_dir: modules/ve-mw/tests/browser)
+By default, it will run something like this:
+
+ bundle exec cucumber (...) --tags ~@skip --tags
@en.wikipedia.beta.wmflabs.org --tags @firefox
+
+To exclude Cucumber site tag (example: `--tags
@en.wikipedia.beta.wmflabs.org`):
+
+ require 'mediawiki_selenium/rake_task'
+ MediawikiSelenium::RakeTask.new(site_tag: false)
+
+The above will run:
+
+ bundle exec cucumber (...) --tags ~@skip -tags @firefox
+
CI specific options are passed to cucumber when the rake task detects the
environment variable WORKSPACE is set. It will emit JUnit results under
`$WORKSPACE/log/junit`. To reproduce that behavior one can:
diff --git a/lib/mediawiki_selenium/rake_task.rb
b/lib/mediawiki_selenium/rake_task.rb
index db15992..32c5b46 100644
--- a/lib/mediawiki_selenium/rake_task.rb
+++ b/lib/mediawiki_selenium/rake_task.rb
@@ -4,7 +4,7 @@
module MediawikiSelenium
class RakeTask < Cucumber::Rake::Task
- def initialize(name = :selenium, test_dir:
Environment.default_test_directory)
+ def initialize(name: :selenium, test_dir:
Environment.default_test_directory, site_tag: true)
target = File.expand_path(test_dir, Rake.original_dir)
env = Environment.load_default(target)
@@ -18,8 +18,9 @@
options +=
' --backtrace --verbose --color --format pretty'\
" --format Cucumber::Formatter::Sauce --out
'#{workspace}/log/junit'"\
- ' --tags ~@skip'\
- " --tags @#{site}"
+ ' --tags ~@skip'
+ options +=
+ " --tags @#{site}" if site_tag
end
super(name) do |t|
--
To view, visit https://gerrit.wikimedia.org/r/282709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73f43740606ad85c61271c963fde5d39ed3a159f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
