[MediaWiki-commits] [Gerrit] Browser test support for multiwiki - change (mediawiki/vagrant)

[Dduvall (Code Review)]

Dduvall has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/147683

Change subject: Browser test support for multiwiki
......................................................................

Browser test support for multiwiki

Change-Id: Ib7a1d549fb5c0270d392da255ad8d03370983663
---
M puppet/modules/browsertests/manifests/bundle.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/multiwiki/manifests/extension.pp
3 files changed, 30 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/83/147683/1

diff --git a/puppet/modules/browsertests/manifests/bundle.pp 
b/puppet/modules/browsertests/manifests/bundle.pp
index b9641f1..f2044e9 100644
--- a/puppet/modules/browsertests/manifests/bundle.pp
+++ b/puppet/modules/browsertests/manifests/bundle.pp
@@ -8,10 +8,18 @@
 #
 #   browsertests::bundle { 
'/vagrant/mediawiki/extensions/VisualEditor/modules/ve-mw/test/browser': }
 #
-define browsertests::bundle {
+#   browsertests::bundle { 'VisualEditorTests':
+#       directory => 
'/vagrant/mediawiki/extensions/VisualEditor/modules/ve-mw/test/browser'
+#   }
+#
+define browsertests::bundle(
+    $directory = $title,
+) {
     include browsertests
     include ruby::default
 
-    ruby::bundle { $title: }
+    ruby::bundle { $title:
+        directory => $directory,
+    }
 }
 
diff --git a/puppet/modules/mediawiki/manifests/extension.pp 
b/puppet/modules/mediawiki/manifests/extension.pp
index ff5b4f4..eeb1726 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
@@ -131,8 +131,9 @@
             default => $browser_tests,
         }
 
-        browsertests::bundle { "${extension_dir}/${browser_tests_dir}":
-          require => Git::Clone["mediawiki/extensions/${extension}"],
+        browsertests::bundle { "{$title}-browsertests-bundle":
+          directory => "${extension_dir}/${browser_tests_dir}",
+          require   => Git::Clone["mediawiki/extensions/${extension}"],
         }
     }
 }
diff --git a/puppet/modules/multiwiki/manifests/extension.pp 
b/puppet/modules/multiwiki/manifests/extension.pp
index e6a38a1..a6d7f32 100644
--- a/puppet/modules/multiwiki/manifests/extension.pp
+++ b/puppet/modules/multiwiki/manifests/extension.pp
@@ -44,6 +44,13 @@
 #   mediawiki::extension and mediawiki::settings for detailed examples. Empty
 #   by default.
 #
+# [*browser_tests*]
+#   Whether or not to install the dependencies necessary to execute browser
+#   tests. Specifying true will bundle the tests in the default
+#   'tests/browser' subdirectory of the extension directory. You may otherwise
+#   provide a different subdirectory, or false to skip installation of
+#   browser-test dependencies altogether. Default: false.
+#
 # === Examples
 #
 #   multiwiki::extension { 'examplemulti:Example':
@@ -62,6 +69,7 @@
     $needs_update = false,
     $branch       = undef,
     $settings     = {},
+    $browser_tests  = false,
 ) {
     include ::multiwiki
 
@@ -84,14 +92,15 @@
     $settings_dir = "${::multiwiki::settings_root}/${wikidb}/settings.d"
 
     mediawiki::extension { $title:
-        ensure       => present,
-        extension    => $extension,
-        entrypoint   => $ext_entrypoint,
-        priority     => $priority,
-        needs_update => false,
-        branch       => $branch,
-        settings     => $settings,
-        settings_dir => "${settings_dir}/puppet-managed",
+        ensure        => present,
+        extension     => $extension,
+        entrypoint    => $ext_entrypoint,
+        priority      => $priority,
+        needs_update  => false,
+        branch        => $branch,
+        settings      => $settings,
+        settings_dir  => "${settings_dir}/puppet-managed",
+        browser_tests => $browser_tests,
     }
 
     if $needs_update {

-- 
To view, visit https://gerrit.wikimedia.org/r/147683
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7a1d549fb5c0270d392da255ad8d03370983663
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <dduv...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits