[MediaWiki-commits] [Gerrit] Mostly rewrite missing.php - change (operations/mediawiki-config)

[Tim Starling (Code Review)]

Tim Starling has uploaded a new change for review.

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


Change subject: Mostly rewrite missing.php
..

Mostly rewrite missing.php

* Fix the particularly stupid error message given when a client tries to
  access a mobile domain on the main Squid IP address, and possibly also
  in other situations that are our fault, per bug 47807.
* Don't redirect non-existent domains to meta, send a 404. This is also
  partly aimed at addressing bug 47807.
* Fix lack of PATH_INFO validation per fixme comment. Use PATH_INFO for
  the page name instead of REQUEST_URI.
* Remove secure.wikimedia.org support, obsolete.
* Remove use of $_SERVER['HTTPS'], that will never work.
* Replace use of $_SERVER['SERVER_NAME'] with $_SERVER['HTTP_HOST'],
  since they are not the same and the latter was almost certainly
  intended.
* Remove custom port handling, unnecessary.
* Send a body with redirects
* Move everything into functions to avoid accidental use of the global
  scope.

Change-Id: I17989fc4124bcb296e809ba0a13f41c043af7d0d
---
M wmf-config/missing.php
1 file changed, 207 insertions(+), 106 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/39/61539/1

diff --git a/wmf-config/missing.php b/wmf-config/missing.php
index 4b0e507..f03a265 100644
--- a/wmf-config/missing.php
+++ b/wmf-config/missing.php
@@ -14,125 +14,99 @@
  * subdomains to Incubator, e.g. [[xyz:Page]] on en.wikipedia links to
  * http://incubator.wikimedia.org/wiki/Wp/xyz/Page
  * 
- * @copyright Copyright © 2011, Danny B., SPQRobin
+ * @copyright Copyright © 2011-2013, Danny B., SPQRobin, Tim Starling
  * 
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 
2.0 or later
  */
 
+// define( 'MISSING_PHP_TEST', 1 );
+
+/**
+ * The main function
+ */
+function handleMissingWiki() {
+   $projects = array(
+   'wikibooks'   => 'b',
+   'wikinews'=> 'n',
+   'wikipedia'   => 'p',
+   'wikiquote'   => 'q',
+   'wikisource'  => 's', // forward compatiblity, unused ATM
+   'wikiversity' => 'v', // forward compatiblity, unused ATM
+   'wikivoyage'  => 'y',
+   'wiktionary'  => 't',
+   );
+
+   $url = parse_url( getSelfUrl() );
+
+   if ( strpos( $url['host'], '.m.' ) !== false ) {
+   // Invalid request to mobile site, not rewritten by Varnish
+   showMobileError();
+   return;
+   }
+
+   # http(s)://$language.$project.org/wiki/$page
+   $tmp = explode( '.', $url['host'] );
+   $project = $incubatorCode = false;
+   if ( count( $tmp ) == 3 ) {
+   list( $language, $project, $tld ) = $tmp;
+   if( isset( $_SERVER['PATH_INFO'] )
+   && preg_match( '!^/wiki/(.*)$!', $_SERVER['PATH_INFO'], 
$m ) )
+   {
+   $page = $m[1];
+   } elseif( isset( $_GET['title'] ) && $_GET['title'] ) {
+   $page = $_GET['title']; # index.php?title=Page
+   } else {
+   $page = ''; # Main page
+   }
+   $project = strtolower( $project );
+   $incubatorCode = isset( $projects[$project] ) ? 
$projects[$project] : null;
+   }
+
+   if ( !$incubatorCode ) {
+   showGenericError();
+   } elseif( $project === 'wikisource' ) {
+   # Wikisource should redirect to the multilingual wikisource
+   showRedirect( $url['scheme'] . '://wikisource.org/wiki/' . 
$page );
+   } elseif( $project === 'wikiversity' ) {
+   # Wikiversity gives an error page
+   showMissingSubdomainError( $project, $language );
+   } else {
+   # Redirect to incubator
+   $incubatorBase = 'incubator.wikimedia.org/wiki/';
+   $location = $url['scheme'] . '://' . $incubatorBase . 'W' . 
$incubatorCode . '/' . urlencode( $language );
+   # Go to the page if specified (look out for slashes), otherwise 
go to
+   # the main page Wx/xyz?goto=mainpage (WikimediaIncubator 
extension takes care of that)
+   $location .= $page && $page !== '/' ? '/' . $page :
+   '?goto=mainpage' . ( isset( $_GET['uselang'] ) ? 
'&uselang=' . urlencode( $_GET['uselang'] ) : '' );
+   
+   showRedirect( $location );
+   }
+}
 
 /**
  * Obtaining the full self URL
  * @return string Actual URL except for fragment part
  */
 function getSelfUrl() {
-
-   // faking https on secure.wikimedia.org - thanks Ryan for hint
if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && 
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' ) {
-   $_SERVER['HTTPS'] = 'on';
-   }
-
-   $protocol = ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] =

[MediaWiki-commits] [Gerrit] Consistency tweaks in preparation for adding extension to tr... - change (mediawiki...Spreadsheet)

[Netbrain (Code Review)]

Netbrain has submitted this change and it was merged.

Change subject: Consistency tweaks in preparation for adding extension to 
translatewiki.net
..


Consistency tweaks in preparation for adding extension to translatewiki.net

* Remove period from end of description message
* Add newline to avoid breaking treanslatewiki.net scripts

Change-Id: Ifb482042557ce37d5a96b88d5950194b5742d379
---
M Spreadsheet.i18n.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Netbrain: Verified; Looks good to me, approved



diff --git a/Spreadsheet.i18n.php b/Spreadsheet.i18n.php
index 129cebf..55df5b6 100644
--- a/Spreadsheet.i18n.php
+++ b/Spreadsheet.i18n.php
@@ -12,7 +12,7 @@
  * @author Kim Eik
  */
 $messages['en'] = array(
-   'spreadsheet-desc' => 'An interactive web frontend capable of reading 
and modifying uploaded spreadsheet files.',
+   'spreadsheet-desc' => 'An interactive web frontend capable of reading 
and modifying uploaded spreadsheet files',
 );
 
 /** Message documentation (Message documentation)
@@ -20,4 +20,4 @@
  */
 $messages['qqq'] = array(
'spreadsheet-desc' => '{{desc}}',
-);
\ No newline at end of file
+);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb482042557ce37d5a96b88d5950194b5742d379
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Spreadsheet
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Netbrain 
Gerrit-Reviewer: Siebrand 

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

[MediaWiki-commits] [Gerrit] Add new message key to maintenace file - change (mediawiki/core)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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


Change subject: Add new message key to maintenace file
..

Add new message key to maintenace file

https://gerrit.wikimedia.org/r/#/c/58281/17/languages/messages/MessagesEn.php,unified

Change-Id: I5306382841a74a850d92283252dab7d5cce6cc3a
---
M maintenance/language/messages.inc
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/40/61540/1

diff --git a/maintenance/language/messages.inc 
b/maintenance/language/messages.inc
index 96a6c13..281b49f 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3727,6 +3727,7 @@
'htmlform-selectorother-other',
'htmlform-no',
'htmlform-yes',
+   'htmlform-chosen-placeholder',
),
'sqlite' => array(
'sqlite-has-fts',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5306382841a74a850d92283252dab7d5cce6cc3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [Spreadsheet] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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


Change subject: [Spreadsheet] Register extension
..

[Spreadsheet] Register extension

Change-Id: I5b1b65c5f5bc901ea75359be7198072e4787099f
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/41/61541/1

diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 30d3ef6..4c69395 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1374,6 +1374,8 @@
 
 Sphinx Search
 
+Spreadsheet
+
 SSL Client Authentication
 file = SSLClientAuthentication/ClientSSLAuth.i18n.php
 descmsg = sslauth-desc

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b1b65c5f5bc901ea75359be7198072e4787099f
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [Spreadsheet] Register extension - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [Spreadsheet] Register extension
..


[Spreadsheet] Register extension

Change-Id: I5b1b65c5f5bc901ea75359be7198072e4787099f
---
M groups/MediaWiki/mediawiki-defines.txt
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 30d3ef6..4c69395 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1374,6 +1374,8 @@
 
 Sphinx Search
 
+Spreadsheet
+
 SSL Client Authentication
 file = SSLClientAuthentication/ClientSSLAuth.i18n.php
 descmsg = sslauth-desc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b1b65c5f5bc901ea75359be7198072e4787099f
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Add new message key to maintenace file - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add new message key to maintenace file
..


Add new message key to maintenace file

https://gerrit.wikimedia.org/r/#/c/58281/17/languages/messages/MessagesEn.php,unified

Change-Id: I5306382841a74a850d92283252dab7d5cce6cc3a
---
M maintenance/language/messages.inc
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/language/messages.inc 
b/maintenance/language/messages.inc
index 96a6c13..281b49f 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3727,6 +3727,7 @@
'htmlform-selectorother-other',
'htmlform-no',
'htmlform-yes',
+   'htmlform-chosen-placeholder',
),
'sqlite' => array(
'sqlite-has-fts',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5306382841a74a850d92283252dab7d5cce6cc3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] New branch and .gitreview - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: New branch and .gitreview
..

New branch and .gitreview

Change-Id: I71e1f5f9156fecf0c6e72b99960b904aea93baa4
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/42/61542/1

diff --git a/.gitreview b/.gitreview
index 91f4155..5e9f18e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Translate.git
-defaultbranch=master
+defaultbranch=wmf/1.22wmf2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71e1f5f9156fecf0c6e72b99960b904aea93baa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Add refresh-translatable-pages.php script - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Add refresh-translatable-pages.php script
..

Add refresh-translatable-pages.php script

Change-Id: Iac3f1aabea90fad0a30eb6805e14d0a21ab12926
---
A scripts/refresh-translatable-pages.php
1 file changed, 51 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/43/61543/1

diff --git a/scripts/refresh-translatable-pages.php 
b/scripts/refresh-translatable-pages.php
new file mode 100644
index 000..97332ea
--- /dev/null
+++ b/scripts/refresh-translatable-pages.php
@@ -0,0 +1,51 @@
+mDescription = 'Ensure all translation pages are up to 
date';
+   }
+
+   public function execute() {
+   $groups = MessageGroups::singleton()->getGroups();
+
+   /** @var MessageGroup $group */
+   foreach ( $groups as $id => $group ) {
+   if ( !$group instanceof WikiPageMessageGroup ) {
+   continue;
+   }
+
+   // Get all translation subpages and refresh each one of 
them
+   $page = TranslatablePage::newFromTitle( 
$group->getTitle() );
+   $translationPages = $page->getTranslationPages();
+
+   foreach ( $translationPages as $subpage ) {
+   $job = TranslateRenderJob::newJob( $subpage );
+   $job->run();
+   }
+   }
+   }
+}
+
+$maintClass = 'RefreshTranslatablePages';
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3f1aabea90fad0a30eb6805e14d0a21ab12926
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] New branch and .gitreview - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: New branch and .gitreview
..


New branch and .gitreview

Change-Id: I71e1f5f9156fecf0c6e72b99960b904aea93baa4
---
M .gitreview
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitreview b/.gitreview
index 91f4155..5e9f18e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/Translate.git
-defaultbranch=master
+defaultbranch=wmf/1.22wmf2

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71e1f5f9156fecf0c6e72b99960b904aea93baa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add refresh-translatable-pages.php script - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add refresh-translatable-pages.php script
..


Add refresh-translatable-pages.php script

Change-Id: Iac3f1aabea90fad0a30eb6805e14d0a21ab12926
---
A scripts/refresh-translatable-pages.php
1 file changed, 51 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/refresh-translatable-pages.php 
b/scripts/refresh-translatable-pages.php
new file mode 100644
index 000..97332ea
--- /dev/null
+++ b/scripts/refresh-translatable-pages.php
@@ -0,0 +1,51 @@
+mDescription = 'Ensure all translation pages are up to 
date';
+   }
+
+   public function execute() {
+   $groups = MessageGroups::singleton()->getGroups();
+
+   /** @var MessageGroup $group */
+   foreach ( $groups as $id => $group ) {
+   if ( !$group instanceof WikiPageMessageGroup ) {
+   continue;
+   }
+
+   // Get all translation subpages and refresh each one of 
them
+   $page = TranslatablePage::newFromTitle( 
$group->getTitle() );
+   $translationPages = $page->getTranslationPages();
+
+   foreach ( $translationPages as $subpage ) {
+   $job = TranslateRenderJob::newJob( $subpage );
+   $job->run();
+   }
+   }
+   }
+}
+
+$maintClass = 'RefreshTranslatablePages';
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac3f1aabea90fad0a30eb6805e14d0a21ab12926
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Cherry-picked maintenance script for Translate - change (mediawiki/core)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Cherry-picked maintenance script for Translate
..

Cherry-picked maintenance script for Translate

Change-Id: I3a9be1417f1f2e104873bf2469cbd66a82d1b733
---
M extensions/Translate
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/44/61544/1

diff --git a/extensions/Translate b/extensions/Translate
index e5dcfc0..f03ecbc 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit e5dcfc026635a5ef5447e37245924b9d30f4fa77
+Subproject commit f03ecbc0f47e01654cdb89acb0871b2990189ae9

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a9be1417f1f2e104873bf2469cbd66a82d1b733
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Cherry-picked maintenance script for Translate - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Cherry-picked maintenance script for Translate
..


Cherry-picked maintenance script for Translate

Change-Id: I3a9be1417f1f2e104873bf2469cbd66a82d1b733
---
M extensions/Translate
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extensions/Translate b/extensions/Translate
index e5dcfc0..f03ecbc 16
--- a/extensions/Translate
+++ b/extensions/Translate
-Subproject commit e5dcfc026635a5ef5447e37245924b9d30f4fa77
+Subproject commit f03ecbc0f47e01654cdb89acb0871b2990189ae9

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a9be1417f1f2e104873bf2469cbd66a82d1b733
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.22wmf2
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] jobs for mw/ext/Nonlinear - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: jobs for mw/ext/Nonlinear
..

jobs for mw/ext/Nonlinear

Change-Id: I0fae459226db27edc644883643469bc834bb91cc
---
M mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config 
refs/changes/45/61545/1

diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index b74f935..d7c266e 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -269,6 +269,7 @@
  - Narayam
  - NavigationTiming
  - NewUserMessage
+ - Nonlinear
  - Nuke
  - OAI
  - OATHAuth

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fae459226db27edc644883643469bc834bb91cc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] jobs for mw/ext/Nonlinear - change (integration/jenkins-job-builder-config)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: jobs for mw/ext/Nonlinear
..


jobs for mw/ext/Nonlinear

Change-Id: I0fae459226db27edc644883643469bc834bb91cc
---
M mediawiki-extensions.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index b74f935..d7c266e 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -269,6 +269,7 @@
  - Narayam
  - NavigationTiming
  - NewUserMessage
+ - Nonlinear
  - Nuke
  - OAI
  - OATHAuth

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0fae459226db27edc644883643469bc834bb91cc
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Unit tests are available for Extension:Nonlinear - change (integration/zuul-config)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: Unit tests are available for Extension:Nonlinear
..


Unit tests are available for Extension:Nonlinear

Change-Id: I64a796dfe19ccc57497ea97ce7b55cfd7614df05
---
M layout.yaml
1 file changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/layout.yaml b/layout.yaml
index 07e686a..5d747aa 100644
--- a/layout.yaml
+++ b/layout.yaml
@@ -1786,6 +1786,22 @@
 - mwext-NewUserMessage-jslint
 - mwext-NewUserMessage-lint
 
+  - name: mediawiki/extensions/Nonlinear
+check:
+  - mwext-Nonlinear-merge:
+- mwext-Nonlinear-jslint
+- mwext-Nonlinear-lint
+test:
+  - mwext-Nonlinear-merge:
+- mwext-Nonlinear-jslint
+- mwext-Nonlinear-lint:
+  - mwext-Nonlinear-testextensions-master
+gate-and-submit:
+  - mwext-Nonlinear-merge:
+- mwext-Nonlinear-jslint
+- mwext-Nonlinear-lint:
+  - mwext-Nonlinear-testextensions-master
+
   - name: mediawiki/extensions/Nuke
 check-only:
   - mwext-Nuke-merge:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64a796dfe19ccc57497ea97ce7b55cfd7614df05
Gerrit-PatchSet: 3
Gerrit-Project: integration/zuul-config
Gerrit-Branch: master
Gerrit-Owner: Adamw 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] [TemplateData] Deployed on WMF cluster - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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


Change subject: [TemplateData] Deployed on WMF cluster
..

[TemplateData] Deployed on WMF cluster

Update some usages

Change-Id: I96e9974c1f06138f7d2cae4fb49dac8ff28bab48
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/46/61546/1

diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index 804ffad..f77b545 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -51,19 +51,19 @@
   - ext-geodata # Change-Id: I0c9522ab28502a7f8665caa23958222c28007159
   - ext-gettingstarted # Change-Id: d1aac2d3dc774299c3e61ef8e163b50dfd89d313 
for enwiki
   - ext-googlenewssitemap # r87149 for wikinews
-  - ext-guidedtour # 2013-01-31 for enwiki
+  - ext-guidedtour # 2013-01-31 for 15 projects
   - ext-insider # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
-  - ext-labeledsectiontransclusion # Wikisource
+  - ext-labeledsectiontransclusion
   - ext-landingcheck
   - ext-ldapauthentication # 2011-12-28: labsconsole.wikimedia.org
-  - ext-liquidthreads # 2009-11-11: MediaWiki.org and some *.labs.wikimedia.org
+  - ext-liquidthreads # 2009-11-11: MediaWiki.org and some other projects
   - ext-listings # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-mapsources # wikivoyage
   - ext-markashelpful # 2011-12-28: r107514 for enwiki
   - ext-moodbar # r93131
   - ext-mwembedsupport # Change-Id: Ifbb7c9b7344520f6d9fe1ccfa3f276ec153b9770
   - ext-mwsearch
-  - ext-narayam # 2011-03-16: ml-wikis
+  - ext-narayam # 2011-03-16: for a lot of projects with non-latin scripts
   - ext-navigationtiming # 2013-03-14: all wikis
   - ext-nuke
   - ext-oai
@@ -77,7 +77,7 @@
   - ext-relatedarticles # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 
for Wikivoyage
   - ext-relatedsites # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-rss # 2010-11-25: Wikimediafoundation.org
-  - ext-score # Change id: 1215e5924e93508108d4e7ee0da0347408aa for 
test2wiki
+  - ext-score # Change id: 1215e5924e93508108d4e7ee0da0347408aa
   - ext-scribunto # Change-Id: e4e8857a55b0a89707525ecdd9dff54a4cc02f6d
   - ext-searchextrans # Change-ID: f8cd2d6eb9c20db92e39b038cc8476f311daeda5
   - ext-shorturl # r108172
@@ -88,19 +88,20 @@
   - ext-subpagesortkey # a2b3abe7ebc6aac630e4e309cc17780b28ac4b04 for some 
wikibooks
   - ext-swiftcloudfiles # 110441
   - ext-syntaxhighlightgeshi
+  - ext-templatedata # 7a47cd31e71919c5494aa1dca94f26242764d0a3
   - ext-templatesandbox
   - ext-thanks # Iabaa10c5af3cbb870fad020a40aa28be01f4f297
   - ext-titlekey
   - ext-toctree # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-translate-0-all
-  - ext-translationnotifications # 2012-05-??: meta, mediawiki, wikimania, 
incubator
+  - ext-translationnotifications # 2012-05-??: meta, mediawiki, wikimania, 
incubator, and other
   - ext-trustedxff
   - ext-universallanguageselector # change-id: 
b78d96d69d820c13ed262d5558d8c6e0ba5a6b2a
   - ext-uploadblacklist
   - ext-userdailycontribs
   - ext-usermerge # change-id: dee0a5a3d55dbd9d2daa43c9ea0baa753ee49640 for 
Wikivoyage
   - ext-vipsscaler # 104390: test2.wikipedia.org
-  - ext-visualeditor # r106062 for sandbox on mediawiki.org
+  - ext-visualeditor # r106062
   - ext-wikilove # r90124
   - ext-wikihiero
   - ext-wikimediaincubator # r89556

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96e9974c1f06138f7d2cae4fb49dac8ff28bab48
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [TemplateData] Deployed on WMF cluster - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [TemplateData] Deployed on WMF cluster
..


[TemplateData] Deployed on WMF cluster

Update some usages

Change-Id: I96e9974c1f06138f7d2cae4fb49dac8ff28bab48
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index 804ffad..f77b545 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -51,19 +51,19 @@
   - ext-geodata # Change-Id: I0c9522ab28502a7f8665caa23958222c28007159
   - ext-gettingstarted # Change-Id: d1aac2d3dc774299c3e61ef8e163b50dfd89d313 
for enwiki
   - ext-googlenewssitemap # r87149 for wikinews
-  - ext-guidedtour # 2013-01-31 for enwiki
+  - ext-guidedtour # 2013-01-31 for 15 projects
   - ext-insider # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
-  - ext-labeledsectiontransclusion # Wikisource
+  - ext-labeledsectiontransclusion
   - ext-landingcheck
   - ext-ldapauthentication # 2011-12-28: labsconsole.wikimedia.org
-  - ext-liquidthreads # 2009-11-11: MediaWiki.org and some *.labs.wikimedia.org
+  - ext-liquidthreads # 2009-11-11: MediaWiki.org and some other projects
   - ext-listings # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-mapsources # wikivoyage
   - ext-markashelpful # 2011-12-28: r107514 for enwiki
   - ext-moodbar # r93131
   - ext-mwembedsupport # Change-Id: Ifbb7c9b7344520f6d9fe1ccfa3f276ec153b9770
   - ext-mwsearch
-  - ext-narayam # 2011-03-16: ml-wikis
+  - ext-narayam # 2011-03-16: for a lot of projects with non-latin scripts
   - ext-navigationtiming # 2013-03-14: all wikis
   - ext-nuke
   - ext-oai
@@ -77,7 +77,7 @@
   - ext-relatedarticles # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 
for Wikivoyage
   - ext-relatedsites # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-rss # 2010-11-25: Wikimediafoundation.org
-  - ext-score # Change id: 1215e5924e93508108d4e7ee0da0347408aa for 
test2wiki
+  - ext-score # Change id: 1215e5924e93508108d4e7ee0da0347408aa
   - ext-scribunto # Change-Id: e4e8857a55b0a89707525ecdd9dff54a4cc02f6d
   - ext-searchextrans # Change-ID: f8cd2d6eb9c20db92e39b038cc8476f311daeda5
   - ext-shorturl # r108172
@@ -88,19 +88,20 @@
   - ext-subpagesortkey # a2b3abe7ebc6aac630e4e309cc17780b28ac4b04 for some 
wikibooks
   - ext-swiftcloudfiles # 110441
   - ext-syntaxhighlightgeshi
+  - ext-templatedata # 7a47cd31e71919c5494aa1dca94f26242764d0a3
   - ext-templatesandbox
   - ext-thanks # Iabaa10c5af3cbb870fad020a40aa28be01f4f297
   - ext-titlekey
   - ext-toctree # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for 
Wikivoyage
   - ext-translate-0-all
-  - ext-translationnotifications # 2012-05-??: meta, mediawiki, wikimania, 
incubator
+  - ext-translationnotifications # 2012-05-??: meta, mediawiki, wikimania, 
incubator, and other
   - ext-trustedxff
   - ext-universallanguageselector # change-id: 
b78d96d69d820c13ed262d5558d8c6e0ba5a6b2a
   - ext-uploadblacklist
   - ext-userdailycontribs
   - ext-usermerge # change-id: dee0a5a3d55dbd9d2daa43c9ea0baa753ee49640 for 
Wikivoyage
   - ext-vipsscaler # 104390: test2.wikipedia.org
-  - ext-visualeditor # r106062 for sandbox on mediawiki.org
+  - ext-visualeditor # r106062
   - ext-wikilove # r90124
   - ext-wikihiero
   - ext-wikimediaincubator # r89556

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96e9974c1f06138f7d2cae4fb49dac8ff28bab48
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] Remove spurious 'h7' in commonPrint.css - change (mediawiki/core)

[Matmarex (Code Review)]

Matmarex has uploaded a new change for review.

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


Change subject: Remove spurious 'h7' in commonPrint.css
..

Remove spurious 'h7' in commonPrint.css

There is no such element, silly.

Change-Id: I0a58278c1d2ff97463eddc15c701193cfd25757e
---
M skins/common/commonPrint.css
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/47/61547/1

diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 9b6d6ef..9ea89d9 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -353,7 +353,7 @@
 .wikitable, .thumb, img {
page-break-inside: avoid;
 }
-h2, h3, h4, h5, h6, h7 {
+h2, h3, h4, h5, h6 {
page-break-after: avoid;
 }
 p {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a58278c1d2ff97463eddc15c701193cfd25757e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex 

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

[MediaWiki-commits] [Gerrit] Ensure headings are not smaller than body text - change (mediawiki/core)

[Matmarex (Code Review)]

Matmarex has uploaded a new change for review.

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


Change subject: Ensure headings are not smaller than body text
..

Ensure headings are not smaller than body text

A heading that's 80% the size of regular text? That's just weird.

Scaled the sizes slightly to give h6 100% of body text size.

Change-Id: I45bf6e8c8ec01cb5fdc8392b4944e970e130ce38
---
M skins/common/commonElements.css
M skins/common/oldshared.css
2 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/48/61548/1

diff --git a/skins/common/commonElements.css b/skins/common/commonElements.css
index e564563..f609716 100644
--- a/skins/common/commonElements.css
+++ b/skins/common/commonElements.css
@@ -103,10 +103,10 @@
font-size: 116%;
 }
 h5 {
-   font-size: 100%;
+   font-size: 105%;
 }
 h6 {
-   font-size: 80%;
+   font-size: 100%;
 }
 
 /* Some space under the headers in the content area */
diff --git a/skins/common/oldshared.css b/skins/common/oldshared.css
index 25a067e..7028a24 100644
--- a/skins/common/oldshared.css
+++ b/skins/common/oldshared.css
@@ -11,8 +11,9 @@
 h1 { font-size: 2em; }
 h2 { font-size: 1.5em; }
 h3 { font-size: 1.17em; }
-h5 { font-size: .83em; }
-h6 { font-size: .75em; }
+h4 { font-size: 1.11em; }
+h5 { font-size: 1.05em; }
+h6 { font-size: 1em; }
 h1, h2, h3, h4, h5, h6 {
font-weight: bolder;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45bf6e8c8ec01cb5fdc8392b4944e970e130ce38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex 

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

[MediaWiki-commits] [Gerrit] [AccountAudit] Deployed on WMF cluster - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has uploaded a new change for review.

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


Change subject: [AccountAudit] Deployed on WMF cluster
..

[AccountAudit] Deployed on WMF cluster

Change-Id: I1f17659865a61fad2c1db9bf46fcbcf445fd9665
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/49/61549/1

diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index f77b545..dc9a737 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -10,6 +10,7 @@
 GROUPS:
   - ext-0-wikimedia-main # See WikimediaMainAgg.yaml. Do not duplicate group 
names!
   - ext-abusefilter
+  - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b
   - ext-antibot # anti spam and such (usually all wikis)
   - ext-apisandbox # r104698, enabled on all wikis
   - ext-articlefeedback

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f17659865a61fad2c1db9bf46fcbcf445fd9665
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 

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

[MediaWiki-commits] [Gerrit] [AccountAudit] Deployed on WMF cluster - change (translatewiki)

[Raimond Spekking (Code Review)]

Raimond Spekking has submitted this change and it was merged.

Change subject: [AccountAudit] Deployed on WMF cluster
..


[AccountAudit] Deployed on WMF cluster

Change-Id: I1f17659865a61fad2c1db9bf46fcbcf445fd9665
---
M groups/MediaWiki/WikimediaAgg.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Raimond Spekking: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/groups/MediaWiki/WikimediaAgg.yaml 
b/groups/MediaWiki/WikimediaAgg.yaml
index f77b545..dc9a737 100644
--- a/groups/MediaWiki/WikimediaAgg.yaml
+++ b/groups/MediaWiki/WikimediaAgg.yaml
@@ -10,6 +10,7 @@
 GROUPS:
   - ext-0-wikimedia-main # See WikimediaMainAgg.yaml. Do not duplicate group 
names!
   - ext-abusefilter
+  - ext-accountaudit # cedda98d6dd46cccfb88bdb32597feb0d8a6ca6b
   - ext-antibot # anti spam and such (usually all wikis)
   - ext-apisandbox # r104698, enabled on all wikis
   - ext-articlefeedback

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f17659865a61fad2c1db9bf46fcbcf445fd9665
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking 
Gerrit-Reviewer: Raimond Spekking 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Restore compatibility with MW 1.20 - change (mediawiki...Translate)

[Nikerabbit (Code Review)]

Nikerabbit has uploaded a new change for review.

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


Change subject: Restore compatibility with MW 1.20
..

Restore compatibility with MW 1.20

Change-Id: I2b67cc915db0dbe1a8fe08a4d62bb36608df954e
---
M api/ApiTranslateSandbox.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate 
refs/changes/50/61550/1

diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 7011e97..a9c0c54 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -188,4 +188,8 @@
return true;
}
 
+   // BC for MW 1.20
+   public function getVersion() {
+   return __CLASS__ . ': ' . TRANSLATE_VERSION;
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b67cc915db0dbe1a8fe08a4d62bb36608df954e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 

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

[MediaWiki-commits] [Gerrit] Restore compatibility with MW 1.20 - change (mediawiki...Translate)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Restore compatibility with MW 1.20
..


Restore compatibility with MW 1.20

Change-Id: I2b67cc915db0dbe1a8fe08a4d62bb36608df954e
---
M api/ApiTranslateSandbox.php
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Amire80: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 7011e97..a9c0c54 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -188,4 +188,8 @@
return true;
}
 
+   // BC for MW 1.20
+   public function getVersion() {
+   return __CLASS__ . ': ' . TRANSLATE_VERSION;
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b67cc915db0dbe1a8fe08a4d62bb36608df954e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding and applying a new icon for the snak type selector - change (mediawiki...Wikibase)

[Henning Snater (Code Review)]

Henning Snater has uploaded a new change for review.

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


Change subject: Adding and applying a new icon for the snak type selector
..

Adding and applying a new icon for the snak type selector

Replaces the inappropriate gear icon triggering the snak type selection
with a custom icon.

Change-Id: Ide03e6b2e2c355c7550417e961a2adbec22c5a7d
---
M lib/resources/Resources.php
M 
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js
A 
lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/images/ui-icon_snaktypeselector_72a7cf.png
A 
lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css
4 files changed, 11 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/51/61551/1

diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 3a3986f..9091b9d 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -537,6 +537,9 @@

'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js',

'jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js',
),
+   'styles' => array(
+   
'jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css',
+   ),
'dependencies' => array(
'jquery.eachchange',
'jquery.nativeEventHandler',
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js
 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js
index e5dbbc5..68aadca 100644
--- 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.SnakTypeSelector.js
@@ -62,7 +62,8 @@
 
// TODO: add a title message
this.element
-   .addClass( 'ui-icon ui-icon-gear ' + 
this.widgetBaseClass )
+   // TODO: Add other ui states like "hover" implementing 
and using .ui-state- css classes
+   .addClass( 'ui-icon ui-icon-snaktypeselector ' + 
this.widgetBaseClass )
.on( 'click.wb-snaktypeselector', function( event ) {
// don't show menu if selector is disabled!
// otherwise, simply toggle menu's visibility
@@ -112,7 +113,7 @@
this._menu.destroy();
$menu.remove();
 
-   this.element.removeClass( 'ui-icon ui-icon-gear ' + 
this.widgetBaseClass );
+   this.element.removeClass( 'ui-icon 
ui-icon-snaktypeselector ' + this.widgetBaseClass );
 
// remove event listeners responsible for closing this 
instance's menu:
this._unbindGlobalListenersFn();
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/images/ui-icon_snaktypeselector_72a7cf.png
 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/images/ui-icon_snaktypeselector_72a7cf.png
new file mode 100644
index 000..c3e46f8
--- /dev/null
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/images/ui-icon_snaktypeselector_72a7cf.png
Binary files differ
diff --git 
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css
 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css
new file mode 100644
index 000..efeaebe
--- /dev/null
+++ 
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/themes/default/snakview.SnakTypeSelector.css
@@ -0,0 +1,5 @@
+/* TODO: Add icons actually coloured like default theme, add vector theme 
icons */
+
+.ui-icon-snaktypeselector {
+   background-image: url(images/ui-icon_snaktypeselector_72a7cf.png);
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide03e6b2e2c355c7550417e961a2adbec22c5a7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater 

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

[MediaWiki-commits] [Gerrit] remove executable bits from files - change (mediawiki...erudite)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: remove executable bits from files
..


remove executable bits from files

Change-Id: Id23a9d457ef62df0643e0c462800a9a2333b6b1f
---
M Erudite.i18n.php
M Erudite.skin.php
M assets/CHANGES
M assets/erudite.css
M assets/ie6.css
M assets/ie7.css
M assets/ie8.css
M assets/images/body-bg.png
M assets/images/fleuron-dark.png
M assets/images/fleuron.png
M assets/images/stripes-dark.png
M assets/images/stripes.png
M assets/license-addendum.txt
M assets/license.txt
M assets/print.css
M assets/wiki-style.css
M erudite.php
17 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Erudite.i18n.php b/Erudite.i18n.php
old mode 100755
new mode 100644
diff --git a/Erudite.skin.php b/Erudite.skin.php
old mode 100755
new mode 100644
diff --git a/assets/CHANGES b/assets/CHANGES
old mode 100755
new mode 100644
diff --git a/assets/erudite.css b/assets/erudite.css
old mode 100755
new mode 100644
diff --git a/assets/ie6.css b/assets/ie6.css
old mode 100755
new mode 100644
diff --git a/assets/ie7.css b/assets/ie7.css
old mode 100755
new mode 100644
diff --git a/assets/ie8.css b/assets/ie8.css
old mode 100755
new mode 100644
diff --git a/assets/images/body-bg.png b/assets/images/body-bg.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/assets/images/fleuron-dark.png b/assets/images/fleuron-dark.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/assets/images/fleuron.png b/assets/images/fleuron.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/assets/images/stripes-dark.png b/assets/images/stripes-dark.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/assets/images/stripes.png b/assets/images/stripes.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/assets/license-addendum.txt b/assets/license-addendum.txt
old mode 100755
new mode 100644
diff --git a/assets/license.txt b/assets/license.txt
old mode 100755
new mode 100644
diff --git a/assets/print.css b/assets/print.css
old mode 100755
new mode 100644
diff --git a/assets/wiki-style.css b/assets/wiki-style.css
old mode 100755
new mode 100644
diff --git a/erudite.php b/erudite.php
old mode 100755
new mode 100644

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id23a9d457ef62df0643e0c462800a9a2333b6b1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/erudite
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Add backward compatibility for fetchLanguageNames - change (mediawiki...UniversalLanguageSelector)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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


Change subject: Add backward compatibility for fetchLanguageNames
..

Add backward compatibility for fetchLanguageNames

Bug: 46737
Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
---
M ResourceLoaderULSModule.php
M UniversalLanguageSelector.hooks.php
M data/LanguageNameIndexer.php
3 files changed, 24 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/52/61552/1

diff --git a/ResourceLoaderULSModule.php b/ResourceLoaderULSModule.php
index dda8492..d5d29e0 100644
--- a/ResourceLoaderULSModule.php
+++ b/ResourceLoaderULSModule.php
@@ -33,9 +33,14 @@
 */
protected function getData() {
$vars = array();
-   $vars['wgULSLanguages'] = Language::fetchLanguageNames(
-   $this->language->getCode(), 'mwfile'
-   );
+   if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) ) 
{
+   $vars['wgULSLanguages'] = Language::fetchLanguageNames(
+   $this->language->getCode(), 'mwfile'
+   );
+   } else {
+   $vars['wgULSLanguages'] = Language::getLanguageNames( 
false );
+   }
+
return $vars;
}
 
diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 4d26264..0bb1965 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -105,7 +105,11 @@
 
protected static function isSupportedLanguage( $language ) {
wfProfileIn( __METHOD__ );
-   $supported = Language::fetchLanguageNames( null, 'mwfile' );
+   if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) ) 
{
+   $supported = Language::fetchLanguageNames( null, 
'mwfile' ); // since 1.20
+   } else {
+   $supported = Language::getLanguageNames( false );
+   }
wfProfileOut( __METHOD__ );
 
return isset( $supported[$language] );
@@ -117,7 +121,11 @@
 */
protected static function getDefaultLanguage( array $preferred ) {
wfProfileIn( __METHOD__ );
-   $supported = Language::fetchLanguageNames( null, 'mwfile' );
+   if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) ) 
{
+   $supported = Language::fetchLanguageNames( null, 
'mwfile' ); // since 1.20
+   } else {
+   $supported = Language::getLanguageNames( false );
+   }
// look for a language that is acceptable to the client
// and known to the wiki.
foreach ( $preferred as $code => $weight ) {
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index b8df9c5..c86532f 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -33,7 +33,12 @@
}
 
public function execute() {
-   $languages = Language::fetchLanguageNames( null, 'all' );
+   if ( is_callable( array( 'Language', 'fetchLanguageNames' ) ) ) 
{
+   $languages = Language::fetchLanguageNames( null, 'all' 
); // since 1.20
+   } else {
+   $supported = Language::getLanguageNames( false );
+   }
+
$all = array();
$buckets = array();
foreach ( $languages as $code => $name ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] Bug 47857: Deprecate #mw-mf-searchForm, allow search term cl... - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: Bug 47857: Deprecate #mw-mf-searchForm, allow search term 
clearing
..

Bug 47857: Deprecate #mw-mf-searchForm, allow search term clearing

Previously when typing a search term a cross appeared that allowed you
to reset the value. This code seems to have been lying dormant

Take opportunity to rename clearlink to more meaningful clear
Bug: 47857

Change-Id: Ib3db61be25452c4b3eedb5e54756cfe0d144882a
---
M javascripts/modules/search-2.js
M less/common/ui.less
M less/modules/mf-search.less
M less/modules/mf-watchstar.less
M stylesheets/common/ui.css
M stylesheets/devices/wii.css
M stylesheets/modules/mf-search.css
M stylesheets/modules/mf-watchstar.css
M templates/overlays/search/search.html
9 files changed, 11 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/53/61553/1

diff --git a/javascripts/modules/search-2.js b/javascripts/modules/search-2.js
index 26d36e5..2ece4d0 100644
--- a/javascripts/modules/search-2.js
+++ b/javascripts/modules/search-2.js
@@ -36,7 +36,7 @@
defaults: {
explanation: mw.msg( 'mobile-frontend-search-help' ),
noresults: mw.msg( 'mobile-frontend-search-noresults' ),
-   action: $( '#mw-mf-searchForm' ).attr( 'action' )
+   action: $( '#mw-mf-page-center .header form.search-box' ).attr( 
'action' )
},
initialize: function() {
overlayInitialize.apply( this, arguments );
@@ -52,6 +52,10 @@
}
} );
this.results = [];
+   this.$( '.clear' ).on( 'click', function() {
+   console.log( 'hello' );
+   self.$( 'input' ).val( '' ).focus();
+   } );
},
/**
 * A wrapper for $.ajax() to be used when calling server APIs.
diff --git a/less/common/ui.less b/less/common/ui.less
index 1f66788..ca110c3 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -88,6 +88,7 @@
 }
 
 .search-box {
+   position: relative;
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
 
#mw-mf-sq {
diff --git a/less/modules/mf-search.less b/less/modules/mf-search.less
index 498989a..05df06c 100644
--- a/less/modules/mf-search.less
+++ b/less/modules/mf-search.less
@@ -17,16 +17,15 @@
}
 }
 
-#mw-mf-searchForm {
+form {
 
-   .clearlink {
+   .clear {
top: @searchMarginTop;
right: 10px;
width: 24px;
height: @searchBoxHeight;
background: url(../common/images/close-button-beta.png) 
no-repeat scroll 0 0 transparent;
margin: 0;
-   display: none;
background-position: right center;
.background-size( auto, 12px );
cursor: pointer;
diff --git a/less/modules/mf-watchstar.less b/less/modules/mf-watchstar.less
index be0604e..64b7b35 100644
--- a/less/modules/mf-watchstar.less
+++ b/less/modules/mf-watchstar.less
@@ -16,10 +16,6 @@
}
 }
 
-.full-screen-search #mw-mf-searchForm a.watch-this-article {
-   display: none;
-}
-
 li a.watch-this-article {
right: 12px;
top: 0;
diff --git a/stylesheets/common/ui.css b/stylesheets/common/ui.css
index 668a9f3..227729b 100644
--- a/stylesheets/common/ui.css
+++ b/stylesheets/common/ui.css
@@ -312,6 +312,7 @@
   font-size: 9px;
 }
 .search-box {
+  position: relative;
   -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
 }
 .search-box #mw-mf-sq {
diff --git a/stylesheets/devices/wii.css b/stylesheets/devices/wii.css
index 2a25dba..8897210 100644
--- a/stylesheets/devices/wii.css
+++ b/stylesheets/devices/wii.css
@@ -1,7 +1,3 @@
-#mw-mf-searchForm {
-   margin: 0;
-}
-
 .thumb {
margin: 0.5em 0;
 }
diff --git a/stylesheets/modules/mf-search.css 
b/stylesheets/modules/mf-search.css
index f1134f7..372fd95 100644
--- a/stylesheets/modules/mf-search.css
+++ b/stylesheets/modules/mf-search.css
@@ -12,14 +12,13 @@
 .full-screen-search .search-box {
   padding-right: 8px;
 }
-#mw-mf-searchForm .clearlink {
+form .clear {
   top: 9px;
   right: 10px;
   width: 24px;
   height: 30px;
   background: url(../common/images/close-button-beta.png) no-repeat scroll 0 0 
transparent;
   margin: 0;
-  display: none;
   background-position: right center;
   /* use -webkit prefix for older android browsers eg. nexus 1 */
 
diff --git a/stylesheets/modules/mf-watchstar.css 
b/stylesheets/modules/mf-watchstar.css
index 60057b3..8e40c50 100644
--- a/stylesheets/modules/mf-watchstar.css
+++ b/stylesheets/modules/mf-watchstar.css
@@ -15,9 +15,6 @@
   -webkit-transform: rotate(72deg);
   transform: rotate(72deg);
 }
-.full-screen-search #mw-mf-searchForm a.watch-this-article {
-  display: none;
-}
 li 

[MediaWiki-commits] [Gerrit] Avoid homepage to become too wide on big screens - change (translatewiki)

[Pginer (Code Review)]

Pginer has uploaded a new change for review.

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


Change subject: Avoid homepage to become too wide on big screens
..

Avoid homepage to become too wide on big screens

A max-width value is set to avoid the homepage to become too wide when
seen in very wide screens.

Change-Id: If3bc83cdcd5bee0a29ac887d7ea64b64cd24833e
---
M MainPage/resources/css/ext.translate.mainpage.css
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/54/61554/1

diff --git a/MainPage/resources/css/ext.translate.mainpage.css 
b/MainPage/resources/css/ext.translate.mainpage.css
index d8b4c5b..ae12c30 100644
--- a/MainPage/resources/css/ext.translate.mainpage.css
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -5,6 +5,9 @@
 .twn-mainpage {
background-color: #fff;
color: #252525;
+   max-width: 1280px;
+   margin-left: auto;
+   margin-right: auto;
 }
 
 .twn-mainpage-header {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3bc83cdcd5bee0a29ac887d7ea64b64cd24833e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Pginer 

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

[MediaWiki-commits] [Gerrit] Updated README, how to use secret.yml and MEDIAWIKI_URL - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: Updated README, how to use secret.yml and MEDIAWIKI_URL
..

Updated README, how to use secret.yml and MEDIAWIKI_URL

Bug: 47865
Change-Id: I0db34da0319054590dc71da97e25eff37e72ba93
---
M README.md
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/55/61555/1

diff --git a/README.md b/README.md
index 0650b25..7e72b40 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,24 @@
 
 To run the Selenium tests you will have to install Ruby (look at 
`.ruby-version` file for the exact version), the latest versions of RubyGems 
and Firefox (the default browser in which the tests run). The easiest way to 
install Ruby on Linux/Unix is [RVM](https://rvm.io/) and on Windows 
[RubyInstaller](http://rubyinstaller.org/).
 
-Update RubyGems and install the required RubyGems:
+Clone the repository, `cd` into it, update RubyGems and install the required 
RubyGems:
 
 cd browsertests
 gem update --system
 gem install bundler
 bundle install
 
-You will need a file with credentials located at `/private/wmf/secret.yml`. 
For local testing, create a user named `Selenium_user` on your local wiki and 
record the password in this file as
+`secret.yml` file at `/private/wmf/` or `config/` is required for tests tagged 
`@login`. For local testing, create a user named `Selenium_user` on your local 
wiki and record the password in this file as
 
 mediawiki_password: password here
 
 Run the tests with `bundle exec rake`, this should start Firefox.
+
+By default the tests run at en.wikipedia.beta.wmflabs.org. If you want to run 
the tests elsewhere, you have to set `MEDIAWIKI_URL` environment variable. For 
example:
+
+export MEDIAWIKI_URL=http://commons.wikimedia.beta.wmflabs.org/wiki/ # 
Linux/Unix
+set MEDIAWIKI_URL=http://commons.wikimedia.beta.wmflabs.org/wiki/ # Windows
+
 The test run creates an HTML report in `reports/` and an XML report (for 
Jenkins) in `reports/junit`.
 
 To run a single test enter `bundle exec cucumber 
features/FEATURE_NAME.feature`.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db34da0319054590dc71da97e25eff37e72ba93
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Mark feature files that are running at en.wikipedia.org - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: Mark feature files that are running at en.wikipedia.org
..

Mark feature files that are running at en.wikipedia.org

Bug: 47549
Change-Id: I61318fd44fd3cfa4535f0c16651db06da6bcae62
---
M docs/jobs.md
R features/create_account_readonly.feature
R features/math_readonly.feature
R features/page_triage_readonly.feature
R features/pdf_readonly.feature
R features/preferences_appearance_readonly.feature
6 files changed, 10 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/56/61556/1

diff --git a/docs/jobs.md b/docs/jobs.md
index da0505c..7641104 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -63,8 +63,8 @@
 
 
 
-# browsertests-en.wikipedia.org-linux-firefox
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci'
+# browsertests-en.wikipedia.org
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci'
 - MediaWiki URL: en.wikipedia.org
 
 
@@ -76,15 +76,15 @@
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie6-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie6-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie7-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie7-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie8-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie8-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account.feature 
b/features/create_account_readonly.feature
similarity index 76%
rename from features/create_account.feature
rename to features/create_account_readonly.feature
index 051d869..e35c72f 100644
--- a/features/create_account.feature
+++ b/features/create_account_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/math.feature b/features/math_readonly.feature
similarity index 75%
rename from features/math.feature
rename to features/math_readonly.feature
index 6a31fba..55da755 100644
--- a/features/math.feature
+++ b/features/math_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: Math
 
   Scenario: Display simple math
diff --git a/features/page_triage.feature 
b/features/page_triage_readonly.feature
similarity index 85%
rename from features/page_triage.feature
rename to features/page_triage_readonly.feature
index e7873c1..c690b6e 100644
--- a/features/page_triage.feature
+++ b/features/page_triage_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: PageTriage
 
   Scenario: Check that NewPagesFeed has correct controls for anonymous user
diff --git a/features/pdf.feature b/features/pdf_readonly.feature
similarity index 72%
rename from features/pdf.feature
rename to features/pdf_readonly.feature
index 3422c2f..2f47f46 100644
--- a/features/pdf.feature
+++ b/features/pdf_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: PDF
 
   Scenario: Check for Download as PDF link
diff --git a/features/preferences_appearance.feature 
b/features/preferences_appearance_readonly.feature
similarity index 84%
rename from features/preferences_appearance.feature
rename to features/preferences_appearance_readonly.feature
index 419622c..1305b1e 100644
--- a/features/preferences_appearance.feature
+

[MediaWiki-commits] [Gerrit] All Universal Language Selector feature files now start with... - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: All Universal Language Selector feature files now start with uls
..

All Universal Language Selector feature files now start with uls

Bug: 47830
Change-Id: I16ad642231ca8f323d69508d7e416e8b030ce44b
---
M docs/jobs.md
R features/uls.feature
R features/uls_accept_language.feature
3 files changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/57/61557/1

diff --git a/docs/jobs.md b/docs/jobs.md
index 7641104..54d752f 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -92,9 +92,8 @@
 
 
 # browsertests-sandbox.translatewiki.net
-
+- bundle exec: parallel_cucumber features/create_account.feature 
features/uls*feature -n 4 --test-options '--profile ci'
 - MediaWiki URL: sandbox.translatewiki.net
-- bundle exec: parallel_cucumber features/create_account.feature 
features/uls_ime.feature features/universal_language_selector.feature -n 3 
--test-options '--profile ci'
 
 
 ## browsertests-sandbox.translatewiki.net-linux-chrome
@@ -102,7 +101,6 @@
 
 ## browsertests-sandbox.translatewiki.net-linux-firefox
 - Browser Label: firefox
-- bundle exec: parallel_cucumber features/accept_language.feature 
features/create_account.feature features/uls_ime.feature 
features/universal_language_selector.feature -n 4 --test-options '--profile ci'
 
 ## browsertests-sandbox.translatewiki.net-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
diff --git a/features/universal_language_selector.feature b/features/uls.feature
similarity index 72%
rename from features/universal_language_selector.feature
rename to features/uls.feature
index 8552780..2d3bf5f 100644
--- a/features/universal_language_selector.feature
+++ b/features/uls.feature
@@ -1,4 +1,4 @@
-Feature: ULS User language selector
+Feature: Universal Language Selector User language selector
 
   Scenario: Open Language selector
 Given I visit a random page
diff --git a/features/accept_language.feature 
b/features/uls_accept_language.feature
similarity index 100%
rename from features/accept_language.feature
rename to features/uls_accept_language.feature

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16ad642231ca8f323d69508d7e416e8b030ce44b
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] system_role for role::applicationserver::appserver::beta - change (operations/puppet)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: system_role for role::applicationserver::appserver::beta
..

system_role for role::applicationserver::appserver::beta

Change-Id: Ia9744f7c8597a9a5227029c3ee9008ba348041fe
---
M manifests/role/applicationserver.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/61558/1

diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 2fb87fc..3109cc6 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -118,6 +118,8 @@
# apply both roles cause puppet will complains about a duplicate class
# definition for role::applicationserver::common
class appserver::beta{
+   system_role { "role::applicationserver::appserver::beta": 
description => "Beta Apache Application server" }
+
class { "role::applicationserver::common": group => 
"beta_appserver" }
 
include role::applicationserver::webserver

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9744f7c8597a9a5227029c3ee9008ba348041fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] (bug 47359) Wiki links in notes are not clickable on the det... - change (mediawiki...ArticleFeedbackv5)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 47359) Wiki links in notes are not clickable on the detail 
page
..

(bug 47359) Wiki links in notes are not clickable on the detail page

Bug: 47359
Change-Id: Ie3ebbd31b42528b3645ab4b3e74ee77f0e84536d
---
M ArticleFeedbackv5.render.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/59/61559/1

diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 55e7a12..d3dcd6e 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -1207,10 +1207,10 @@
$notes = '';
if ( $last->log_comment ) {
$notes .=
-   Html::element(
+   Html::rawElement(
'p',
array( 'class' => 
'articleFeedbackv5-feedback-permalink-activity-status' ),
-   $last->log_comment
+   Linker::formatComment( 
$last->log_comment )
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3ebbd31b42528b3645ab4b3e74ee77f0e84536d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Make loading VE work on Opera again - change (mediawiki...VisualEditor)

[Matmarex (Code Review)]

Matmarex has uploaded a new change for review.

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


Change subject: Make loading VE work on Opera again
..

Make loading VE work on Opera again

Once more, with feeling. The first reverted attempt was I90ea547c.

Detailed comments inside.

Change-Id: I1ab60665987614e5757e2b108d614b680321d8eb
---
M modules/ve/ve.js
1 file changed, 40 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/60/61560/1

diff --git a/modules/ve/ve.js b/modules/ve/ve.js
index d0fe741..2883510 100644
--- a/modules/ve/ve.js
+++ b/modules/ve/ve.js
@@ -976,10 +976,34 @@
 * @returns {HTMLDocument} Document constructed from the HTML string
 */
ve.createDocumentFromHTML = function ( html ) {
-   // According to the spec we should be using 
DOMParser.prototype.parseFromString or
-   // document.implementation.createHTMLDocument, but the former 
only works in Firefox
-   // and the latter doesn't work in IE9 and below.
-   // So we're using the good old iframe trick.
+   // Here's how this function should look:
+   //
+   // var newDocument = 
document.implementation.createHTMLDocument( '' );
+   // newDocument.open();
+   // newDocument.write( html );
+   // newDocument.close();
+   // return newDocument;
+   //
+   // (Or possibly something involving 
DOMParser.prototype.parseFromString, but that's Firefox-only
+   // for now.)
+   //
+   // Sadly, it's impossible:
+   // * On IE 9, calling open()/write() on such a document throws 
an "Unspecified error" (sic).
+   // * On Firefox 20, calling open()/write() doesn't actually do 
anything, including writing.
+   //   This is reported as Firefox bug 867102.
+   // * On Opera 12, calling open()/write() behaves as if called 
on window.document, replacing the
+   //   entire contents of the page with new HTML. This is 
reported as Opera bug DSK-384486.
+   //
+   // Funnily, in all of those browsers it's apparently perfectly 
legal and possible to access the
+   // newly created document's DOM itself, including modifying 
documentElement's innerHTML, which
+   // would achieve our goal. But that requires some nasty magic 
to strip off the  tag
+   // itself, so we're not doing that. (We can't use .outerHTML, 
either, as the spec disallows
+   // assigning to it for the root element.)
+   //
+   // There is one more way - create an , append it to 
current document, and access its
+   // contentDocument. The only browser having issues with that is 
Opera (sometimes the accessible
+   // value is not actually a Document, but something which 
behaves just like an empty regular
+   // object...), so we're detecting that and using the innerHTML 
hack described above.
 
// Create an invisible iframe
var newDocument, $iframe = $( ''),
@@ -994,6 +1018,18 @@
// Detach the iframe
// FIXME detaching breaks access to newDocument in IE
iframe.parentNode.removeChild( iframe );
+
+   if ( !newDocument.body ) {
+   // Surprise! The document is not a document!
+   // Fun fact: this never happens on Opera when debugging 
with Dragonfly.
+   newDocument = 
document.implementation.createHTMLDocument( '' );
+   // Carefully unwrap the HTML out of the root node (and 
doctype, if any).
+   //  might have some arguments here, but they're 
apparently not important.
+   html = 
html.replace(/^\s*(?:]*>)?\s*]*>/i, '' );
+   html = html.replace(/<\/html>\s*$/i, '' );
+   newDocument.documentElement.innerHTML = html;
+   }
+
return newDocument;
};
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ab60665987614e5757e2b108d614b680321d8eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Matmarex 

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

[MediaWiki-commits] [Gerrit] (bug 38017) Rename "Details" to "Permalink" - change (mediawiki...ArticleFeedbackv5)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 38017) Rename "Details" to "Permalink"
..

(bug 38017) Rename "Details" to "Permalink"

Bug: 38017
Change-Id: I29ebb1bc699023ee0912734a4db77808c4eb65c8
---
M ArticleFeedbackv5.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/61/61561/1

diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index e63e822..f6449f0 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -145,7 +145,7 @@
'articlefeedbackv5-special-central-watchlist-link' => '[[$1|Feedback 
from my watched pages]]',
'articlefeedbackv5-special-watchlist-central-link' => '[[$1|View 
feedback from all pages]]',
'articlefeedbackv5-updates-since' => '{{PLURAL:$1|1 edit|$1 edits}} 
since post',
-   'articleFeedbackv5-details-link' => 'Details',
+   'articleFeedbackv5-details-link' => 'Permalink',
'articlefeedbackv5-revision-link' => '(see old page)',
'articlefeedbackv5-special-more' => 'Show more posts',
'articlefeedbackv5-special-refresh' => 'Refresh list',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29ebb1bc699023ee0912734a4db77808c4eb65c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Update form upstream - change (mediawiki...UniversalLanguageSelector)

[Amire80 (Code Review)]

Amire80 has uploaded a new change for review.

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


Change subject: Update form upstream
..

Update form upstream

Unbreaks escaping.

Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
---
M lib/jquery.webfonts.js
1 file changed, 12 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/62/61562/1

diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 88c817e..4cc01e0 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -253,15 +253,15 @@
base = this.repository.base;
version = fontconfig.version;
versionSuffix = '?version=' + version + '&20120101';
-   styleString = '@font-face { font-family: \'' + 
fontFamily + '\';\\n';
+   styleString = '@font-face { font-family: \'' + 
fontFamily + '\';\n';
userAgent = window.navigator.userAgent;
fontStyle = fontconfig.fontstyle || 'normal';
fontFormats = [];
 
if ( fontconfig.eot ) {
-   styleString += '\\tsrc: url(\'' + base + 
fontconfig.eot + versionSuffix + '\');\\n';
+   styleString += '\tsrc: url(\'' + base + 
fontconfig.eot + versionSuffix + '\');\n';
}
-   styleString += '\\tsrc: ';
+   styleString += '\tsrc: ';
// If the font is present locally, use it.
if ( userAgent.match( /Android 2\.3/ ) === null ) {
// Android 2.3.x does not respect local() 
syntax.
@@ -269,30 +269,30 @@
styleString += 'local(\'' + fontFamily + '\'),';
}
if ( fontconfig.woff ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.woff + versionSuffix
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.woff + versionSuffix
+ '\') format(\'woff\')' );
}
if ( fontconfig.svg ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.svg + versionSuffix + '#'
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.svg + versionSuffix + '#'
+ fontFamily + '\') 
format(\'svg\')' );
}
if ( fontconfig.ttf ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.ttf + versionSuffix
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.ttf + versionSuffix
+ '\') format(\'truetype\')' );
}
-   styleString += fontFormats.join() + ';\\n';
+   styleString += fontFormats.join() + ';\n';
if ( fontconfig.fontweight ) {
-   styleString += '\\tfont-weight:' + 
fontconfig.fontweight + ';';
+   styleString += '\tfont-weight:' + 
fontconfig.fontweight + ';';
}
-   styleString += '\\tfont-style:' + fontStyle + ';';
+   styleString += '\tfont-style:' + fontStyle + ';';
 
if ( fontconfig.fontweight !== undefined ) {
-   styleString += '\font-weight:' + 
fontconfig.fontweight + ';';
+   styleString += '\tfont-weight:' + 
fontconfig.fontweight + ';';
}
if ( fontconfig.fontstyle !== undefined ) {
-   styleString += '\\tfont-style:' + 
fontconfig.fontstyle + ';';
+   styleString += '\tfont-style:' + 
fontconfig.fontstyle + ';';
} else {
-   styleString += '\\tfont-style: normal;';
+   styleString += '\tfont-style: normal;';
}
 
styleString += '}';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 

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

[MediaWiki-commits] [Gerrit] Fix DispatchStatsTest - change (mediawiki...Wikibase)

[Daniel Kinzler (Code Review)]

Daniel Kinzler has uploaded a new change for review.

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


Change subject: Fix DispatchStatsTest
..

Fix DispatchStatsTest

* renamed misnamed test class
* replaced "truncate" with "delete" for SQLite compatibility

Change-Id: Icae47e5e29217a647b2e0ed513542996b82d40c6
---
M repo/Wikibase.hooks.php
M repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php
2 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/63/61563/1

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index c21c2f5..16501ab 100755
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -203,6 +203,7 @@
'store/StoreFactory',
'store/Store',
 
+   'store/sql/DispatchStats',
'store/sql/SqlIdGenerator',
'store/sql/TermSqlIndex',
'store/sql/TermSearchKeyBuilder',
diff --git a/repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php 
b/repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php
index fed758b..885d409 100644
--- a/repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php
+++ b/repo/tests/phpunit/includes/store/sql/DispatchStatsTest.php
@@ -4,9 +4,6 @@
 use Wikibase\DispatchStats;
 
 /**
- * FIXME: this class is not registered in the test hook
- * FIXME: there already is a EntityChangeTest in lib
- *
  * Tests for the Wikibase\EntityChange class.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +35,7 @@
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
  */
-class EntityChangeTest extends \MediaWikiTestCase {
+class DispatchStatsTest extends \MediaWikiTestCase {
 
/**
 * Creates and loads a DispatchStats object, injecting test data into
@@ -52,10 +49,10 @@
$changes = $data['changes'];
$states = $data['states'];
 
-   $dbw = wfGetDB( DB_MASTER ); // write to dummy tables
+   $dbw = wfGetDB( DB_MASTER ); // writes to dummy tables
 
-   $dbw->query( "truncate " . $dbw->tableName( 'wb_changes' ) );
-   $dbw->query( "truncate " . $dbw->tableName( 
'wb_changes_dispatch' ) );
+   $dbw->delete( 'wb_changes', array( "1" ) );
+   $dbw->delete( 'wb_changes_dispatch', array( "1" ) );
 
foreach ( $changes as $row ) {
if ( $row === null ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icae47e5e29217a647b2e0ed513542996b82d40c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler 

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

[MediaWiki-commits] [Gerrit] Update from upstream - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Update from upstream
..


Update from upstream

Unbreaks escaping.

Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
---
M lib/jquery.webfonts.js
1 file changed, 12 insertions(+), 12 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 88c817e..4cc01e0 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -253,15 +253,15 @@
base = this.repository.base;
version = fontconfig.version;
versionSuffix = '?version=' + version + '&20120101';
-   styleString = '@font-face { font-family: \'' + 
fontFamily + '\';\\n';
+   styleString = '@font-face { font-family: \'' + 
fontFamily + '\';\n';
userAgent = window.navigator.userAgent;
fontStyle = fontconfig.fontstyle || 'normal';
fontFormats = [];
 
if ( fontconfig.eot ) {
-   styleString += '\\tsrc: url(\'' + base + 
fontconfig.eot + versionSuffix + '\');\\n';
+   styleString += '\tsrc: url(\'' + base + 
fontconfig.eot + versionSuffix + '\');\n';
}
-   styleString += '\\tsrc: ';
+   styleString += '\tsrc: ';
// If the font is present locally, use it.
if ( userAgent.match( /Android 2\.3/ ) === null ) {
// Android 2.3.x does not respect local() 
syntax.
@@ -269,30 +269,30 @@
styleString += 'local(\'' + fontFamily + '\'),';
}
if ( fontconfig.woff ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.woff + versionSuffix
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.woff + versionSuffix
+ '\') format(\'woff\')' );
}
if ( fontconfig.svg ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.svg + versionSuffix + '#'
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.svg + versionSuffix + '#'
+ fontFamily + '\') 
format(\'svg\')' );
}
if ( fontconfig.ttf ) {
-   fontFormats.push( '\\t\\turl(\'' + base + 
fontconfig.ttf + versionSuffix
+   fontFormats.push( '\t\turl(\'' + base + 
fontconfig.ttf + versionSuffix
+ '\') format(\'truetype\')' );
}
-   styleString += fontFormats.join() + ';\\n';
+   styleString += fontFormats.join() + ';\n';
if ( fontconfig.fontweight ) {
-   styleString += '\\tfont-weight:' + 
fontconfig.fontweight + ';';
+   styleString += '\tfont-weight:' + 
fontconfig.fontweight + ';';
}
-   styleString += '\\tfont-style:' + fontStyle + ';';
+   styleString += '\tfont-style:' + fontStyle + ';';
 
if ( fontconfig.fontweight !== undefined ) {
-   styleString += '\font-weight:' + 
fontconfig.fontweight + ';';
+   styleString += '\tfont-weight:' + 
fontconfig.fontweight + ';';
}
if ( fontconfig.fontstyle !== undefined ) {
-   styleString += '\\tfont-style:' + 
fontconfig.fontstyle + ';';
+   styleString += '\tfont-style:' + 
fontconfig.fontstyle + ';';
} else {
-   styleString += '\\tfont-style: normal;';
+   styleString += '\tfont-style: normal;';
}
 
styleString += '}';

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Refactored pages, exctracted duplicate code to URL module - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: Refactored pages, exctracted duplicate code to URL module
..

Refactored pages, exctracted duplicate code to URL module

Bug: 47657
Change-Id: Iafe6906c8b4c7ebf9ad8c65961797d65d996e87b
---
A features/support/modules/url_module.rb
M features/support/pages/aftv5_page.rb
M features/support/pages/appearance_page.rb
M features/support/pages/article_page.rb
M features/support/pages/create_account_page.rb
M features/support/pages/describe_page.rb
M features/support/pages/does_not_exist_page.rb
M features/support/pages/file_does_not_exist_page.rb
M features/support/pages/learn_page.rb
M features/support/pages/login_page.rb
M features/support/pages/main_page.rb
M features/support/pages/page_triage_page.rb
M features/support/pages/preferences_page.rb
M features/support/pages/random_page.rb
M features/support/pages/release_rights_page.rb
M features/support/pages/upload_page.rb
M features/support/pages/upload_wizard_page.rb
M features/support/pages/use_page.rb
18 files changed, 44 insertions(+), 153 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/64/61564/1

diff --git a/features/support/modules/url_module.rb 
b/features/support/modules/url_module.rb
new file mode 100644
index 000..6268546
--- /dev/null
+++ b/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://en.wikipedia.beta.wmflabs.org/wiki/'
+end
+"#{mediawiki_url}#{name}"
+  end
+end
diff --git a/features/support/pages/aftv5_page.rb 
b/features/support/pages/aftv5_page.rb
index 27efa69..08d68ab 100644
--- a/features/support/pages/aftv5_page.rb
+++ b/features/support/pages/aftv5_page.rb
@@ -1,15 +1,8 @@
 class AFTv5Page
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Aftpage"
-  end
-  page_url url
+  include URL
+  page_url URL.url('Aftpage')
 
   div(:aft_box, id: 'mw-articlefeedbackv5')
   a(:all_comments, text: /All comments/)
diff --git a/features/support/pages/appearance_page.rb 
b/features/support/pages/appearance_page.rb
index e43c007..6d5c05d 100644
--- a/features/support/pages/appearance_page.rb
+++ b/features/support/pages/appearance_page.rb
@@ -1,15 +1,8 @@
 class AppearancePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Special:Preferences#mw-prefsection-rendering"
-  end
-  page_url url
+  include URL
+  page_url URL.url('Special:Preferences#mw-prefsection-rendering')
 
   radio_button(:always_render_radio, id: 'mw-input-wpmath-0')
   checkbox(:auto_number_check, id: 'mw-input-wpnumberheadings')
diff --git a/features/support/pages/article_page.rb 
b/features/support/pages/article_page.rb
index 5fe20b8..13abc8a 100644
--- a/features/support/pages/article_page.rb
+++ b/features/support/pages/article_page.rb
@@ -1,15 +1,8 @@
 class ArticlePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}<%=params[:page_name]%>"
-  end
-  page_url url
+  include URL
+  page_url URL.url('<%=params[:page_name]%>')
 
   a(:discussion, text: 'Discussion')
   a(:edit, text: 'Edit')
diff --git a/features/support/pages/create_account_page.rb 
b/features/support/pages/create_account_page.rb
index 3636617..d2d655c 100644
--- a/features/support/pages/create_account_page.rb
+++ b/features/support/pages/create_account_page.rb
@@ -1,15 +1,8 @@
 class CreateAccountPage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}<%=params[:page_title]%>"
-  end
-  page_url url
+  include URL
+  page_url URL.url('<%=params[:page_title]%>')
 
   button(:create_account, id: 'wpCreateaccount')
 end
diff --git a/features/support/pages/describe_page.rb 
b/features/support/pages/describe_page.rb
index 53c56e5..dc5964d 100644
--- a/features/support/pages/describe_page.rb
+++ b/features/support/pages/describe_page.rb
@@ -1,15 +1,8 @@
 class DescribePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Special:UploadWizard"
-  end
-  page_url url
+  include URL
+  page_url U

[MediaWiki-commits] [Gerrit] (bug 37596) Tooltip to clarify the remove flag action - change (mediawiki...ArticleFeedbackv5)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 37596) Tooltip to clarify the remove flag action
..

(bug 37596) Tooltip to clarify the remove flag action

Bug: 37596
Change-Id: Ia248afb4c1a2e79b825fc6318e3bf8784566e70e
---
M ArticleFeedbackv5.php
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/65/61565/1

diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index 79a8737..46dc884 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -718,6 +718,7 @@
'articlefeedbackv5-permalink-activity-more',
'articlefeedbackv5-permalink-activity-fewer',
'articlefeedbackv5-abuse-saved',
+   'articlefeedbackv5-abuse-saved-tooltip',
'articlefeedbackv5-form-unrequest',
'articlefeedbackv5-form-declined',
 
diff --git 
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index 55fef3b..5d4fc4e 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -1058,6 +1058,7 @@
if ( $.articleFeedbackv5special.getActivityFlag( id, 'flag' ) ) 
{
$( '#articleFeedbackv5-flag-link-' + id )
.text( mw.msg( 'articlefeedbackv5-abuse-saved' 
) )
+   .attr( 'title', mw.msg( 
'articlefeedbackv5-abuse-saved-tooltip' ) )
.data( 'action', 'unflag' );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia248afb4c1a2e79b825fc6318e3bf8784566e70e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] (bug 44369) Fix case in "Article Feedback Activity Log" string - change (mediawiki...ArticleFeedbackv5)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 44369) Fix case in "Article Feedback Activity Log" string
..

(bug 44369) Fix case in "Article Feedback Activity Log" string

Bug: 44369
Change-Id: I94a4da95e56984839dbad8100672f640840d5d63
---
M ArticleFeedbackv5.i18n.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/66/61566/1

diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index e63e822..27c7591 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -600,7 +600,7 @@
'right-aft-oversighter' => 'Oversight feedback',
 
/* Log types */
-   'log-name-articlefeedbackv5' => 'Article Feedback Activity Log',
+   'log-name-articlefeedbackv5' => 'Article feedback activity log',
'log-description-articlefeedbackv5' => 'This is the log of activity 
taken on feedback items submitted by users via Article Feedback.',
'logentry-articlefeedbackv5-create' => '$1 {{GENDER:$2|submitted}} 
[[$3|feedback post #$4]] on [[$5]]',
'logentry-articlefeedbackv5-oversight' => '$1 {{GENDER:$2|changed the 
status to oversight of}} [[$3|feedback post #$4]] on [[$5]]',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94a4da95e56984839dbad8100672f640840d5d63
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Add backward compatibility for fetchLanguageNames - change (mediawiki...UniversalLanguageSelector)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Add backward compatibility for fetchLanguageNames
..


Add backward compatibility for fetchLanguageNames

Bug: 46737
Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
---
M ResourceLoaderULSModule.php
M UniversalLanguageSelector.hooks.php
M data/LanguageNameIndexer.php
3 files changed, 25 insertions(+), 6 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ResourceLoaderULSModule.php b/ResourceLoaderULSModule.php
index dda8492..784db4f 100644
--- a/ResourceLoaderULSModule.php
+++ b/ResourceLoaderULSModule.php
@@ -33,9 +33,15 @@
 */
protected function getData() {
$vars = array();
-   $vars['wgULSLanguages'] = Language::fetchLanguageNames(
-   $this->language->getCode(), 'mwfile'
-   );
+   if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+   // since 1.20
+   $vars['wgULSLanguages'] = Language::fetchLanguageNames(
+   $this->language->getCode(), 'mwfile'
+   );
+   } else {
+   $vars['wgULSLanguages'] = Language::getLanguageNames( 
false );
+   }
+
return $vars;
}
 
diff --git a/UniversalLanguageSelector.hooks.php 
b/UniversalLanguageSelector.hooks.php
index 4d26264..1aa0adc 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -105,7 +105,11 @@
 
protected static function isSupportedLanguage( $language ) {
wfProfileIn( __METHOD__ );
-   $supported = Language::fetchLanguageNames( null, 'mwfile' );
+   if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+   $supported = Language::fetchLanguageNames( null, 
'mwfile' ); // since 1.20
+   } else {
+   $supported = Language::getLanguageNames( false );
+   }
wfProfileOut( __METHOD__ );
 
return isset( $supported[$language] );
@@ -117,7 +121,11 @@
 */
protected static function getDefaultLanguage( array $preferred ) {
wfProfileIn( __METHOD__ );
-   $supported = Language::fetchLanguageNames( null, 'mwfile' );
+   if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+   $supported = Language::fetchLanguageNames( null, 
'mwfile' ); // since 1.20
+   } else {
+   $supported = Language::getLanguageNames( false );
+   }
// look for a language that is acceptable to the client
// and known to the wiki.
foreach ( $preferred as $code => $weight ) {
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index b8df9c5..8c2820e 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -33,7 +33,12 @@
}
 
public function execute() {
-   $languages = Language::fetchLanguageNames( null, 'all' );
+   if ( method_exists( 'Language', 'fetchLanguageNames' ) ) {
+   $languages = Language::fetchLanguageNames( null, 'all' 
); // since 1.20
+   } else {
+   $languages = Language::getLanguageNames( false );
+   }
+
$all = array();
$buckets = array();
foreach ( $languages as $code => $name ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife7c2834c2b2c4f2619b4a5d8e0b0aa1db595984
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Round trip server: Link failed fetches to fetch source. - change (mediawiki...Parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Round trip server: Link failed fetches to fetch source.
..


Round trip server: Link failed fetches to fetch source.

This helps us click-through to figure out if the failed fetch is a problem
with the source or with our server.

Change-Id: Ibdf57ac3ca0f3e88a7cc0cc3469b5805550a8a3b
---
M js/tests/server/server.js
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/js/tests/server/server.js b/js/tests/server/server.js
index 9f0e5d5..402cf24 100755
--- a/js/tests/server/server.js
+++ b/js/tests/server/server.js
@@ -748,7 +748,12 @@
res.write(' The following ' + n + ' titles 
return 404');
res.write('');
for (var i = 0; i < n; i++) {
-   res.write(' ' + rows[i].prefix + 
':' + rows[i].title + ' ');
+   var prefix = rows[i].prefix, title = 
rows[i].title;
+   var url = prefix + 
'.wikipedia.org/wiki/' + title;
+   var name = prefix + ':' + title;
+   res.write('' +
+ name.replace('&', 
'&') + '\n');
}
res.write( '');
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdf57ac3ca0f3e88a7cc0cc3469b5805550a8a3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: Subramanya Sastry 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding new key for rfaulk (rt5040) for stat1 access - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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


Change subject: Adding new key for rfaulk (rt5040) for stat1 access
..

Adding new key for rfaulk (rt5040) for stat1 access

Change-Id: I5eb46ef3733b8eaa06c08ac38695d769ad5ef783
---
M manifests/admins.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/61567/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index 9fa2856..114371c 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1466,6 +1466,12 @@
type=> "ssh-rsa",
key => 
"B3NzaC1yc2EBIwAAAQEA1WerRcJULxj26JimklCkoFUO6XKBjwTbPH54/hUv5c3lvyuUol6AF86rWziHgwIAy4+jPlm9mTS3IzWoRf0sSMgSrjkmykVaD4Zc+7QnXXGtnehHfryKTyB30TI39/JB5CoS1pGQQoMg67kF0nl2RKP47r0HY07m3rl1m5MWMTKByZ9p6/oVAuJ7XNxLjfN1N+Li7HhyueQonkw8Na4CxSz/Uj6zDgxB1Odw9LgHErgOe99Nza4yOsvpa9iq30eLJjXYKJ+9s8aPI68H+nBh8/CaBaPJkuTcYfwXhE6EG9JTtUrf43y88J+SDeN0lRF8w0SMluheIzkv/3TNyDdr1w=="
}
+   ssh_authorized_key { "rfaulk":
+   ensure  => present,
+   user=> $username,
+   type=> "ssh-rsa",
+   key => 
"B3NzaC1yc2EDAQABAAABAQDFlxYVmNcVsP33eEHhNc+nHZ1HJcuAZNGNfoNhiHRTisyqPm1jFvt0WQ3r+AS1rErCD3594rkApGAzO20if86OAChUwq2C3k7xB28eOXOGB/EMNswpdoDXraSxgshptbFloy1ekLX/lxWUVKU3omc3jaA4anF9FQD4EGpNbL6lJaO0oloOHdKwyjUlvp8gvWOX2/LH10ALh5/KcA1nC3zlyrLyDfHTwnkDCsvVKe8rQB3pM4b7mVOLstj+dcCqxaVbjyZap8dV4W4QbhqUFVhe9ZL1Crop0TemhWBSw9oh2vQhGj6LWQIwIAfSe6zHIJ2exfq/53nVsHeC98gWr4QZ"
+   }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb46ef3733b8eaa06c08ac38695d769ad5ef783
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson 

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

[MediaWiki-commits] [Gerrit] (bug 37477) Feedback details text on "View feedback page" cu... - change (mediawiki...ArticleFeedbackv5)

[Matthias Mullie (Code Review)]

Matthias Mullie has uploaded a new change for review.

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


Change subject: (bug 37477) Feedback details text on "View feedback page" cut 
off for very long string without whitespace
..

(bug 37477) Feedback details text on "View feedback page" cut off for very long 
string without whitespace

Bug: 37477
Change-Id: Ib6d677d10ef36b044cdf9a4226563137e30f5fa4
---
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/68/61568/1

diff --git 
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css 
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
index 856f185..b1f5a05 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -16,6 +16,7 @@
 .articleFeedbackv5-feedback .articleFeedbackv5-comment-wrap {
padding: 0 10px 20px 30px;
margin-left: 300px;
+   overflow: auto;
 }
 .articleFeedbackv5-feedback .articleFeedbackv5-comment-wrap 
.articleFeedbackv5-comment-head {
margin-top: 10px;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6d677d10ef36b044cdf9a4226563137e30f5fa4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie 

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

[MediaWiki-commits] [Gerrit] Adding rfaulk's new key to admins for stat1 access..rt5040 - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has uploaded a new change for review.

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


Change subject: Adding rfaulk's new key to admins for stat1 access..rt5040
..

Adding rfaulk's new key to admins for stat1 access..rt5040

Change-Id: I0a04e5e48dc45b0ccaa5fcfd52f4ee49aaa0a399
---
M manifests/admins.pp
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/61569/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index ac93288..0efaa7e 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1486,6 +1486,12 @@
type=> "ssh-rsa",
key => 
"B3NzaC1yc2EBIwAAAQEA1WerRcJULxj26JimklCkoFUO6XKBjwTbPH54/hUv5c3lvyuUol6AF86rWziHgwIAy4+jPlm9mTS3IzWoRf0sSMgSrjkmykVaD4Zc+7QnXXGtnehHfryKTyB30TI39/JB5CoS1pGQQoMg67kF0nl2RKP47r0HY07m3rl1m5MWMTKByZ9p6/oVAuJ7XNxLjfN1N+Li7HhyueQonkw8Na4CxSz/Uj6zDgxB1Odw9LgHErgOe99Nza4yOsvpa9iq30eLJjXYKJ+9s8aPI68H+nBh8/CaBaPJkuTcYfwXhE6EG9JTtUrf43y88J+SDeN0lRF8w0SMluheIzkv/3TNyDdr1w=="
}
+   ssh_authorized_key { "rfaulk":
+   ensure  => present,
+   user=> $username,
+   type=> "ssh-rsa",
+   key => 
"B3NzaC1yc2EDAQABAAABAQDFlxYVmNcVsP33eEHhNc+nHZ1HJcuAZNGNfoNhiHRTisyqPm1jFvt0WQ3r+AS1rErCD3594rkApGAzO20if86OAChUwq2C3k7xB28eOXOGB/EMNswpdoDXraSxgshptbFloy1ekLX/lxWUVKU3omc3jaA4anF9FQD4EGpNbL6lJaO0oloOHdKwyjUlvp8gvWOX2/LH10ALh5/KcA1nC3zlyrLyDfHTwnkDCsvVKe8rQB3pM4b7mVOLstj+dcCqxaVbjyZap8dV4W4QbhqUFVhe9ZL1Crop0TemhWBSw9oh2vQhGj6LWQIwIAfSe6zHIJ2exfq/53nVsHeC98gWr4QZ"
+   }
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a04e5e48dc45b0ccaa5fcfd52f4ee49aaa0a399
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson 

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

[MediaWiki-commits] [Gerrit] Adding rfaulk's new key to admins for stat1 access..rt5040 - change (operations/puppet)

[Cmjohnson (Code Review)]

Cmjohnson has submitted this change and it was merged.

Change subject: Adding rfaulk's new key to admins for stat1 access..rt5040
..


Adding rfaulk's new key to admins for stat1 access..rt5040

Change-Id: I0a04e5e48dc45b0ccaa5fcfd52f4ee49aaa0a399
---
M manifests/admins.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Cmjohnson: Verified; Looks good to me, approved



diff --git a/manifests/admins.pp b/manifests/admins.pp
index ac93288..0efaa7e 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1486,6 +1486,12 @@
type=> "ssh-rsa",
key => 
"B3NzaC1yc2EBIwAAAQEA1WerRcJULxj26JimklCkoFUO6XKBjwTbPH54/hUv5c3lvyuUol6AF86rWziHgwIAy4+jPlm9mTS3IzWoRf0sSMgSrjkmykVaD4Zc+7QnXXGtnehHfryKTyB30TI39/JB5CoS1pGQQoMg67kF0nl2RKP47r0HY07m3rl1m5MWMTKByZ9p6/oVAuJ7XNxLjfN1N+Li7HhyueQonkw8Na4CxSz/Uj6zDgxB1Odw9LgHErgOe99Nza4yOsvpa9iq30eLJjXYKJ+9s8aPI68H+nBh8/CaBaPJkuTcYfwXhE6EG9JTtUrf43y88J+SDeN0lRF8w0SMluheIzkv/3TNyDdr1w=="
}
+   ssh_authorized_key { "rfaulk":
+   ensure  => present,
+   user=> $username,
+   type=> "ssh-rsa",
+   key => 
"B3NzaC1yc2EDAQABAAABAQDFlxYVmNcVsP33eEHhNc+nHZ1HJcuAZNGNfoNhiHRTisyqPm1jFvt0WQ3r+AS1rErCD3594rkApGAzO20if86OAChUwq2C3k7xB28eOXOGB/EMNswpdoDXraSxgshptbFloy1ekLX/lxWUVKU3omc3jaA4anF9FQD4EGpNbL6lJaO0oloOHdKwyjUlvp8gvWOX2/LH10ALh5/KcA1nC3zlyrLyDfHTwnkDCsvVKe8rQB3pM4b7mVOLstj+dcCqxaVbjyZap8dV4W4QbhqUFVhe9ZL1Crop0TemhWBSw9oh2vQhGj6LWQIwIAfSe6zHIJ2exfq/53nVsHeC98gWr4QZ"
+   }
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a04e5e48dc45b0ccaa5fcfd52f4ee49aaa0a399
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson 
Gerrit-Reviewer: Cmjohnson 

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

[MediaWiki-commits] [Gerrit] It's fail not error - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: It's fail not error
..

It's fail not error

This always gets me. Make sure we bind the function correctly so it
runs on an error

Change-Id: I600446357db49042362488239b2511a13d7bb477
---
M javascripts/specials/nearby.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/70/61570/1

diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index de8af5a..abd4a81 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -140,7 +140,7 @@
text( mw.message( 
'mobile-frontend-nearby-noresults' ).plain() ).
appendTo( $content );
}
-   } ).error( function() {
+   } ).fail( function() {
$( '#mw-mf-nearby' ).addClass( 'alert error content' 
).text( mw.message( 'mobile-frontend-nearby-error' ) );
} );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I600446357db49042362488239b2511a13d7bb477
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Story 425 Nearby: Cache last known location/nearby places - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: Story 425 Nearby: Cache last known location/nearby places
..

Story 425 Nearby: Cache last known location/nearby places

Add an additional level of caching to this page so that back button
is a little more responsive. Note nearby.js runs at bottom of page so
there is still a slight delay. Lets not make mobile.stable load at top
of page just for this..

Change-Id: I458e3ca60c56e25bda65eb4675390b13f4acd91d
---
M javascripts/common/mf-settings.js
M javascripts/specials/nearby.js
2 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/71/61571/1

diff --git a/javascripts/common/mf-settings.js 
b/javascripts/common/mf-settings.js
index a549870..b058cfb 100644
--- a/javascripts/common/mf-settings.js
+++ b/javascripts/common/mf-settings.js
@@ -59,8 +59,9 @@
( useCookieFallback ? writeCookie( name, value, 
1 ) : false );
}
 
-   function getUserSetting( name ) {
-   return supportsLocalStorage ? localStorage.getItem( name ) : 
readCookie( name );
+   function getUserSetting( name, useCookieFallback ) {
+   return supportsLocalStorage ? localStorage.getItem( name ) :
+   ( useCookieFallback ? readCookie( name ) : false );
}
 
return {
diff --git a/javascripts/specials/nearby.js b/javascripts/specials/nearby.js
index abd4a81..4ed571b 100644
--- a/javascripts/specials/nearby.js
+++ b/javascripts/specials/nearby.js
@@ -1,4 +1,6 @@
 ( function( M, $ ) {
+var CACHE_KEY_RESULTS = 'mfNearbyLastSearchResult',
+   CACHE_KEY_LAST_LOCATION = 'mfNearbyLastKnownLocation';
 
 ( function() {
var supported = !!navigator.geolocation,
@@ -6,6 +8,9 @@
View = M.require( 'view' ),
cachedPages,
curLocation,
+   lastKnownLocation = M.settings.getUserSetting( 
CACHE_KEY_LAST_LOCATION ),
+   cache = M.settings.saveUserSetting,
+   lastSearchResult = M.settings.getUserSetting( CACHE_KEY_RESULTS 
),
Nearby = View.extend( {
template: M.template.get( 'articleList' )
} );
@@ -63,6 +68,7 @@
}
 
function render( $content, pages ) {
+   cache( CACHE_KEY_RESULTS, $.toJSON( pages ) ); // cache result
pages = $.map( pages, function( page ) {
var coords, lngLat, thumb;
 
@@ -152,6 +158,7 @@
navigator.geolocation.watchPosition( function( geo ) {
var lat = geo.coords.latitude, lng = 
geo.coords.longitude;
curLocation = geo.coords;
+   cache( CACHE_KEY_LAST_LOCATION, $.toJSON( curLocation ) 
);
findResults( lat, lng );
},
function() {
@@ -163,7 +170,13 @@
}
 
if ( supported ) {
+   if ( lastKnownLocation ) {
+   curLocation = $.parseJSON( lastKnownLocation );
+   }
init();
+   if ( lastSearchResult ) {
+   render( $( '#content' ), $.parseJSON( lastSearchResult 
) );
+   }
}
M.define( 'nearby', {
distanceMessage: distanceMessage

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I458e3ca60c56e25bda65eb4675390b13f4acd91d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Fixed upload wizard tests - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: Fixed upload wizard tests
..

Fixed upload wizard tests

Change-Id: Ic86383e950311c427a7d61123e6b253f447f40e2
---
M features/support/pages/describe_page.rb
M features/support/pages/release_rights_page.rb
M features/support/pages/upload_page.rb
M features/support/pages/upload_wizard_page.rb
M features/support/pages/use_page.rb
5 files changed, 20 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/73/61573/1

diff --git a/features/support/pages/describe_page.rb 
b/features/support/pages/describe_page.rb
index dc5964d..e6e5c83 100644
--- a/features/support/pages/describe_page.rb
+++ b/features/support/pages/describe_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   textarea(:description, name: /^description/)
   div(:next_parent, id: 'mwe-upwiz-stepdiv-details')
diff --git a/features/support/pages/release_rights_page.rb 
b/features/support/pages/release_rights_page.rb
index 9b86cf2..79561c4 100644
--- a/features/support/pages/release_rights_page.rb
+++ b/features/support/pages/release_rights_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   radio(:my_own_work, id: 'deedChooser1-ownwork')
   div(:next_parent, id: 'mwe-upwiz-stepdiv-deeds')
diff --git a/features/support/pages/upload_page.rb 
b/features/support/pages/upload_page.rb
index 7c43b3c..533c866 100644
--- a/features/support/pages/upload_page.rb
+++ b/features/support/pages/upload_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   span(:continue, text: 'Continue')
   file_field(:select_file, name: 'file')
diff --git a/features/support/pages/upload_wizard_page.rb 
b/features/support/pages/upload_wizard_page.rb
index b864852..f6ef6ff 100644
--- a/features/support/pages/upload_wizard_page.rb
+++ b/features/support/pages/upload_wizard_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   text_field(:add_categories, id: 'categories0')
   text_field(:altitude, id: 'location-altitude0')
diff --git a/features/support/pages/use_page.rb 
b/features/support/pages/use_page.rb
index 385c3fc..14ef8fe 100644
--- a/features/support/pages/use_page.rb
+++ b/features/support/pages/use_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   span(:upload_more_files, text: 'Upload more files')
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic86383e950311c427a7d61123e6b253f447f40e2
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] New way of running tests at commons.wikimedia.beta.wmflabs.org - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: New way of running tests at commons.wikimedia.beta.wmflabs.org
..

New way of running tests at commons.wikimedia.beta.wmflabs.org

Bug: 47266
Change-Id: I77b189137498c687953192e8c7a887fa1069c65e
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/file.feature
M features/login.feature
M features/search.feature
M features/upload_wizard.feature
6 files changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/74/61574/1

diff --git a/docs/jobs.md b/docs/jobs.md
index 54d752f..8ef6ebd 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -9,7 +9,7 @@
 # browsertests-commons.wikimedia.beta.wmflabs.org
 
 - MediaWiki URL: commons.wikimedia.beta.wmflabs.org
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org'
 
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-linux-chrome
@@ -20,15 +20,15 @@
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie6-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie7-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie8-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index e35c72f..8577db9 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,4 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index b64730e..3addc39 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/login.feature b/features/login.feature
index 5cf6e53..229d091 100644
--- a/features/login.feature
+++ b/features/login.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: Log in
 
   Background:
diff --git a/features/search.feature b/features/search.feature
index a73ce75..7278b13 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: Search
 
   Scenario: Search suggestions
diff --git a/features/upload_wizard.feature b/features/upload_wizard.feature
index d67eda9..706f92e 100644
--- a/features/upload_wizard.feature
+++ b/features/upload_wizard.feature
@@ -1,4 +1,4 @@
-@login
+@commons.wikimedia.beta.wmflabs.org @login
 Feature: UploadWizard
 
   Background:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77b189137498c687953192e8c7a887fa1069c65e
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] BUG 47854: Dont treat ref-placeholder metas as sol-transparent - change (mediawiki...Parsoid)

[Subramanya Sastry (Code Review)]

Subramanya Sastry has uploaded a new change for review.

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


Change subject: BUG 47854: Dont treat ref-placeholder metas as sol-transparent
..

BUG 47854: Dont treat ref-placeholder metas as sol-transparent

* Fixes the bug and the test case: "foo\n a"
* No change in parser tests (TODO: Add tests).

Change-Id: I0ef214eb44675d1d90c81fdba4df47b450e55df5
---
M js/lib/mediawiki.Util.js
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid 
refs/changes/75/61575/1

diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index b0a3b94..6d6632f 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -262,7 +262,13 @@
return false;
}
 
-   return true;
+   // BUG 47854: Hmm ... special case.  Ext/Ref/Marker tokens that 
are placeholders
+   // for where ref-tags used to be are not sol-transparent.
+   if (token.name === 'meta' && token.getAttribute('typeof') === 
'mw:Ext/Ref/Marker') {
+   return false;
+   } else {
+   return true;
+   }
},
 
/*

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ef214eb44675d1d90c81fdba4df47b450e55df5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry 

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

[MediaWiki-commits] [Gerrit] New way of running tests at en.wikipedia.beta.wmflabs.org - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: New way of running tests at en.wikipedia.beta.wmflabs.org
..

New way of running tests at en.wikipedia.beta.wmflabs.org

Bug: 47266
Change-Id: If0958819d4ca0c8f3e5921e875449ef537949109
---
M docs/jobs.md
M features/aftv5.feature
M features/create_account_readonly.feature
M features/file.feature
M features/page_edit.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/preferences_appearance_readonly.feature
M features/search.feature
9 files changed, 13 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/76/61576/1

diff --git a/docs/jobs.md b/docs/jobs.md
index 8ef6ebd..6e33fbb 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -36,8 +36,8 @@
 
 
 # browsertests-en.wikipedia.beta.wmflabs.org
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci'
-- MediaWiki URL: en.wikipedia.beta.wmflabs.or
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org'
+- MediaWiki URL: en.wikipedia.beta.wmflabs.org
 
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-linux-chrome
@@ -48,15 +48,15 @@
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie6-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie7-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie8-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/aftv5.feature b/features/aftv5.feature
index e499d7c..ab6a815 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -1,5 +1,5 @@
 # 
http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms
 @ie6-bug @phantomjs-bug
-@ie6-bug @phantomjs-bug
+@en.wikipedia.beta.wmflabs.org @ie6-bug @phantomjs-bug
 Feature: AFTv5
 
   Background:
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 8577db9..093afde 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index 3addc39..652e911 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/page_edit.feature b/features/page_edit.feature
index 1c9d5ea..2c849a6 100644
--- a/features/page_edit.feature
+++ b/features/page_edit.feature
@@ -1,3 +1,4 @@
+@en.wikipedia.beta.wmflabs.org
 Feature: Edit
 
   Background:
diff --git a/features/page_triage_readonly.feature 
b/features/page_triage_readonly.feature
index c690b6e..48dd0a9 100644
--- a/features/page_triage_

[MediaWiki-commits] [Gerrit] l10n cache rebuilder learned --lang - change (mediawiki/core)

[Hashar (Code Review)]

Hashar has uploaded a new change for review.

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


Change subject: l10n cache rebuilder learned --lang
..

l10n cache rebuilder learned --lang

rebuildLocalisationCache would rebuild all language caches by default.
We were lacking an option to rebuild only one language, for example when
it get corrupted or the cache file for a language got removed.

The new --lang accepts a list of comma separated langs to rebuild the
cache for.  Example usage:

 php rebuildLocalisationCache.php --lang en,fr,de

Change-Id: I4c5e69abb76ffd8b88b595e3687edab3bb267ccc
---
M maintenance/rebuildLocalisationCache.php
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/77/61577/1

diff --git a/maintenance/rebuildLocalisationCache.php 
b/maintenance/rebuildLocalisationCache.php
index db77564..6df0aa0 100644
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -44,6 +44,8 @@
$this->addOption( 'threads', 'Fork more than one thread', 
false, true );
$this->addOption( 'outdir', 'Override the output directory 
(normally $wgCacheDirectory)',
false, true );
+   $this->addOption( 'lang', 'Only rebuild this languages, comma 
separated.',
+   false, true );
}
 
public function memoryLimit() {
@@ -90,7 +92,12 @@
}
$lc = new LocalisationCache_BulkLoad( $conf );
 
-   $codes = array_keys( Language::fetchLanguageNames( null, 
'mwfile' ) );
+   if( $this->hasOption( 'lang' ) ) {
+   $codes = explode( ',', $this->getOption('lang') );
+   } else {
+   # By default get all languages
+   $codes = array_keys( Language::fetchLanguageNames( 
null, 'mwfile' ) );
+   }
sort( $codes );
 
// Initialise and split into chunks

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c5e69abb76ffd8b88b595e3687edab3bb267ccc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] Feature: Login SUL - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: Feature: Login SUL
..


Feature: Login SUL

Scenario: Login on wikis on same project
Scenario: Logout on one wiki logs out all wikis

Change-Id: I0b32933042ae7d3fa87dcdb1c88e1a635cab38d5
---
A features/login_sul.feature
A features/step_definitions/login_sul_steps.rb
M features/support/pages/main_page.rb
3 files changed, 45 insertions(+), 1 deletion(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/features/login_sul.feature b/features/login_sul.feature
new file mode 100644
index 000..ca0d6b9
--- /dev/null
+++ b/features/login_sul.feature
@@ -0,0 +1,13 @@
+Feature: Login SUL
+
+  Background:
+Given I log in at en.wikipedia.beta.wmflabs.org
+
+  Scenario: Login on wikis on same project
+Then I should be logged in at commons.wikimedia.beta.wmflabs.org
+  And I should be logged in at meta.wikimedia.beta.wmflabs.org
+
+  Scenario: Logout on one wiki logs out all wikis
+When I log out
+Then I should not be logged in at commons.wikimedia.beta.wmflabs.org
+ And I should not be logged in at meta.wikimedia.beta.wmflabs.org
diff --git a/features/step_definitions/login_sul_steps.rb 
b/features/step_definitions/login_sul_steps.rb
new file mode 100644
index 000..ea9cd64
--- /dev/null
+++ b/features/step_definitions/login_sul_steps.rb
@@ -0,0 +1,27 @@
+Given(/^I log in at (.+)$/) do |_|
+  visit(LoginPage).login_with(@mediawiki_username, @mediawiki_password)
+end
+
+When(/^I log out$/) do
+  on(MainPage).logout
+end
+
+Then(/^I should be logged in at (.+)$/) do |site|
+  @browser.goto site
+  on(MainPage) do |page|
+page.talk_element.should exist
+page.preferences_element.should exist
+page.logout_element.should exist
+page.login_element.should_not exist
+  end
+end
+
+Then(/^I should not be logged in at (.+)$/) do |site|
+  @browser.goto site
+  on(MainPage) do |page|
+page.talk_element.should_not exist
+page.preferences_element.should_not exist
+page.logout_element.should_not exist
+page.login_element.should exist
+  end
+end
diff --git a/features/support/pages/main_page.rb 
b/features/support/pages/main_page.rb
index 5fc90ed..da63b7c 100644
--- a/features/support/pages/main_page.rb
+++ b/features/support/pages/main_page.rb
@@ -11,5 +11,9 @@
   end
   page_url url
 
-  a(:my_sandbox, text: "My sandbox")
+  a(:login, text: 'Log in')
+  a(:logout, text: 'Log out')
+  a(:my_sandbox, text: 'My sandbox')
+  a(:preferences, text: 'Preferences')
+  a(:talk, text: 'Talk')
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b32933042ae7d3fa87dcdb1c88e1a635cab38d5
Gerrit-PatchSet: 9
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Transition class for switch to Labs NFS - change (operations/puppet)

[coren (Code Review)]

coren has uploaded a new change for review.

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


Change subject: Transition class for switch to Labs NFS
..

Transition class for switch to Labs NFS

This overrides LDAP autofs setup to transition to NFS storage
for a project; most of this will end up in LDAP from OpenStack
in the future.

Change-Id: Id838b76e21d8fab11462d99f892b86c1aeb9f6d4
---
A files/labsnfs/nfs-noidmap.conf
A manifests/role/labsnfs.pp
A templates/labsnfs/auto.master.erb
A templates/labsnfs/auto.space.erb
A templates/labsnfs/auto.time.home.erb
A templates/labsnfs/auto.time.project.erb
6 files changed, 70 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/61578/1

diff --git a/files/labsnfs/nfs-noidmap.conf b/files/labsnfs/nfs-noidmap.conf
new file mode 100644
index 000..102a139
--- /dev/null
+++ b/files/labsnfs/nfs-noidmap.conf
@@ -0,0 +1,12 @@
+# nfs-noidmap - disable idmap for cross-project NFS
+#
+# This task disables the kernel's automatic idmap for NFSv4
+# to allow conflicting group names accross projects
+
+description "disable idmap for cross-project NFS"
+
+start on starting autofs
+
+task
+
+exec echo 1 >/sys/module/nfs/parameters/nfs4_disable_idmapping
diff --git a/manifests/role/labsnfs.pp b/manifests/role/labsnfs.pp
new file mode 100644
index 000..edfad17
--- /dev/null
+++ b/manifests/role/labsnfs.pp
@@ -0,0 +1,45 @@
+# This is a transition role - Eventually this will end up
+# in LDAP once transition is over.
+
+class role::labsnfs::client {
+   $nfscluster = "labnfs.pmtpa.wmnet"
+
+   exec { "/sbin/initctl start nfs-noidmap":
+   refreshonly => true
+   }
+
+   file {
+   "/etc/auto.master":
+   ensure => file,
+   owner => root,
+   group => root,
+   mode => 0444,
+   content => template("labsnfs/auto.master.erb");
+   "/etc/auto.space":
+   ensure => file,
+   owner => root,
+   group => root,
+   mode => 0444,
+   content => template("labsnfs/auto.space.erb");
+   "/etc/auto.time.home":
+   ensure => file,
+   owner => root,
+   group => root,
+   mode => 0444,
+   content => template("labsnfs/auto.time.home.erb");
+   "/etc/auto.time.project":
+   ensure => file,
+   owner => root,
+   group => root,
+   mode => 0444,
+   content => template("labsnfs/auto.time.project.erb");
+   "/etc/init/nfs-noidmap.conf":
+   ensure => file,
+   owner => root,
+   group => root,
+   mode => 0444,
+   notify => Exec["/sbin/initctl start nfs-noidmap"],
+   source => "puppet:///files/labsnfs/nfs-noidmap.conf";
+   }
+}
+
diff --git a/templates/labsnfs/auto.master.erb 
b/templates/labsnfs/auto.master.erb
new file mode 100644
index 000..ee24175
--- /dev/null
+++ b/templates/labsnfs/auto.master.erb
@@ -0,0 +1,5 @@
+#
+# Managed by PUPPET (role::labs-nfs-client)
+#
+/- file:/etc/auto.space
port=0,nfsvers=4,ro,hard,rsize=65536,wsize=65536,sec=sys
+#+auto.master
diff --git a/templates/labsnfs/auto.space.erb b/templates/labsnfs/auto.space.erb
new file mode 100644
index 000..331043e
--- /dev/null
+++ b/templates/labsnfs/auto.space.erb
@@ -0,0 +1,6 @@
+/home  / -rw   <%= nfscluster %>:/<%= instanceproject %>/home \
+   /.snapshot -fstype=autofs,ghost file:/etc/auto.time.home
+/data  /project -rw<%= nfscluster %>:/<%= instanceproject %>/project \
+   /project/.snapshot -fstype=autofs,ghost file:/etc/auto.time.project
+/public/keys   -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/keys \
+   /datasets -nfsvers=3,ro,ghost labstore1.pmtpa.wmnet:/publicdata-project
diff --git a/templates/labsnfs/auto.time.home.erb 
b/templates/labsnfs/auto.time.home.erb
new file mode 100644
index 000..50e3ae1
--- /dev/null
+++ b/templates/labsnfs/auto.time.home.erb
@@ -0,0 +1 @@
+*  -fstype=nfs4,ghost  <%= nfscluster %>:/<%= instanceproject 
%>/.snapshot/&/home
diff --git a/templates/labsnfs/auto.time.project.erb 
b/templates/labsnfs/auto.time.project.erb
new file mode 100644
index 000..74d9c79
--- /dev/null
+++ b/templates/labsnfs/auto.time.project.erb
@@ -0,0 +1 @@
+*  -fstype=nfs4,ro,ghost   <%= nfscluster %>:/<%= instanceproject 
%>/.snapshot/&/project

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8

[MediaWiki-commits] [Gerrit] Remove incorrect comment - change (mediawiki...Ask)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Remove incorrect comment
..

Remove incorrect comment

Change-Id: I42f76afd79f99da75234e0fe5370ad47169735d2
---
M Tests/Phpunit/phpunit.php
1 file changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/79/61579/1

diff --git a/Tests/Phpunit/phpunit.php b/Tests/Phpunit/phpunit.php
index 5d5681e..2a33ab3 100755
--- a/Tests/Phpunit/phpunit.php
+++ b/Tests/Phpunit/phpunit.php
@@ -1,9 +1,6 @@
 #!/usr/bin/env php
 https://gerrit.wikimedia.org/r/61579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42f76afd79f99da75234e0fe5370ad47169735d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Remove incorrect comment - change (mediawiki...Ask)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Remove incorrect comment
..


Remove incorrect comment

Change-Id: I42f76afd79f99da75234e0fe5370ad47169735d2
---
M Tests/Phpunit/phpunit.php
1 file changed, 0 insertions(+), 3 deletions(-)

Approvals:
  Jeroen De Dauw: Verified; Looks good to me, approved



diff --git a/Tests/Phpunit/phpunit.php b/Tests/Phpunit/phpunit.php
index 5d5681e..2a33ab3 100755
--- a/Tests/Phpunit/phpunit.php
+++ b/Tests/Phpunit/phpunit.php
@@ -1,9 +1,6 @@
 #!/usr/bin/env php
 https://gerrit.wikimedia.org/r/61579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I42f76afd79f99da75234e0fe5370ad47169735d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] Fix EventLogging fail - change (operations/puppet)

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Fix EventLogging fail
..


Fix EventLogging fail

Change-Id: I220c06211e6b43d144523311d571cf1098cb74ed
---
M modules/eventlogging/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  Andrew Bogott: Verified; Looks good to me, approved
  Demon: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/eventlogging/manifests/init.pp 
b/modules/eventlogging/manifests/init.pp
index 533fc0c..16b44e0 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -1,6 +1,6 @@
 # Collector of analytic events
 # See 
-class eventlogging( $backup_destinations = [] ) {
+class eventlogging( $archive_destinations = [] ) {
 
class { 'eventlogging::supervisor': }
class { 'eventlogging::notebook':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I220c06211e6b43d144523311d571cf1098cb74ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: Demon 
Gerrit-Reviewer: Ori.livneh 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Beta: Lazy load sections in beta - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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


Change subject: Beta: Lazy load sections in beta
..

Beta: Lazy load sections in beta

Change-Id: I608b8294df475d2b1796620e7ce75e81c18edffb
---
M MobileFrontend.php
M includes/MobileFrontend.body.php
M includes/skins/SkinMobile.php
M javascripts/common/history-beta.js
M javascripts/common/mf-history-jquery.js
5 files changed, 43 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/80/61580/1

diff --git a/MobileFrontend.php b/MobileFrontend.php
index 80e20e2..f3f42f9 100644
--- a/MobileFrontend.php
+++ b/MobileFrontend.php
@@ -290,8 +290,9 @@
),
'scripts' => array(
'javascripts/modules/mf-languages.js',
-   'javascripts/common/history-beta.js',
'javascripts/views/page.js',
+   'javascripts/common/history-beta.js',
+   'javascripts/modules/mf-toggle-dynamic.js',
),
'position' => 'bottom',
'messages' => array(
@@ -414,7 +415,6 @@
'javascripts/common/mf-history-jquery.js',
'javascripts/modules/mf-tables.js',
'javascripts/modules/mf-translator.js',
-   'javascripts/modules/mf-toggle-dynamic.js',
'javascripts/modules/talk.js',
),
 );
diff --git a/includes/MobileFrontend.body.php b/includes/MobileFrontend.body.php
index 7eced46..6cac599 100644
--- a/includes/MobileFrontend.body.php
+++ b/includes/MobileFrontend.body.php
@@ -141,7 +141,7 @@
}
 
$isFilePage = $this->getTitle()->getNamespace() === NS_FILE;
-   $formatter->enableRemovableSections( 
$context->isAlphaGroupMember() && !$isFilePage );
+   $formatter->enableRemovableSections( 
$context->isBetaGroupMember() && !$isFilePage );
$doc = $formatter->getDoc();
wfProfileOut( __METHOD__ . '-formatter-init' );
 
diff --git a/includes/skins/SkinMobile.php b/includes/skins/SkinMobile.php
index dd7d8ef..3dad588 100644
--- a/includes/skins/SkinMobile.php
+++ b/includes/skins/SkinMobile.php
@@ -267,12 +267,12 @@
if ( $inBeta ) {
$out->addModules( 'mobile.beta' );
$mode = 'beta';
+   } else {
+   $out->addModules( 'mobile.toggling' );
}
if ( $inAlpha ) {
$out->addModules( 'mobile.alpha' );
$mode = 'alpha';
-   } else {
-   $out->addModules( 'mobile.toggling' );
}
wfRunHooks( 'EnableMobileModules', array( $out, $mode ) );
 
diff --git a/javascripts/common/history-beta.js 
b/javascripts/common/history-beta.js
index 4ed94e5..70b3235 100644
--- a/javascripts/common/history-beta.js
+++ b/javascripts/common/history-beta.js
@@ -1,5 +1,7 @@
 ( function( M, $ ) {
var api = M.require( 'api' ),
+   Page = M.require( 'page' ),
+   currentTitle = mw.config.get( 'wgTitle', '' ),
cache = {};
 
function retrievePage( pageTitle, endpoint ) {
@@ -35,6 +37,23 @@
return cachedPage;
}
 
+   function renderPage( pageData ) {
+   var page = new Page( $.extend( pageData, { el: $( '#content' 
)[0] } ) );
+
+   if ( page.isMainPage ) {
+   M.emit( 'homepage-loaded' );
+   }
+   M.emit( 'page-loaded', page );
+   }
+
+   function loadPage( pageTitle ) {
+   currentTitle = pageTitle;
+   return M.history.retrievePage( pageTitle ).done( function( resp 
) {
+   renderPage( resp );
+   } );
+   }
+
M.history.retrievePage = retrievePage;
+   M.history.loadPage = loadPage;
 
 } ( mw.mobileFrontend, jQuery ) );
diff --git a/javascripts/common/mf-history-jquery.js 
b/javascripts/common/mf-history-jquery.js
index f0256c5..efd82a1 100644
--- a/javascripts/common/mf-history-jquery.js
+++ b/javascripts/common/mf-history-jquery.js
@@ -2,14 +2,13 @@
 
var
firstRun,
-   Page = M.require( 'page' ),
makeStubPage,
linkHijacking = false, // FIXME: allow user to opt in/out - 
creates various problems in current implementation in alpha
updateQueryStringParameter = 
M.history.updateQueryStringParameter,
getArticleUrl = M.history.getArticleUrl,
currentTitle = mw.config.get( 'wgTitle', '' ),
navigateToPage,
-   loadPage,
+   loadPage = M.history.loadPage,
loadLanguages,
apiUrl = M.getApiUrl(),
api = M.require( 'api' ),
@@ -76,16 +75,6 @@
}

[MediaWiki-commits] [Gerrit] Added MW title value - DO NOT MERGE - change (mediawiki...Validator)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Added MW title value - DO NOT MERGE
..

Added MW title value - DO NOT MERGE

Change-Id: I4cf5150ce43bbd84f3bccf0d80550ba694ac3d78
---
A includes/utils/MediaWikiTitleValue.php
A includes/utils/MediaWikiTitleValueTest.php
A includes/utils/TitleParser.php
A includes/utils/TitleParserTest.php
4 files changed, 334 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Validator 
refs/changes/81/61581/1

diff --git a/includes/utils/MediaWikiTitleValue.php 
b/includes/utils/MediaWikiTitleValue.php
new file mode 100644
index 000..df06917
--- /dev/null
+++ b/includes/utils/MediaWikiTitleValue.php
@@ -0,0 +1,126 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup DataValue
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class MediaWikiTitleValue extends DataValueObject {
+
+   /**
+* @since 0.1
+*
+* @var Title
+*/
+   protected $title;
+
+   /**
+* @since 0.1
+*
+* @param Title $title
+*
+* @throws InvalidArgumentException
+*/
+   public function __construct( Title $title ) {
+   $this->title = $title;
+   }
+
+   /**
+* @see Serializable::serialize
+*
+* @since 0.1
+*
+* @return string
+*/
+   public function serialize() {
+   return $this->title->getFullText();
+   }
+
+   /**
+* @see Serializable::unserialize
+*
+* @since 0.1
+*
+* @param string $value
+*
+* @return StringValue
+*/
+   public function unserialize( $value ) {
+   $this->__construct( Title::newFromText( $value ) );
+   }
+
+   /**
+* @see DataValue::getType
+*
+* @since 0.1
+*
+* @return string
+*/
+   public function getType() {
+   return 'mediawikititle';
+   }
+
+   /**
+* @see DataValue::getSortKey
+*
+* @since 0.1
+*
+* @return string|float|int
+*/
+   public function getSortKey() {
+   return $this->title->getCategorySortkey();
+   }
+
+   /**
+* Returns the Title object.
+* @see DataValue::getValue
+*
+* @since 0.1
+*
+* @return Title
+*/
+   public function getValue() {
+   return $this->title;
+   }
+
+   /**
+* Constructs a new instance of the DataValue from the provided data.
+* This can round-trip with @see getArrayValue
+*
+* @since 0.1
+*
+* @param mixed $data
+*
+* @return MediaWikiTitleValue
+*/
+   public static function newFromArray( $data ) {
+   return new static( $data );
+   }
+
+}
diff --git a/includes/utils/MediaWikiTitleValueTest.php 
b/includes/utils/MediaWikiTitleValueTest.php
new file mode 100644
index 000..239e481
--- /dev/null
+++ b/includes/utils/MediaWikiTitleValueTest.php
@@ -0,0 +1,84 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @since 0.1
+ *
+ * @ingroup DataValue
+ *
+ * @group DataValue
+ * @group DataValueExtensions
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class MediaWikiTitleValueTest extends DataValueTest {
+
+   /**
+* @see DataValueTest::getClass
+*
+* @since 0.1
+*
+* @return string
+*/
+   public function getClass() {
+   return 'DataValues\MediaWikiTitleValue';
+   }
+
+   /**
+* @see DataValueTest::constructorProvider
+*
+* @since 0.1
+*
+* @return array
+*/
+   public function constructorProvider() {
+   $argLists = array();
+
+   $argLists[] = array( false );
+   $argLists[] = array( false, 42 );
+   $argLists[] = array( false, array() );
+   $argLists[] = array( false, false );
+   $argLists[] = array( false, true );
+   $argLists[] = array( false, null );
+   $argLists[] = array( false, 'foo' );
+   $argLists[] = array( false, '' );
+   $argLists[] = array( false, ' foo bar baz foo bar baz foo bar 
baz foo bar baz foo bar baz foo bar baz ' );
+
+   $argLists[] = array( true, \Title::newMainPage() );
+   $argLists[] = array( true, \Title::newFromText( 'Foobar' ) );
+
+   return $argLists;
+   }
+
+   /**
+* @dataProvider instanceProvider
+* @param \DataValues\MediaWikiTitleValue $titleValue
+* @param array $arguments
+*/
+   public fun

[MediaWiki-commits] [Gerrit] Mark feature files that are running at en.wikipedia.org - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: Mark feature files that are running at en.wikipedia.org
..


Mark feature files that are running at en.wikipedia.org

Bug: 47549
Change-Id: I61318fd44fd3cfa4535f0c16651db06da6bcae62
---
M docs/jobs.md
R features/create_account_readonly.feature
R features/math_readonly.feature
R features/page_triage_readonly.feature
R features/pdf_readonly.feature
R features/preferences_appearance_readonly.feature
6 files changed, 10 insertions(+), 5 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jobs.md b/docs/jobs.md
index da0505c..7641104 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -63,8 +63,8 @@
 
 
 
-# browsertests-en.wikipedia.org-linux-firefox
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci'
+# browsertests-en.wikipedia.org
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci'
 - MediaWiki URL: en.wikipedia.org
 
 
@@ -76,15 +76,15 @@
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie6-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie6-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie7-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie7-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/math.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature -n 5 --test-options '--profile ci 
--tags ~@ie8-bug'
+- bundle exec: parallel_cucumber features/*_readonly.feature -n 5 
--test-options '--profile ci --tags ~@ie8-bug'
 
 ## browsertests-en.wikipedia.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account.feature 
b/features/create_account_readonly.feature
similarity index 76%
rename from features/create_account.feature
rename to features/create_account_readonly.feature
index 051d869..e35c72f 100644
--- a/features/create_account.feature
+++ b/features/create_account_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/math.feature b/features/math_readonly.feature
similarity index 75%
rename from features/math.feature
rename to features/math_readonly.feature
index 6a31fba..55da755 100644
--- a/features/math.feature
+++ b/features/math_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: Math
 
   Scenario: Display simple math
diff --git a/features/page_triage.feature 
b/features/page_triage_readonly.feature
similarity index 85%
rename from features/page_triage.feature
rename to features/page_triage_readonly.feature
index e7873c1..c690b6e 100644
--- a/features/page_triage.feature
+++ b/features/page_triage_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: PageTriage
 
   Scenario: Check that NewPagesFeed has correct controls for anonymous user
diff --git a/features/pdf.feature b/features/pdf_readonly.feature
similarity index 72%
rename from features/pdf.feature
rename to features/pdf_readonly.feature
index 3422c2f..2f47f46 100644
--- a/features/pdf.feature
+++ b/features/pdf_readonly.feature
@@ -1,3 +1,4 @@
+# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
 Feature: PDF
 
   Scenario: Check for Download as PDF link
diff --git a/features/preferences_appearance.feature 
b/features/preferences_appearance_readonly.feature
similarity index 84%
rename from features/preferences_appearance.feature
rename to features/preferences_appearance_readonly.feature
index 419622c..1305b1e 100644
--- a/features/preferences_appearance.feature
+++ b/features/preferences_appeara

[MediaWiki-commits] [Gerrit] All Universal Language Selector feature files now start with... - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: All Universal Language Selector feature files now start with uls
..


All Universal Language Selector feature files now start with uls

Bug: 47830
Change-Id: I16ad642231ca8f323d69508d7e416e8b030ce44b
---
M docs/jobs.md
R features/uls.feature
R features/uls_accept_language.feature
3 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jobs.md b/docs/jobs.md
index 7641104..54d752f 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -92,9 +92,8 @@
 
 
 # browsertests-sandbox.translatewiki.net
-
+- bundle exec: parallel_cucumber features/create_account.feature 
features/uls*feature -n 4 --test-options '--profile ci'
 - MediaWiki URL: sandbox.translatewiki.net
-- bundle exec: parallel_cucumber features/create_account.feature 
features/uls_ime.feature features/universal_language_selector.feature -n 3 
--test-options '--profile ci'
 
 
 ## browsertests-sandbox.translatewiki.net-linux-chrome
@@ -102,7 +101,6 @@
 
 ## browsertests-sandbox.translatewiki.net-linux-firefox
 - Browser Label: firefox
-- bundle exec: parallel_cucumber features/accept_language.feature 
features/create_account.feature features/uls_ime.feature 
features/universal_language_selector.feature -n 4 --test-options '--profile ci'
 
 ## browsertests-sandbox.translatewiki.net-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
diff --git a/features/universal_language_selector.feature b/features/uls.feature
similarity index 72%
rename from features/universal_language_selector.feature
rename to features/uls.feature
index 8552780..2d3bf5f 100644
--- a/features/universal_language_selector.feature
+++ b/features/uls.feature
@@ -1,4 +1,4 @@
-Feature: ULS User language selector
+Feature: Universal Language Selector User language selector
 
   Scenario: Open Language selector
 Given I visit a random page
diff --git a/features/accept_language.feature 
b/features/uls_accept_language.feature
similarity index 100%
rename from features/accept_language.feature
rename to features/uls_accept_language.feature

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I16ad642231ca8f323d69508d7e416e8b030ce44b
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Updated README, how to use secret.yml and MEDIAWIKI_URL - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: Updated README, how to use secret.yml and MEDIAWIKI_URL
..


Updated README, how to use secret.yml and MEDIAWIKI_URL

Bug: 47865
Change-Id: I0db34da0319054590dc71da97e25eff37e72ba93
---
M README.md
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Karim.rayani: Looks good to me, but someone else must approve
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/README.md b/README.md
index 0650b25..7e72b40 100644
--- a/README.md
+++ b/README.md
@@ -4,18 +4,24 @@
 
 To run the Selenium tests you will have to install Ruby (look at 
`.ruby-version` file for the exact version), the latest versions of RubyGems 
and Firefox (the default browser in which the tests run). The easiest way to 
install Ruby on Linux/Unix is [RVM](https://rvm.io/) and on Windows 
[RubyInstaller](http://rubyinstaller.org/).
 
-Update RubyGems and install the required RubyGems:
+Clone the repository, `cd` into it, update RubyGems and install the required 
RubyGems:
 
 cd browsertests
 gem update --system
 gem install bundler
 bundle install
 
-You will need a file with credentials located at `/private/wmf/secret.yml`. 
For local testing, create a user named `Selenium_user` on your local wiki and 
record the password in this file as
+`secret.yml` file at `/private/wmf/` or `config/` is required for tests tagged 
`@login`. For local testing, create a user named `Selenium_user` on your local 
wiki and record the password in this file as
 
 mediawiki_password: password here
 
 Run the tests with `bundle exec rake`, this should start Firefox.
+
+By default the tests run at en.wikipedia.beta.wmflabs.org. If you want to run 
the tests elsewhere, you have to set `MEDIAWIKI_URL` environment variable. For 
example:
+
+export MEDIAWIKI_URL=http://commons.wikimedia.beta.wmflabs.org/wiki/ # 
Linux/Unix
+set MEDIAWIKI_URL=http://commons.wikimedia.beta.wmflabs.org/wiki/ # Windows
+
 The test run creates an HTML report in `reports/` and an XML report (for 
Jenkins) in `reports/junit`.
 
 To run a single test enter `bundle exec cucumber 
features/FEATURE_NAME.feature`.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0db34da0319054590dc71da97e25eff37e72ba93
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: Karim.rayani 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] New way of running tests at test2.wikipedia.org - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: New way of running tests at test2.wikipedia.org
..

New way of running tests at test2.wikipedia.org

Bug: 47266
Change-Id: I930fde6cb171864687d2e948bf5013695a73e1a5
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/file.feature
M features/guided_tour.feature
M features/login.feature
M features/math_readonly.feature
M features/page.feature
M features/page_edit.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/search.feature
M features/upload_wizard.feature
12 files changed, 15 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/82/61582/1

diff --git a/docs/jobs.md b/docs/jobs.md
index 6e33fbb..efb085a 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -118,7 +118,7 @@
 
 # browsertests-test2.wikipedia.org
 
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org'
 - MediaWiki URL: test2.wikipedia.org
 
 
@@ -130,15 +130,15 @@
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie6-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie7-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie8-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 093afde..77c7071 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index 652e911..2a179a2 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/guided_tour.feature b/features/guided_tour.feature
index 425ab9e..29589ae 100644
--- a/features/guided_tour.feature
+++ b/features/guided_tour.feature
@@ -1,3 +1,4 @@
+@test2.wikipedia.org
 Feature: Guided Tour
 
   Scenario: Check for Ready to Help guider
diff --git a/features/login.feature b/features/login.feature
index 229d091..20e4e9a 100644
--- a/features/login.feature
+++ b/features/login.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @test2.wikipedia.org
 Feature: Log in
 
   Backgrou

[MediaWiki-commits] [Gerrit] Move out classes dependent on MediaWiki - change (mediawiki...DataValues)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Move out classes dependent on MediaWiki
..

Move out classes dependent on MediaWiki

Change-Id: I5f2f4a5f0ecbe1a732fa99050df4b73fcd63edd3
---
M DataValues/DataValues.classes.php
M DataValues/DataValues.mw.php
D DataValues/includes/values/MediaWikiTitleValue.php
D DataValues/tests/includes/values/MediaWikiTitleValueTest.php
M ValueParsers/ValueParsers.mw.php
M ValueParsers/ValueParsers.php
D ValueParsers/includes/parsers/TitleParser.php
D ValueParsers/tests/includes/parsers/TitleParserTest.php
8 files changed, 0 insertions(+), 338 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/83/61583/1

diff --git a/DataValues/DataValues.classes.php 
b/DataValues/DataValues.classes.php
index d24aa0c..25d6917 100644
--- a/DataValues/DataValues.classes.php
+++ b/DataValues/DataValues.classes.php
@@ -32,7 +32,6 @@
'DataValues\IriValue' => 'includes/values/IriValue.php',
'DataValues\MonolingualTextValue' => 
'includes/values/MonolingualTextValue.php',
'DataValues\MultilingualTextValue' => 
'includes/values/MultilingualTextValue.php',
-   'DataValues\MediaWikiTitleValue' => 
'includes/values/MediaWikiTitleValue.php',
'DataValues\NumberValue' => 'includes/values/NumberValue.php',
'DataValues\PropertyValue' => 'includes/values/PropertyValue.php',
'DataValues\QuantityValue' => 'includes/values/QuantityValue.php',
diff --git a/DataValues/DataValues.mw.php b/DataValues/DataValues.mw.php
index dc461a8..1eda55d 100644
--- a/DataValues/DataValues.mw.php
+++ b/DataValues/DataValues.mw.php
@@ -70,7 +70,6 @@
'includes/values/BooleanValue',
'includes/values/GeoCoordinateValue',
'includes/values/IriValue',
-   'includes/values/MediaWikiTitleValue',
'includes/values/MonolingualTextValue',
'includes/values/MultilingualTextValue',
'includes/values/NumberValue',
diff --git a/DataValues/includes/values/MediaWikiTitleValue.php 
b/DataValues/includes/values/MediaWikiTitleValue.php
deleted file mode 100644
index df06917..000
--- a/DataValues/includes/values/MediaWikiTitleValue.php
+++ /dev/null
@@ -1,126 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @since 0.1
- *
- * @file
- * @ingroup DataValue
- *
- * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroended...@gmail.com >
- */
-class MediaWikiTitleValue extends DataValueObject {
-
-   /**
-* @since 0.1
-*
-* @var Title
-*/
-   protected $title;
-
-   /**
-* @since 0.1
-*
-* @param Title $title
-*
-* @throws InvalidArgumentException
-*/
-   public function __construct( Title $title ) {
-   $this->title = $title;
-   }
-
-   /**
-* @see Serializable::serialize
-*
-* @since 0.1
-*
-* @return string
-*/
-   public function serialize() {
-   return $this->title->getFullText();
-   }
-
-   /**
-* @see Serializable::unserialize
-*
-* @since 0.1
-*
-* @param string $value
-*
-* @return StringValue
-*/
-   public function unserialize( $value ) {
-   $this->__construct( Title::newFromText( $value ) );
-   }
-
-   /**
-* @see DataValue::getType
-*
-* @since 0.1
-*
-* @return string
-*/
-   public function getType() {
-   return 'mediawikititle';
-   }
-
-   /**
-* @see DataValue::getSortKey
-*
-* @since 0.1
-*
-* @return string|float|int
-*/
-   public function getSortKey() {
-   return $this->title->getCategorySortkey();
-   }
-
-   /**
-* Returns the Title object.
-* @see DataValue::getValue
-*
-* @since 0.1
-*
-* @return Title
-*/
-   public function getValue() {
-   return $this->title;
-   }
-
-   /**
-* Constructs a new instance of the DataValue from the provided data.
-* This can round-trip with @see getArrayValue
-*
-* @since 0.1
-*
-* @param mixed $data
-*
-* @return MediaWikiTitleValue
-*/
-   public static function newFromArray( $data ) {
-   return new static( $data );
-   }
-
-}
diff --git a/DataValues/tests/includes/values/MediaWikiTitleValueTest.php 
b/DataValues/tests/includes/values/MediaWikiTitleValueTest.php
deleted file mode 100644
index 239e481..000
--- a/DataValues/tests/includes/values/MediaWikiTitleValueTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-http://www.gnu.org/copyleft/gpl.html
- *
- * @file

[MediaWiki-commits] [Gerrit] moving diederik's seed file from the old repo - change (analytics/E3Analysis)

[Milimetric (Code Review)]

Milimetric has uploaded a new change for review.

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


Change subject: moving diederik's seed file from the old repo
..

moving diederik's seed file from the old repo

Change-Id: Iaf1d8fbe0d34af7b1bcded09a2aa04d6e88309a1
---
A scripts/seed.sql
1 file changed, 148 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/E3Analysis 
refs/changes/84/61584/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf1d8fbe0d34af7b1bcded09a2aa04d6e88309a1
Gerrit-PatchSet: 1
Gerrit-Project: analytics/E3Analysis
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] vector: Remove useless HTML comments from output - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: vector: Remove useless HTML comments from output
..


vector: Remove useless HTML comments from output

They pretty much just repeat the element ids and bloat the code.

Change-Id: I812b1a0456a623db0c32860ab46a332f4d349343
---
M skins/Vector.php
1 file changed, 0 insertions(+), 40 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/skins/Vector.php b/skins/Vector.php
index 0bdf2fb..d477c65 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -155,81 +155,52 @@
 ?>


-   


html( 'userlangattributes' ) ?>>
data['sitenotice'] ) { ?>
-   
html( 'sitenotice' ) 
?>
-   

-   
html( 'title' ) 
?>
-   
-   

data['isarticle'] ) { ?>
-   
msg( 'tagline' ) 
?>
-   

-   
html( 
'userlangattributes' ) ?>>html( 'subtitle' ) ?>
-   
data['undelete'] ) { ?>
-   
html( 
'undelete' ) ?>
-   

data['newtalk'] ) { ?>
-   
html( 
'newtalk' ) ?>
-   

data['showjumplinks'] ) { ?>
-   

msg( 'jumpto' ) ?>
msg( 'jumptonavigation' ) ?>msg( 'comma-separator' ) ?>
msg( 
'jumptosearch' ) ?>

-   

-   
html( 'bodycontent' ) ?>
-   
data['printfooter'] ) { ?>
-   

html( 'printfooter' ); ?>

-   

data['catlinks'] ) { ?>
-   
html( 'catlinks' ); ?>
-   

data['dataAfterContent'] ) { 
?>
-   
html( 'dataAfterContent' ); ?>
-   


-   
html( 'debughtml' ); ?>
-   

-   

-   

msg( 'navigation-heading' ) ?>
-   

renderNavigation( 'PERSONAL' ); ?>

@@ -239,17 +210,11 @@
renderNavigation( array( 
'VIEWS', 'ACTIONS', 'SEARCH' ) ); ?>


-   
-   

-   
>
-   
renderPortals( 
$this->data['sidebar'] ); ?>

-   

-   
html( 
'userlangattributes' ) ?>>
getFooterLinks() as $category => 
$links ) { ?>

@@ -273,7 +238,6 @@



-   
printTrail(); ?>
 

@@ -303,7 +267,6 @@
continue;
}
 
-   echo "\n\n";
switch ( $name ) {
case 'SEARCH':
break;
@@ -319,7 +282,6 @@
$this->renderPortal( $name, $content );
break;
}
-   echo "\n\n";
}
}
 
@@ -381,7 

[MediaWiki-commits] [Gerrit] Remove spurious 'h7' in commonPrint.css - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Remove spurious 'h7' in commonPrint.css
..


Remove spurious 'h7' in commonPrint.css

There is no such element, silly.

Change-Id: I0a58278c1d2ff97463eddc15c701193cfd25757e
---
M skins/common/commonPrint.css
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 9b6d6ef..9ea89d9 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -353,7 +353,7 @@
 .wikitable, .thumb, img {
page-break-inside: avoid;
 }
-h2, h3, h4, h5, h6, h7 {
+h2, h3, h4, h5, h6 {
page-break-after: avoid;
 }
 p {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a58278c1d2ff97463eddc15c701193cfd25757e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Waldir 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] pages: Refactored, exctracted duplicate code to URL module - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: pages: Refactored, exctracted duplicate code to URL module
..


pages: Refactored, exctracted duplicate code to URL module

Bug: 47657
Change-Id: Iafe6906c8b4c7ebf9ad8c65961797d65d996e87b
---
A features/support/modules/url_module.rb
M features/support/pages/aftv5_page.rb
M features/support/pages/appearance_page.rb
M features/support/pages/article_page.rb
M features/support/pages/create_account_page.rb
M features/support/pages/describe_page.rb
M features/support/pages/does_not_exist_page.rb
M features/support/pages/file_does_not_exist_page.rb
M features/support/pages/learn_page.rb
M features/support/pages/login_page.rb
M features/support/pages/main_page.rb
M features/support/pages/page_triage_page.rb
M features/support/pages/preferences_page.rb
M features/support/pages/random_page.rb
M features/support/pages/release_rights_page.rb
M features/support/pages/upload_page.rb
M features/support/pages/upload_wizard_page.rb
M features/support/pages/use_page.rb
18 files changed, 44 insertions(+), 153 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/features/support/modules/url_module.rb 
b/features/support/modules/url_module.rb
new file mode 100644
index 000..6268546
--- /dev/null
+++ b/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://en.wikipedia.beta.wmflabs.org/wiki/'
+end
+"#{mediawiki_url}#{name}"
+  end
+end
diff --git a/features/support/pages/aftv5_page.rb 
b/features/support/pages/aftv5_page.rb
index 27efa69..08d68ab 100644
--- a/features/support/pages/aftv5_page.rb
+++ b/features/support/pages/aftv5_page.rb
@@ -1,15 +1,8 @@
 class AFTv5Page
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Aftpage"
-  end
-  page_url url
+  include URL
+  page_url URL.url('Aftpage')
 
   div(:aft_box, id: 'mw-articlefeedbackv5')
   a(:all_comments, text: /All comments/)
diff --git a/features/support/pages/appearance_page.rb 
b/features/support/pages/appearance_page.rb
index e43c007..6d5c05d 100644
--- a/features/support/pages/appearance_page.rb
+++ b/features/support/pages/appearance_page.rb
@@ -1,15 +1,8 @@
 class AppearancePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Special:Preferences#mw-prefsection-rendering"
-  end
-  page_url url
+  include URL
+  page_url URL.url('Special:Preferences#mw-prefsection-rendering')
 
   radio_button(:always_render_radio, id: 'mw-input-wpmath-0')
   checkbox(:auto_number_check, id: 'mw-input-wpnumberheadings')
diff --git a/features/support/pages/article_page.rb 
b/features/support/pages/article_page.rb
index 5fe20b8..13abc8a 100644
--- a/features/support/pages/article_page.rb
+++ b/features/support/pages/article_page.rb
@@ -1,15 +1,8 @@
 class ArticlePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}<%=params[:page_name]%>"
-  end
-  page_url url
+  include URL
+  page_url URL.url('<%=params[:page_name]%>')
 
   a(:discussion, text: 'Discussion')
   a(:edit, text: 'Edit')
diff --git a/features/support/pages/create_account_page.rb 
b/features/support/pages/create_account_page.rb
index 3636617..d2d655c 100644
--- a/features/support/pages/create_account_page.rb
+++ b/features/support/pages/create_account_page.rb
@@ -1,15 +1,8 @@
 class CreateAccountPage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}<%=params[:page_title]%>"
-  end
-  page_url url
+  include URL
+  page_url URL.url('<%=params[:page_title]%>')
 
   button(:create_account, id: 'wpCreateaccount')
 end
diff --git a/features/support/pages/describe_page.rb 
b/features/support/pages/describe_page.rb
index 53c56e5..dc5964d 100644
--- a/features/support/pages/describe_page.rb
+++ b/features/support/pages/describe_page.rb
@@ -1,15 +1,8 @@
 class DescribePage
   include PageObject
 
-  def self.url
-if ENV['MEDIAWIKI_URL']
-  mediawiki_url = ENV['MEDIAWIKI_URL']
-else
-  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
-end
-"#{mediawiki_url}Special:UploadWizard"
-  end
-  page_url url
+  include URL
+  page_url URL.url('Special:UploadWizard')

[MediaWiki-commits] [Gerrit] Added standalone test runner for DataValues and removed some... - change (mediawiki...DataValues)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Added standalone test runner for DataValues and removed some 
dependencies on MW from the tests
..

Added standalone test runner for DataValues and removed some dependencies on MW 
from the tests

Change-Id: Ia69964d1f697fa581ab266a3e71f4dc81b8117b8
---
M DataValues/DataValues.classes.php
M DataValues/DataValues.mw.php
R DataValues/tests/phpunit/includes/DataValueFactoryTest.php
R DataValues/tests/phpunit/includes/DataValueTest.php
R DataValues/tests/phpunit/includes/values/BooleanValueTest.php
R DataValues/tests/phpunit/includes/values/GeoCoordinateValueTest.php
R DataValues/tests/phpunit/includes/values/IriValueTest.php
R DataValues/tests/phpunit/includes/values/MonolingualTextValueTest.php
R DataValues/tests/phpunit/includes/values/MultilingualTextValueTest.php
R DataValues/tests/phpunit/includes/values/NumberValueTest.php
R DataValues/tests/phpunit/includes/values/PropertyValueTest.php
R DataValues/tests/phpunit/includes/values/QuantityValueTest.php
R DataValues/tests/phpunit/includes/values/StringValueTest.php
R DataValues/tests/phpunit/includes/values/TimeValueTest.php
R DataValues/tests/phpunit/includes/values/UnknownValueTest.php
A DataValues/tests/phpunit/phpunit.php
16 files changed, 41 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/85/61585/1

diff --git a/DataValues/DataValues.classes.php 
b/DataValues/DataValues.classes.php
index 25d6917..3be6c88 100644
--- a/DataValues/DataValues.classes.php
+++ b/DataValues/DataValues.classes.php
@@ -48,5 +48,5 @@
'Hashable' => 'includes/Hashable.php',
'Immutable' => 'includes/Immutable.php',
 
-   'DataValues\Test\DataValueTest' => 'tests/includes/DataValueTest.php',
+   'DataValues\Test\DataValueTest' => 
'tests/phpunit/includes/DataValueTest.php',
 );
diff --git a/DataValues/DataValues.mw.php b/DataValues/DataValues.mw.php
index 1eda55d..1d41ae5 100644
--- a/DataValues/DataValues.mw.php
+++ b/DataValues/DataValues.mw.php
@@ -83,7 +83,7 @@
);
 
foreach ( $testFiles as $file ) {
-   $files[] = __DIR__ . '/tests/' . $file . 'Test.php';
+   $files[] = __DIR__ . '/tests/phpunit/' . $file . 'Test.php';
}
 
return true;
diff --git a/DataValues/tests/includes/DataValueFactoryTest.php 
b/DataValues/tests/phpunit/includes/DataValueFactoryTest.php
similarity index 94%
rename from DataValues/tests/includes/DataValueFactoryTest.php
rename to DataValues/tests/phpunit/includes/DataValueFactoryTest.php
index c89a4ea..d596363 100644
--- a/DataValues/tests/includes/DataValueFactoryTest.php
+++ b/DataValues/tests/phpunit/includes/DataValueFactoryTest.php
@@ -32,7 +32,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-class DataValuesFactoryTest extends \MediaWikiTestCase {
+class DataValuesFactoryTest extends \PHPUnit_Framework_TestCase {
 
public function testSingleton() {
$instance = DataValueFactory::singleton();
@@ -60,7 +60,7 @@
$factory->registerDataValue( 'string', 'DataValues\StringValue' 
);
$factory->registerDataValue( 'number', 'DataValues\NumberValue' 
);
 
-   $this->assertArrayEquals( array( 'string', 'number' ), 
$factory->getDataValues() );
+   $this->assertEquals( array( 'string', 'number' ), 
$factory->getDataValues() );
 
$factory->registerDataValue( 'number', 'DataValues\StringValue' 
);
 
diff --git a/DataValues/tests/includes/DataValueTest.php 
b/DataValues/tests/phpunit/includes/DataValueTest.php
similarity index 98%
rename from DataValues/tests/includes/DataValueTest.php
rename to DataValues/tests/phpunit/includes/DataValueTest.php
index 9738482..8c7436a 100644
--- a/DataValues/tests/includes/DataValueTest.php
+++ b/DataValues/tests/phpunit/includes/DataValueTest.php
@@ -30,7 +30,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-abstract class DataValueTest extends \MediaWikiTestCase {
+abstract class DataValueTest extends \PHPUnit_Framework_TestCase {
 
/**
 * Returns the name of the concrete class tested by this test.
diff --git a/DataValues/tests/includes/values/BooleanValueTest.php 
b/DataValues/tests/phpunit/includes/values/BooleanValueTest.php
similarity index 100%
rename from DataValues/tests/includes/values/BooleanValueTest.php
rename to DataValues/tests/phpunit/includes/values/BooleanValueTest.php
diff --git a/DataValues/tests/includes/values/GeoCoordinateValueTest.php 
b/DataValues/tests/phpunit/includes/values/GeoCoordinateValueTest.php
similarity index 95%
rename from DataValues/tests/includes/values/GeoCoordinateValueTest.php
rename to DataValues/tests/phpunit/includes/values/GeoCoordinateValueTest.php
index 8eef8e7..e655b

[MediaWiki-commits] [Gerrit] Added DmsCoordinateParser - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Added DmsCoordinateParser
..


Added DmsCoordinateParser

Change-Id: If5cf6004f67dad1424e82a9f0164005af3dc45cc
---
M ValueParsers/ValueParsers.classes.php
M ValueParsers/ValueParsers.mw.php
A ValueParsers/includes/parsers/DmsCoordinateParser.php
A ValueParsers/tests/includes/parsers/DmsCoordinateParserTest.php
4 files changed, 375 insertions(+), 0 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/ValueParsers.classes.php 
b/ValueParsers/ValueParsers.classes.php
index 7094f54..088459b 100644
--- a/ValueParsers/ValueParsers.classes.php
+++ b/ValueParsers/ValueParsers.classes.php
@@ -37,6 +37,7 @@
'ValueParsers\ApiParseValue' => 'includes/api/ApiParseValue.php',
 
'ValueParsers\BoolParser' => 'includes/parsers/BoolParser.php',
+   'ValueParsers\DmsCoordinateParser' => 
'includes/parsers/DmsCoordinateParser.php',
'ValueParsers\GeoCoordinateParser' => 
'includes/parsers/GeoCoordinateParser.php',
'ValueParsers\FloatParser' => 'includes/parsers/FloatParser.php',
'ValueParsers\IntParser' => 'includes/parsers/IntParser.php',
diff --git a/ValueParsers/ValueParsers.mw.php b/ValueParsers/ValueParsers.mw.php
index 9d91a75..5f3538e 100644
--- a/ValueParsers/ValueParsers.mw.php
+++ b/ValueParsers/ValueParsers.mw.php
@@ -69,6 +69,7 @@
'includes/api/ApiParseValue',
 
'includes/parsers/BoolParser',
+   'includes/parsers/DmsCoordinateParser',
'includes/parsers/GeoCoordinateParser',
'includes/parsers/FloatParser',
'includes/parsers/IntParser',
diff --git a/ValueParsers/includes/parsers/DmsCoordinateParser.php 
b/ValueParsers/includes/parsers/DmsCoordinateParser.php
new file mode 100644
index 000..ba9f0ef
--- /dev/null
+++ b/ValueParsers/includes/parsers/DmsCoordinateParser.php
@@ -0,0 +1,273 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup ValueParsers
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DmsCoordinateParser extends StringValueParser {
+
+   /**
+* The symbols representing the different directions for usage in 
directional notation.
+* @since 0.1
+*/
+   const OPT_NORTH_SYMBOL = 'north';
+   const OPT_EAST_SYMBOL = 'east';
+   const OPT_SOUTH_SYMBOL = 'south';
+   const OPT_WEST_SYMBOL = 'west';
+
+   /**
+* The symbols representing degrees, minutes and seconds.
+* @since 0.1
+*/
+   const OPT_DEGREE_SYMBOL = 'degree';
+   const OPT_MINUTE_SYMBOL = 'minute';
+   const OPT_SECOND_SYMBOL = 'second';
+
+   /**
+* The symbol to use as separator between latitude and longitude.
+* @since 0.1
+*/
+   const OPT_SEPARATOR_SYMBOL = 'separator';
+
+   /**
+* @since 0.1
+*
+* @param ParserOptions|null $options
+*/
+   public function __construct( ParserOptions $options = null ) {
+   parent::__construct( $options );
+
+   $this->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
+   $this->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
+   $this->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
+   $this->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
+
+   $this->defaultOption( self::OPT_DEGREE_SYMBOL, '°' );
+   $this->defaultOption( self::OPT_MINUTE_SYMBOL, "'" );
+   $this->defaultOption( self::OPT_SECOND_SYMBOL, '"' );
+
+   $this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+   }
+
+   /**
+* @see StringValueParser::stringParse
+*
+* @since 0.1
+*
+* @param string $value
+*
+* @return GeoCoordinateValue
+* @throws ParseException
+* @throws LogicException
+*/
+   protected function stringParse( $value ) {
+   $value = $this->getNormalizedNotation( $value );
+
+   if ( !$this->areDMSCoordinates( $value ) ) {
+   throw new ParseException( 'Not a geographical 
coordinate in DMS format' );
+   }
+
+   $coordinates = explode( $this->getOption( 
self::OPT_SEPARATOR_SYMBOL ), $value );
+
+   if ( count( $coordinates ) !== 2 ) {
+   throw new LogicException( 'A coordinates string with an 
incorrect segment count has made it through validation' );
+   }
+
+   list( $latitude, $longitude ) = $coordinates;
+
+   $latitude = $this->getParsedCoordinate( $latitude );
+   $longitude = $this->getParsedCoordinate( $longitude );
+
+   return new GeoCoordinateValue( $latitude, $longitude );
+  

[MediaWiki-commits] [Gerrit] Fixed upload wizard tests - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: Fixed upload wizard tests
..


Fixed upload wizard tests

Change-Id: Ic86383e950311c427a7d61123e6b253f447f40e2
---
M features/support/pages/describe_page.rb
M features/support/pages/release_rights_page.rb
M features/support/pages/upload_page.rb
M features/support/pages/upload_wizard_page.rb
M features/support/pages/use_page.rb
5 files changed, 20 insertions(+), 5 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/features/support/pages/describe_page.rb 
b/features/support/pages/describe_page.rb
index dc5964d..e6e5c83 100644
--- a/features/support/pages/describe_page.rb
+++ b/features/support/pages/describe_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   textarea(:description, name: /^description/)
   div(:next_parent, id: 'mwe-upwiz-stepdiv-details')
diff --git a/features/support/pages/release_rights_page.rb 
b/features/support/pages/release_rights_page.rb
index 9b86cf2..79561c4 100644
--- a/features/support/pages/release_rights_page.rb
+++ b/features/support/pages/release_rights_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   radio(:my_own_work, id: 'deedChooser1-ownwork')
   div(:next_parent, id: 'mwe-upwiz-stepdiv-deeds')
diff --git a/features/support/pages/upload_page.rb 
b/features/support/pages/upload_page.rb
index 7c43b3c..533c866 100644
--- a/features/support/pages/upload_page.rb
+++ b/features/support/pages/upload_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   span(:continue, text: 'Continue')
   file_field(:select_file, name: 'file')
diff --git a/features/support/pages/upload_wizard_page.rb 
b/features/support/pages/upload_wizard_page.rb
index b864852..f6ef6ff 100644
--- a/features/support/pages/upload_wizard_page.rb
+++ b/features/support/pages/upload_wizard_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   text_field(:add_categories, id: 'categories0')
   text_field(:altitude, id: 'location-altitude0')
diff --git a/features/support/pages/use_page.rb 
b/features/support/pages/use_page.rb
index 385c3fc..14ef8fe 100644
--- a/features/support/pages/use_page.rb
+++ b/features/support/pages/use_page.rb
@@ -2,7 +2,10 @@
   include PageObject
 
   include URL
-  page_url URL.url('Special:UploadWizard')
+  def self.url
+URL.url('Special:UploadWizard')
+  end
+  page_url url
 
   span(:upload_more_files, text: 'Upload more files')
 end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic86383e950311c427a7d61123e6b253f447f40e2
Gerrit-PatchSet: 3
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Added FloatCoordinateParser - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Added FloatCoordinateParser
..


Added FloatCoordinateParser

Change-Id: I569a5d563fb3c297af2041fceed7d8593f6935c7
---
M ValueParsers/ValueParsers.classes.php
M ValueParsers/ValueParsers.mw.php
A ValueParsers/includes/parsers/FloatCoordinateParser.php
M ValueParsers/tests/includes/parsers/DmsCoordinateParserTest.php
A ValueParsers/tests/includes/parsers/FloatCoordinateParserTest.php
5 files changed, 286 insertions(+), 2 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/ValueParsers.classes.php 
b/ValueParsers/ValueParsers.classes.php
index 088459b..a93708b 100644
--- a/ValueParsers/ValueParsers.classes.php
+++ b/ValueParsers/ValueParsers.classes.php
@@ -38,6 +38,7 @@
 
'ValueParsers\BoolParser' => 'includes/parsers/BoolParser.php',
'ValueParsers\DmsCoordinateParser' => 
'includes/parsers/DmsCoordinateParser.php',
+   'ValueParsers\FloatCoordinateParser' => 
'includes/parsers/FloatCoordinateParser.php',
'ValueParsers\GeoCoordinateParser' => 
'includes/parsers/GeoCoordinateParser.php',
'ValueParsers\FloatParser' => 'includes/parsers/FloatParser.php',
'ValueParsers\IntParser' => 'includes/parsers/IntParser.php',
diff --git a/ValueParsers/ValueParsers.mw.php b/ValueParsers/ValueParsers.mw.php
index 5f3538e..3fdf2da 100644
--- a/ValueParsers/ValueParsers.mw.php
+++ b/ValueParsers/ValueParsers.mw.php
@@ -70,6 +70,7 @@
 
'includes/parsers/BoolParser',
'includes/parsers/DmsCoordinateParser',
+   'includes/parsers/FloatCoordinateParser',
'includes/parsers/GeoCoordinateParser',
'includes/parsers/FloatParser',
'includes/parsers/IntParser',
diff --git a/ValueParsers/includes/parsers/FloatCoordinateParser.php 
b/ValueParsers/includes/parsers/FloatCoordinateParser.php
new file mode 100644
index 000..d6041eb
--- /dev/null
+++ b/ValueParsers/includes/parsers/FloatCoordinateParser.php
@@ -0,0 +1,186 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup ValueParsers
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class FloatCoordinateParser extends StringValueParser {
+
+   /**
+* The symbols representing the different directions for usage in 
directional notation.
+* @since 0.1
+*/
+   const OPT_NORTH_SYMBOL = 'north';
+   const OPT_EAST_SYMBOL = 'east';
+   const OPT_SOUTH_SYMBOL = 'south';
+   const OPT_WEST_SYMBOL = 'west';
+
+   /**
+* The symbol to use as separator between latitude and longitude.
+* @since 0.1
+*/
+   const OPT_SEPARATOR_SYMBOL = 'separator';
+
+   /**
+* @since 0.1
+*
+* @param ParserOptions|null $options
+*/
+   public function __construct( ParserOptions $options = null ) {
+   parent::__construct( $options );
+
+   $this->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
+   $this->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
+   $this->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
+   $this->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
+
+   $this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+   }
+
+   /**
+* @see StringValueParser::stringParse
+*
+* @since 0.1
+*
+* @param string $value
+*
+* @return GeoCoordinateValue
+* @throws ParseException
+* @throws LogicException
+*/
+   protected function stringParse( $value ) {
+   $value = $this->removeInvalidChars( $value );
+
+   if ( !$this->areFloatCoordinates( $value ) ) {
+   throw new ParseException( 'Not a geographical 
coordinate in float format' );
+   }
+
+   $coordinates = explode( $this->getOption( 
self::OPT_SEPARATOR_SYMBOL ), $value );
+
+   if ( count( $coordinates ) !== 2 ) {
+   throw new LogicException( 'A coordinates string with an 
incorrect segment count has made it through validation' );
+   }
+
+   list( $latitude, $longitude ) = $coordinates;
+
+   $latitude = $this->getParsedCoordinate( $latitude );
+   $longitude = $this->getParsedCoordinate( $longitude );
+
+   $coordinate = new GeoCoordinateValue( $latitude, $longitude );
+
+   return $coordinate;
+   }
+
+   /**
+* Parsers a single coordinate (either latitude or longitude) and 
returns it as a float.
+*
+* @since 0.1
+*
+* @param string $coordinate
+*
+* @return float
+*/
+   protected function getParsedCoordinate( $coor

[MediaWiki-commits] [Gerrit] New way of running tests at commons.wikimedia.beta.wmflabs.org - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: New way of running tests at commons.wikimedia.beta.wmflabs.org
..


New way of running tests at commons.wikimedia.beta.wmflabs.org

Bug: 47266
Change-Id: I77b189137498c687953192e8c7a887fa1069c65e
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/file.feature
M features/login.feature
M features/search.feature
M features/upload_wizard.feature
6 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jobs.md b/docs/jobs.md
index 54d752f..8ef6ebd 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -9,7 +9,7 @@
 # browsertests-commons.wikimedia.beta.wmflabs.org
 
 - MediaWiki URL: commons.wikimedia.beta.wmflabs.org
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org'
 
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-linux-chrome
@@ -20,15 +20,15 @@
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie6-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie7-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/login.feature features/search.feature 
features/upload_wizard.feature -n 5 --test-options '--profile ci --tags 
~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 5 --test-options '--profile ci 
--tags @commons.wikimedia.beta.wmflabs.org --tags ~@ie8-bug'
 
 ## browsertests-commons.wikimedia.beta.wmflabs.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index e35c72f..8577db9 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,4 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index b64730e..3addc39 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/login.feature b/features/login.feature
index 5cf6e53..229d091 100644
--- a/features/login.feature
+++ b/features/login.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: Log in
 
   Background:
diff --git a/features/search.feature b/features/search.feature
index a73ce75..7278b13 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -1,3 +1,4 @@
+@commons.wikimedia.beta.wmflabs.org
 Feature: Search
 
   Scenario: Search suggestions
diff --git a/features/upload_wizard.feature b/features/upload_wizard.feature
index d67eda9..706f92e 100644
--- a/features/upload_wizard.feature
+++ b/features/upload_wizard.feature
@@ -1,4 +1,4 @@
-@login
+@commons.wikimedia.beta.wmflabs.org @login
 Feature: UploadWizard
 
   Background:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I77b189137498c687953192e8c7a887fa1069c65e
Gerrit-PatchSet: 3
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Added DmCoordinateParser - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Added DmCoordinateParser
..


Added DmCoordinateParser

Change-Id: Icef0d92110a62f535048e079a18920d4c1b0b554
---
M ValueParsers/ValueParsers.classes.php
M ValueParsers/ValueParsers.mw.php
A ValueParsers/includes/parsers/DmCoordinateParser.php
A ValueParsers/tests/includes/parsers/DmCoordinateParserTest.php
4 files changed, 341 insertions(+), 0 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/ValueParsers.classes.php 
b/ValueParsers/ValueParsers.classes.php
index a93708b..922b140 100644
--- a/ValueParsers/ValueParsers.classes.php
+++ b/ValueParsers/ValueParsers.classes.php
@@ -37,6 +37,7 @@
'ValueParsers\ApiParseValue' => 'includes/api/ApiParseValue.php',
 
'ValueParsers\BoolParser' => 'includes/parsers/BoolParser.php',
+   'ValueParsers\DmCoordinateParser' => 
'includes/parsers/DmCoordinateParser.php',
'ValueParsers\DmsCoordinateParser' => 
'includes/parsers/DmsCoordinateParser.php',
'ValueParsers\FloatCoordinateParser' => 
'includes/parsers/FloatCoordinateParser.php',
'ValueParsers\GeoCoordinateParser' => 
'includes/parsers/GeoCoordinateParser.php',
diff --git a/ValueParsers/ValueParsers.mw.php b/ValueParsers/ValueParsers.mw.php
index 3fdf2da..1efbd51 100644
--- a/ValueParsers/ValueParsers.mw.php
+++ b/ValueParsers/ValueParsers.mw.php
@@ -69,6 +69,7 @@
'includes/api/ApiParseValue',
 
'includes/parsers/BoolParser',
+   'includes/parsers/DmCoordinateParser',
'includes/parsers/DmsCoordinateParser',
'includes/parsers/FloatCoordinateParser',
'includes/parsers/GeoCoordinateParser',
diff --git a/ValueParsers/includes/parsers/DmCoordinateParser.php 
b/ValueParsers/includes/parsers/DmCoordinateParser.php
new file mode 100644
index 000..ac4e80e
--- /dev/null
+++ b/ValueParsers/includes/parsers/DmCoordinateParser.php
@@ -0,0 +1,245 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup ValueParsers
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DmCoordinateParser extends StringValueParser {
+
+   /**
+* The symbols representing the different directions for usage in 
directional notation.
+* @since 0.1
+*/
+   const OPT_NORTH_SYMBOL = 'north';
+   const OPT_EAST_SYMBOL = 'east';
+   const OPT_SOUTH_SYMBOL = 'south';
+   const OPT_WEST_SYMBOL = 'west';
+
+   /**
+* The symbols representing degrees, minutes and seconds.
+* @since 0.1
+*/
+   const OPT_DEGREE_SYMBOL = 'degree';
+   const OPT_MINUTE_SYMBOL = 'minute';
+
+   /**
+* The symbol to use as separator between latitude and longitude.
+* @since 0.1
+*/
+   const OPT_SEPARATOR_SYMBOL = 'separator';
+
+   /**
+* @since 0.1
+*
+* @param ParserOptions|null $options
+*/
+   public function __construct( ParserOptions $options = null ) {
+   parent::__construct( $options );
+
+   $this->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
+   $this->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
+   $this->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
+   $this->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
+
+   $this->defaultOption( self::OPT_DEGREE_SYMBOL, '°' );
+   $this->defaultOption( self::OPT_MINUTE_SYMBOL, "'" );
+
+   $this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+   }
+
+   /**
+* @see StringValueParser::stringParse
+*
+* @since 0.1
+*
+* @param string $value
+*
+* @return GeoCoordinateValue
+* @throws ParseException
+* @throws LogicException
+*/
+   protected function stringParse( $value ) {
+   $value = $this->getNormalizedNotation( $value );
+
+   if ( !$this->areDMCoordinates( $value ) ) {
+   throw new ParseException( 'Not a geographical 
coordinate in DM format' );
+   }
+
+   $coordinates = explode( $this->getOption( 
self::OPT_SEPARATOR_SYMBOL ), $value );
+
+   if ( count( $coordinates ) !== 2 ) {
+   throw new LogicException( 'A coordinates string with an 
incorrect segment count has made it through validation' );
+   }
+
+   list( $latitude, $longitude ) = $coordinates;
+
+   $latitude = $this->getParsedCoordinate( $latitude );
+   $longitude = $this->getParsedCoordinate( $longitude );
+
+   return new GeoCoordinateValue( $latitude, $longitude );
+   }
+
+   /**
+* Parsers a single coordinate (either l

[MediaWiki-commits] [Gerrit] Added DdCoordinateParser - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Added DdCoordinateParser
..


Added DdCoordinateParser

Change-Id: I8ba120f111775885e350adc3c65c4d556844bf2c
---
M ValueParsers/ValueParsers.classes.php
M ValueParsers/ValueParsers.mw.php
A ValueParsers/includes/parsers/DdCoordinateParser.php
A ValueParsers/tests/includes/parsers/DdCoordinateParserTest.php
M ValueParsers/tests/includes/parsers/DmCoordinateParserTest.php
M ValueParsers/tests/includes/parsers/DmsCoordinateParserTest.php
M ValueParsers/tests/includes/parsers/FloatCoordinateParserTest.php
7 files changed, 324 insertions(+), 3 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/ValueParsers.classes.php 
b/ValueParsers/ValueParsers.classes.php
index 922b140..f14bc3f 100644
--- a/ValueParsers/ValueParsers.classes.php
+++ b/ValueParsers/ValueParsers.classes.php
@@ -37,6 +37,7 @@
'ValueParsers\ApiParseValue' => 'includes/api/ApiParseValue.php',
 
'ValueParsers\BoolParser' => 'includes/parsers/BoolParser.php',
+   'ValueParsers\DdCoordinateParser' => 
'includes/parsers/DdCoordinateParser.php',
'ValueParsers\DmCoordinateParser' => 
'includes/parsers/DmCoordinateParser.php',
'ValueParsers\DmsCoordinateParser' => 
'includes/parsers/DmsCoordinateParser.php',
'ValueParsers\FloatCoordinateParser' => 
'includes/parsers/FloatCoordinateParser.php',
diff --git a/ValueParsers/ValueParsers.mw.php b/ValueParsers/ValueParsers.mw.php
index 1efbd51..143c6a2 100644
--- a/ValueParsers/ValueParsers.mw.php
+++ b/ValueParsers/ValueParsers.mw.php
@@ -69,6 +69,7 @@
'includes/api/ApiParseValue',
 
'includes/parsers/BoolParser',
+   'includes/parsers/DdCoordinateParser',
'includes/parsers/DmCoordinateParser',
'includes/parsers/DmsCoordinateParser',
'includes/parsers/FloatCoordinateParser',
diff --git a/ValueParsers/includes/parsers/DdCoordinateParser.php 
b/ValueParsers/includes/parsers/DdCoordinateParser.php
new file mode 100644
index 000..f14203f
--- /dev/null
+++ b/ValueParsers/includes/parsers/DdCoordinateParser.php
@@ -0,0 +1,224 @@
+http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.1
+ *
+ * @file
+ * @ingroup ValueParsers
+ *
+ * @licence GNU GPL v2+
+ * @author Jeroen De Dauw < jeroended...@gmail.com >
+ */
+class DdCoordinateParser extends StringValueParser {
+
+   /**
+* The symbols representing the different directions for usage in 
directional notation.
+* @since 0.1
+*/
+   const OPT_NORTH_SYMBOL = 'north';
+   const OPT_EAST_SYMBOL = 'east';
+   const OPT_SOUTH_SYMBOL = 'south';
+   const OPT_WEST_SYMBOL = 'west';
+
+   /**
+* The symbols representing degrees, minutes and seconds.
+* @since 0.1
+*/
+   const OPT_DEGREE_SYMBOL = 'degree';
+
+   /**
+* The symbol to use as separator between latitude and longitude.
+* @since 0.1
+*/
+   const OPT_SEPARATOR_SYMBOL = 'separator';
+
+   /**
+* @since 0.1
+*
+* @param ParserOptions|null $options
+*/
+   public function __construct( ParserOptions $options = null ) {
+   parent::__construct( $options );
+
+   $this->defaultOption( self::OPT_NORTH_SYMBOL, 'N' );
+   $this->defaultOption( self::OPT_EAST_SYMBOL, 'E' );
+   $this->defaultOption( self::OPT_SOUTH_SYMBOL, 'S' );
+   $this->defaultOption( self::OPT_WEST_SYMBOL, 'W' );
+
+   $this->defaultOption( self::OPT_DEGREE_SYMBOL, '°' );
+
+   $this->defaultOption( self::OPT_SEPARATOR_SYMBOL, ',' );
+   }
+
+   /**
+* @see StringValueParser::stringParse
+*
+* @since 0.1
+*
+* @param string $value
+*
+* @return GeoCoordinateValue
+* @throws ParseException
+* @throws LogicException
+*/
+   protected function stringParse( $value ) {
+   $value = $this->getNormalizedNotation( $value );
+
+   if ( !$this->areDDCoordinates( $value ) ) {
+   throw new ParseException( 'Not a geographical 
coordinate in DD format' );
+   }
+
+   $coordinates = explode( $this->getOption( 
self::OPT_SEPARATOR_SYMBOL ), $value );
+
+   if ( count( $coordinates ) !== 2 ) {
+   throw new LogicException( 'A coordinates string with an 
incorrect segment count has made it through validation' );
+   }
+
+   list( $latitude, $longitude ) = $coordinates;
+
+   $latitude = $this->getParsedCoordinate( $latitude );
+   $longitude = $this->getParsedCoordinate( $longitude );
+
+   return new GeoCoordinateValue( $latitude, $lon

[MediaWiki-commits] [Gerrit] Remove parsing logic from GeoCoordinateParser and use new fo... - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Remove parsing logic from GeoCoordinateParser and use new 
format specific parsers
..


Remove parsing logic from GeoCoordinateParser and use new format specific 
parsers

Later need to figure out what to do with this class; probably want to take the 
sub
parsers in the constructor

Change-Id: I30788a3378da3ab3c601c44e5ae0e3c2ad8c80ec
---
M ValueParsers/includes/parsers/GeoCoordinateParser.php
1 file changed, 15 insertions(+), 315 deletions(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/includes/parsers/GeoCoordinateParser.php 
b/ValueParsers/includes/parsers/GeoCoordinateParser.php
index a988a24..50e62ad 100644
--- a/ValueParsers/includes/parsers/GeoCoordinateParser.php
+++ b/ValueParsers/includes/parsers/GeoCoordinateParser.php
@@ -106,334 +106,34 @@
 * @throws ParseException
 */
protected function stringParse( $value ) {
-   $value = $this->getNormalizedNotation( $value );
-
-   $notationType = $this->getCoordinatesType( $value );
-
-   if ( $notationType === false ) {
-   throw new ParseException( 'Not a geographical 
coordinate' );
-   }
-
-   $coordinates = explode( $this->getOption( 
self::OPT_SEPARATOR_SYMBOL ), $value );
-
-   if ( count( $coordinates ) !== 2 ) {
-   throw new ParseException( 'A coordinates string with an 
incorrect segment count has made it through validation' );
-   }
-
-   list( $latitude, $longitude ) = $coordinates;
-
-   $latitude = $this->getParsedCoordinate( $notationType, 
$latitude );
-   $longitude = $this->getParsedCoordinate( $notationType, 
$longitude );
-
-   $coordinate = new GeoCoordinateValue( $latitude, $longitude );
-
-   return $coordinate;
-   }
-
-   /**
-* Parsers a single coordinate (either latitude or longitude) and 
returns it as a float.
-*
-* @since 0.1
-*
-* @param string $notationType
-* @param string $coordinate
-*
-* @return float
-*
-* @throws ParseException
-*/
-   protected function getParsedCoordinate( $notationType, $coordinate ) {
-   $coordinate = $this->resolveDirection( $coordinate );
-
-   switch ( $notationType ) {
-   case self::TYPE_FLOAT:
-   return (float)$coordinate;
-   case self::TYPE_DD:
-   return $this->parseDDCoordinate( $coordinate );
-   case self::TYPE_DM:
-   return $this->parseDMCoordinate( $coordinate );
-   case self::TYPE_DMS:
-   return $this->parseDMSCoordinate( $coordinate );
-   default:
-   throw new ParseException( 'Invalid coordinate 
type specified' );
-   }
-   }
-
-   /**
-* Returns the type of the provided coordinates, or false if they are 
invalid.
-* You can use this as validation function, but be sure to use ===, 
since 0 can be returned.
-*
-* @since 0.1
-*
-* @param string $coordinates
-*
-* @return integer or false
-*/
-   protected function getCoordinatesType( $coordinates ) {
-   switch ( true ) {
-   case $this->areFloatCoordinates( $coordinates ):
-   return self::TYPE_FLOAT;
-   break;
-   case $this->areDMSCoordinates( $coordinates ):
-   return self::TYPE_DMS;
-   break;
-   case $this->areDDCoordinates( $coordinates ):
-   return self::TYPE_DD;
-   break;
-   case $this->areDMCoordinates( $coordinates ):
-   return self::TYPE_DM;
-   break;
-   default:
-   return false;
-   }
-   }
-
-   /**
-* Turns directional notation (N/E/S/W) of a single coordinate into 
non-directional notation (+/-).
-* This method assumes there are no preceding or tailing spaces.
-*
-* @since 0.1
-*
-* @param string $coordinate
-*
-* @return string
-*/
-   protected function resolveDirection( $coordinate ) {
-   // Get the last char, which could be a direction indicator
-   $lastChar = strtoupper( substr( $coordinate, -1 ) );
-
-   $n = $this->getOption( self::OP

[MediaWiki-commits] [Gerrit] New way of running tests at en.wikipedia.beta.wmflabs.org - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: New way of running tests at en.wikipedia.beta.wmflabs.org
..


New way of running tests at en.wikipedia.beta.wmflabs.org

Bug: 47266
Change-Id: If0958819d4ca0c8f3e5921e875449ef537949109
---
M docs/jobs.md
M features/aftv5.feature
M features/create_account_readonly.feature
M features/file.feature
M features/page_edit.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/preferences_appearance_readonly.feature
M features/search.feature
9 files changed, 13 insertions(+), 10 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jobs.md b/docs/jobs.md
index 8ef6ebd..6e33fbb 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -36,8 +36,8 @@
 
 
 # browsertests-en.wikipedia.beta.wmflabs.org
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci'
-- MediaWiki URL: en.wikipedia.beta.wmflabs.or
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org'
+- MediaWiki URL: en.wikipedia.beta.wmflabs.org
 
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-linux-chrome
@@ -48,15 +48,15 @@
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie6-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie7-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/aftv5.feature 
features/create_account.feature features/file.feature 
features/page_edit.feature features/page_triage.feature features/pdf.feature 
features/preferences_appearance.feature features/search.feature -n 8 
--test-options '--profile ci --tags ~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 8 --test-options '--profile ci 
--tags @en.wikipedia.beta.wmflabs.org --tags ~@ie8-bug'
 
 ## browsertests-en.wikipedia.beta.wmflabs.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/aftv5.feature b/features/aftv5.feature
index e499d7c..ab6a815 100644
--- a/features/aftv5.feature
+++ b/features/aftv5.feature
@@ -1,5 +1,5 @@
 # 
http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms
 @ie6-bug @phantomjs-bug
-@ie6-bug @phantomjs-bug
+@en.wikipedia.beta.wmflabs.org @ie6-bug @phantomjs-bug
 Feature: AFTv5
 
   Background:
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 8577db9..093afde 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index 3addc39..652e911 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/page_edit.feature b/features/page_edit.feature
index 1c9d5ea..2c849a6 100644
--- a/features/page_edit.feature
+++ b/features/page_edit.feature
@@ -1,3 +1,4 @@
+@en.wikipedia.beta.wmflabs.org
 Feature: Edit
 
   Background:
diff --git a/features/page_triage_readonly.feature 
b/features/page_triage_readonly.feature
index c690b6e..48dd0a9 100644
--- a/features/page_triage_readonly.feature
+++ b/features/p

[MediaWiki-commits] [Gerrit] Convert explicitly to float - change (mediawiki...DataValues)

[Daniel Werner (Code Review)]

Daniel Werner has submitted this change and it was merged.

Change subject: Convert explicitly to float
..


Convert explicitly to float

Change-Id: I1af137d171fe6bd353eae64b8fa197e8dd901d8a
---
M ValueParsers/includes/parsers/DmsCoordinateParser.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ValueParsers/includes/parsers/DmsCoordinateParser.php 
b/ValueParsers/includes/parsers/DmsCoordinateParser.php
index ba9f0ef..361ff3e 100644
--- a/ValueParsers/includes/parsers/DmsCoordinateParser.php
+++ b/ValueParsers/includes/parsers/DmsCoordinateParser.php
@@ -217,7 +217,7 @@
}
 
$degreePosition = strpos( $coordinate, $this->getOption( 
self::OPT_DEGREE_SYMBOL ) );
-   $degrees = substr( $coordinate, 0, $degreePosition );
+   $degrees = (float)substr( $coordinate, 0, $degreePosition );
 
$minutePosition = strpos( $coordinate, $this->getOption( 
self::OPT_MINUTE_SYMBOL ) );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1af137d171fe6bd353eae64b8fa197e8dd901d8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 
Gerrit-Reviewer: Daniel Werner 
Gerrit-Reviewer: John Erling Blad 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] New way of running tests at test2.wikipedia.org - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: New way of running tests at test2.wikipedia.org
..


New way of running tests at test2.wikipedia.org

Bug: 47266
Change-Id: I930fde6cb171864687d2e948bf5013695a73e1a5
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/file.feature
M features/guided_tour.feature
M features/login.feature
M features/math_readonly.feature
M features/page.feature
M features/page_edit.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/search.feature
M features/upload_wizard.feature
12 files changed, 15 insertions(+), 12 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved



diff --git a/docs/jobs.md b/docs/jobs.md
index 6e33fbb..efb085a 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -118,7 +118,7 @@
 
 # browsertests-test2.wikipedia.org
 
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org'
 - MediaWiki URL: test2.wikipedia.org
 
 
@@ -130,15 +130,15 @@
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_6
 - Browser Label: internet_explorer_6
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie6-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie6-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_7
 - Browser Label: internet_explorer_7
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie7-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie7-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_8
 - Browser Label: internet_explorer_8
-- bundle exec: parallel_cucumber features/create_account.feature 
features/file.feature features/guided_tour.feature features/login.feature 
features/math.feature features/page.feature features/page_edit.feature 
features/page_triage.feature features/pdf.feature features/search.feature 
features/upload_wizard.feature -n 11 --test-options '--profile ci --tags 
~@ie8-bug'
+- bundle exec: parallel_cucumber features/ -n 11 --test-options '--profile ci 
--tags @test2.wikipedia.org --tags ~@ie8-bug'
 
 ## browsertests-test2.wikipedia.org-windows-internet_explorer_9
 - Browser Label: internet_explorer_9
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 093afde..77c7071 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/file.feature b/features/file.feature
index 652e911..2a179a2 100644
--- a/features/file.feature
+++ b/features/file.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
 Feature: File
 
  Scenario: Anonymous goes to file that does not exist
diff --git a/features/guided_tour.feature b/features/guided_tour.feature
index 425ab9e..29589ae 100644
--- a/features/guided_tour.feature
+++ b/features/guided_tour.feature
@@ -1,3 +1,4 @@
+@test2.wikipedia.org
 Feature: Guided Tour
 
   Scenario: Check for Ready to Help guider
diff --git a/features/login.feature b/features/login.feature
index 229d091..20e4e9a 100644
--- a/features/login.feature
+++ b/features/login.feature
@@ -1,4 +1,4 @@
-@commons.wikimedia.beta.wmflabs.org
+@commons.wikimedia.beta.wmflabs.org @test2.wikipedia.org
 Feature: Log in
 
   Background:
diff --git a/features/math_readonly.feature b/feature

[MediaWiki-commits] [Gerrit] Tagging features that run at en.wikipedia.org - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: Tagging features that run at en.wikipedia.org
..

Tagging features that run at en.wikipedia.org

Bug: 47266
Bug: 47549
Change-Id: I40ba871edcba53c7f29665deb0fb45836b6ececf
---
M features/create_account_readonly.feature
M features/math_readonly.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/preferences_appearance_readonly.feature
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/86/61586/1

diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 77c7071..d8997fb 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/math_readonly.feature b/features/math_readonly.feature
index 7512472..a58ca9e 100644
--- a/features/math_readonly.feature
+++ b/features/math_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@test2.wikipedia.org
+@en.wikipedia.org @test2.wikipedia.org
 Feature: Math
 
   Scenario: Display simple math
diff --git a/features/page_triage_readonly.feature 
b/features/page_triage_readonly.feature
index 818025b..931c892 100644
--- a/features/page_triage_readonly.feature
+++ b/features/page_triage_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @test2.wikipedia.org
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @test2.wikipedia.org
 Feature: PageTriage
 
   Scenario: Check that NewPagesFeed has correct controls for anonymous user
diff --git a/features/pdf_readonly.feature b/features/pdf_readonly.feature
index 192c29a..1469252 100644
--- a/features/pdf_readonly.feature
+++ b/features/pdf_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @test2.wikipedia.org
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @test2.wikipedia.org
 Feature: PDF
 
   Scenario: Check for Download as PDF link
diff --git a/features/preferences_appearance_readonly.feature 
b/features/preferences_appearance_readonly.feature
index 43968de..f33a9ed 100644
--- a/features/preferences_appearance_readonly.feature
+++ b/features/preferences_appearance_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @login
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @login
 Feature: Preferences
 
   Background:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I40ba871edcba53c7f29665deb0fb45836b6ececf
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] New way of running tests at sandbox.translatewiki.net - change (qa/browsertests)

[Zfilipin (Code Review)]

Zfilipin has uploaded a new change for review.

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


Change subject: New way of running tests at sandbox.translatewiki.net
..

New way of running tests at sandbox.translatewiki.net

Bug: 47266
Change-Id: I9abebfa0252c013f4be86a9bab30a252e68c7637
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/uls.feature
M features/uls_accept_language.feature
M features/uls_ime.feature
5 files changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/87/61587/1

diff --git a/docs/jobs.md b/docs/jobs.md
index efb085a..9b83dbf 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -92,7 +92,7 @@
 
 
 # browsertests-sandbox.translatewiki.net
-- bundle exec: parallel_cucumber features/create_account.feature 
features/uls*feature -n 4 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 4 --test-options '--profile ci  
--tags @sandbox.translatewiki.net'
 - MediaWiki URL: sandbox.translatewiki.net
 
 
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index d8997fb..16eaf56 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @test2.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @sandbox.translatewiki.net @test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/uls.feature b/features/uls.feature
index 2d3bf5f..ae8f8da 100644
--- a/features/uls.feature
+++ b/features/uls.feature
@@ -1,3 +1,4 @@
+@sandbox.translatewiki.net
 Feature: Universal Language Selector User language selector
 
   Scenario: Open Language selector
diff --git a/features/uls_accept_language.feature 
b/features/uls_accept_language.feature
index 4df402b..f273357 100644
--- a/features/uls_accept_language.feature
+++ b/features/uls_accept_language.feature
@@ -1,4 +1,4 @@
-@language
+@language @sandbox.translatewiki.net
 Feature: Universal Language Selector Accept-Language
 
   Scenario Outline: Accept-Language
diff --git a/features/uls_ime.feature b/features/uls_ime.feature
index 35c118e..f172ff2 100644
--- a/features/uls_ime.feature
+++ b/features/uls_ime.feature
@@ -1,3 +1,4 @@
+@sandbox.translatewiki.net
 Feature: Universal Language Selector input method engine
 
   Scenario: User can see input method keyboard icon

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9abebfa0252c013f4be86a9bab30a252e68c7637
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 

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

[MediaWiki-commits] [Gerrit] Make all PHPUNit tests in the DataValue repo work without Me... - change (mediawiki...DataValues)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Make all PHPUNit tests in the DataValue repo work without 
MediaWiki - DO NOT MERGE
..

Make all PHPUNit tests in the DataValue repo work without MediaWiki - DO NOT 
MERGE

Change-Id: I4696dc507ae80df8d39ee320680cd77f9a32c96d
---
M DataTypes/tests/includes/DataTypeFactoryTest.php
M DataTypes/tests/includes/DataTypeTest.php
M DataValues/tests/phpunit/phpunit.php
M ValueFormatters/tests/FormatterOptionsTest.php
4 files changed, 69 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/88/61588/1

diff --git a/DataTypes/tests/includes/DataTypeFactoryTest.php 
b/DataTypes/tests/includes/DataTypeFactoryTest.php
index 5164c09..4a4d54a 100644
--- a/DataTypes/tests/includes/DataTypeFactoryTest.php
+++ b/DataTypes/tests/includes/DataTypeFactoryTest.php
@@ -34,7 +34,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-class DataTypeFactoryTest extends \MediaWikiTestCase {
+class DataTypeFactoryTest extends \PHPUnit_Framework_TestCase {
 
/**
 * @var null|DataTypeFactory
@@ -87,4 +87,45 @@
);
}
 
+   /**
+* Assert that two arrays are equal. By default this means that both 
arrays need to hold
+* the same set of values. Using additional arguments, order and 
associated key can also
+* be set as relevant.
+*
+* @param array $expected
+* @param array $actual
+* @param boolean $ordered If the order of the values should match
+* @param boolean $named If the keys should match
+*/
+   protected function assertArrayEquals( array $expected, array $actual, 
$ordered = false, $named = false ) {
+   if ( !$ordered ) {
+   $this->objectAssociativeSort( $expected );
+   $this->objectAssociativeSort( $actual );
+   }
+
+   if ( !$named ) {
+   $expected = array_values( $expected );
+   $actual = array_values( $actual );
+   }
+
+   call_user_func_array(
+   array( $this, 'assertEquals' ),
+   array_merge( array( $expected, $actual ), array_slice( 
func_get_args(), 4 ) )
+   );
+   }
+
+   /**
+* Does an associative sort that works for objects.
+*
+* @param array $array
+*/
+   protected function objectAssociativeSort( array &$array ) {
+   uasort(
+   $array,
+   function ( $a, $b ) {
+   return serialize( $a ) > serialize( $b ) ? 1 : 
-1;
+   }
+   );
+   }
+
 }
diff --git a/DataTypes/tests/includes/DataTypeTest.php 
b/DataTypes/tests/includes/DataTypeTest.php
index 07f41fc..53adad8 100644
--- a/DataTypes/tests/includes/DataTypeTest.php
+++ b/DataTypes/tests/includes/DataTypeTest.php
@@ -34,7 +34,7 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
  */
-class DataTypeTest extends \MediaWikiTestCase {
+class DataTypeTest extends \PHPUnit_Framework_TestCase {
 
/**
 * @return DataType[]
@@ -45,7 +45,13 @@
}
 
public function instanceProvider() {
-   return $this->arrayWrap( $this->getInstances() );
+   $argLists = array();
+
+   foreach ( $this->getInstances() as $instance ) {
+   $argLists[] = array( $instance );
+   }
+
+   return $argLists;
}
 
/**
@@ -98,7 +104,10 @@
public function testGetLabel( DataType $type ) {
foreach ( array( 'en', 'de', 'nl', 'o_O' ) as $langCode ) {
$actual = $type->getLabel( $langCode );
-   $this->assertTypeOrValue( 'string', $actual, null );
+   $this->assertTrue(
+   is_string( $actual ) || is_null( $actual ),
+   'getLabel should return a string or null'
+   );
 
$expected = wfMessage( 'datatypes-type-' . 
$type->getId() )->inLanguage( $langCode )->text();
 
diff --git a/DataValues/tests/phpunit/phpunit.php 
b/DataValues/tests/phpunit/phpunit.php
index 7c9b11d..57adb2a 100644
--- a/DataValues/tests/phpunit/phpunit.php
+++ b/DataValues/tests/phpunit/phpunit.php
@@ -11,14 +11,16 @@
 require_once( 'PHPUnit/Autoload.php' );
 
 define( 'DATAVALUES', true );
-require_once( __DIR__ . '/../../DataValues.php' );
+require_once( __DIR__ . '/../../../DataValues.php' );
+
+$dir =  __DIR__ . '/../../../';
 
 echo 'Running tests for DataValues version ' . DataValues_VERSION . ".\n";
-echo 'phpunit.php --group DataValueExtensions ' 

[MediaWiki-commits] [Gerrit] Avoid using regexps where string literals would do - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Avoid using regexps where string literals would do
..


Avoid using regexps where string literals would do

There's no sense in using a regular expression to match a single fixed string
that is known in advance.

Change-Id: Ia0e83b2b22f4715d4b495636447e6a0e2d4e7901
---
M manifests/site.pp
1 file changed, 14 insertions(+), 12 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index eadc668..2992eb2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -515,12 +515,12 @@
 }
 
 ## researchdb
-node /^db67\.pmtpa\.wmnet/ {
+node 'db67.pmtpa.wmnet' {
class { role::coredb::researchdb : mariadb => true }
 }
 
 ## pgehres special project
-node /^db29\.pmtpa\.wmnet/{
+node 'db29.pmtpa.wmnet' {
$gid = 500
system_role { "role::admin_tools_sul_audit_db": description => "Admin 
Tools/SUL Audit database" }
include base,
@@ -642,12 +642,15 @@
 }
 
 ## researchdb
-node /^db1047\.eqiad\.wmnet/ {
-   class { role::coredb::researchdb : mariadb => true, 
innodb_file_per_table => true }
+node 'db1047.eqiad.wmnet' {
+   class { role::coredb::researchdb :
+   mariadb => true,
+   innodb_file_per_table => true,
+   }
 }
 
 ## SANITARIUM
-node /^db1053\.eqiad\.wmnet/ {
+node 'db1053.eqiad.wmnet' {
class { role::db::sanitarium:
instances => {
's1' => {
@@ -659,7 +662,7 @@
}
 }
 
-node /^db1054\.eqiad\.wmnet/ {
+node 'db1054.eqiad.wmnet' {
class { role::db::sanitarium:
instances => {
's2' => {
@@ -681,7 +684,7 @@
}
 }
 
-node /^db1057\.eqiad\.wmnet/ {
+node 'db1057.eqiad.wmnet' {
class { role::db::sanitarium:
instances => {
's3' => {
@@ -1186,7 +1189,7 @@
 }
 
 ## labsdb dbs
-node /^labsdb1001\.eqiad\.wmnet/ {
+node 'labsdb1001.eqiad.wmnet' {
   class { role::db::labsdb:
 instances => {
   's1' => {
@@ -1198,7 +1201,7 @@
   }
 }
 
-node /^labsdb1002\.eqiad\.wmnet/ {
+node 'labsdb1002.eqiad.wmnet' {
   class { role::db::labsdb:
 instances => {
   's2' => {
@@ -1220,7 +1223,7 @@
   }
 }
 
-node /^labsdb1003\.eqiad\.wmnet/ {
+node 'labsdb1003.eqiad.wmnet' {
   class { role::db::labsdb:
 instances => {
   's3' => {
@@ -2779,14 +2782,13 @@
backup::client
 }
 
-node /virt2.pmtpa.wmnet/ {
+node 'virt2.pmtpa.wmnet' {
$cluster = "virt"
$openstack_version = "essex"
 
include standard,
role::nova::network,
role::nova::api
-
 }
 
 node /virt([5-9]|1[0-1]).pmtpa.wmnet/ {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e83b2b22f4715d4b495636447e6a0e2d4e7901
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Faidon 
Gerrit-Reviewer: MZMcBride 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] MathJax: Remove our RGB extension again, added in MathJax 2.1 - change (mediawiki...Math)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: MathJax: Remove our RGB extension again, added in MathJax 2.1
..


MathJax: Remove our RGB extension again, added in MathJax 2.1

Turns out that with the upgrade to 2.1 this is now included in core
MathJax, so we don't need the extension anymore.
http://docs.mathjax.org/en/latest/whats-new-2.1.html

Change-Id: I653c05aaf6d94851fdf6b1649d2d5c7477d46b7e
---
M modules/MathJax/extensions/TeX/texvc.js
1 file changed, 0 insertions(+), 16 deletions(-)

Approvals:
  Physikerwelt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/MathJax/extensions/TeX/texvc.js 
b/modules/MathJax/extensions/TeX/texvc.js
index 1e5cc4a..a7eff6e 100644
--- a/modules/MathJax/extensions/TeX/texvc.js
+++ b/modules/MathJax/extensions/TeX/texvc.js
@@ -7,22 +7,6 @@
 
   var MML = MathJax.ElementJax.mml;
 
-  /*
-   *  Get an RGB color (a triplet of values between 0 and 255)
-   */
-  MathJax.Extension["TeX/color"].get_RGB = function (rgb) {
-rgb = rgb.split(/,/); var RGB = "#";
-if (rgb.length !== 3) {this.TEX.Error("RGB colors require 3 decimal 
numbers")}
-for (var i = 0; i < 3; i++) {
-  if (!rgb[i].match(/^(\d{1,3})$/)) {this.TEX.Error("Invalid decimal 
number")}
-  var n = parseInt(rgb[i], 10);
-  if (n < 0 || n > 255) {this.TEX.Error("RGB values must be between 0 and 
255")}
-  n = n.toString(16); if (n.length < 2) {n = "0"+n}
-  RGB += n;
-}
-return RGB;
-  }
-
   MathJax.Hub.Insert(MathJax.InputJax.TeX.Definitions,{
 
 mathchar0mi: {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I653c05aaf6d94851fdf6b1649d2d5c7477d46b7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: TheDJ 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Physikerwelt 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Tagging features that run at en.wikipedia.org - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: Tagging features that run at en.wikipedia.org
..


Tagging features that run at en.wikipedia.org

Bug: 47266
Bug: 47549
Change-Id: I40ba871edcba53c7f29665deb0fb45836b6ececf
---
M features/create_account_readonly.feature
M features/math_readonly.feature
M features/page_triage_readonly.feature
M features/pdf_readonly.feature
M features/preferences_appearance_readonly.feature
5 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index 77c7071..d8997fb 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@test2.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/math_readonly.feature b/features/math_readonly.feature
index 7512472..a58ca9e 100644
--- a/features/math_readonly.feature
+++ b/features/math_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@test2.wikipedia.org
+@en.wikipedia.org @test2.wikipedia.org
 Feature: Math
 
   Scenario: Display simple math
diff --git a/features/page_triage_readonly.feature 
b/features/page_triage_readonly.feature
index 818025b..931c892 100644
--- a/features/page_triage_readonly.feature
+++ b/features/page_triage_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @test2.wikipedia.org
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @test2.wikipedia.org
 Feature: PageTriage
 
   Scenario: Check that NewPagesFeed has correct controls for anonymous user
diff --git a/features/pdf_readonly.feature b/features/pdf_readonly.feature
index 192c29a..1469252 100644
--- a/features/pdf_readonly.feature
+++ b/features/pdf_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @test2.wikipedia.org
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @test2.wikipedia.org
 Feature: PDF
 
   Scenario: Check for Download as PDF link
diff --git a/features/preferences_appearance_readonly.feature 
b/features/preferences_appearance_readonly.feature
index 43968de..f33a9ed 100644
--- a/features/preferences_appearance_readonly.feature
+++ b/features/preferences_appearance_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @login
+@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @login
 Feature: Preferences
 
   Background:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I40ba871edcba53c7f29665deb0fb45836b6ececf
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] New way of running tests at sandbox.translatewiki.net - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has submitted this change and it was merged.

Change subject: New way of running tests at sandbox.translatewiki.net
..


New way of running tests at sandbox.translatewiki.net

Bug: 47266
Change-Id: I9abebfa0252c013f4be86a9bab30a252e68c7637
---
M docs/jobs.md
M features/create_account_readonly.feature
M features/uls.feature
M features/uls_accept_language.feature
M features/uls_ime.feature
5 files changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Cmcmahon: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/docs/jobs.md b/docs/jobs.md
index efb085a..9b83dbf 100644
--- a/docs/jobs.md
+++ b/docs/jobs.md
@@ -92,7 +92,7 @@
 
 
 # browsertests-sandbox.translatewiki.net
-- bundle exec: parallel_cucumber features/create_account.feature 
features/uls*feature -n 4 --test-options '--profile ci'
+- bundle exec: parallel_cucumber features/ -n 4 --test-options '--profile ci  
--tags @sandbox.translatewiki.net'
 - MediaWiki URL: sandbox.translatewiki.net
 
 
diff --git a/features/create_account_readonly.feature 
b/features/create_account_readonly.feature
index d8997fb..16eaf56 100644
--- a/features/create_account_readonly.feature
+++ b/features/create_account_readonly.feature
@@ -1,5 +1,5 @@
 # Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @test2.wikipedia.org
+@commons.wikimedia.beta.wmflabs.org @en.wikipedia.beta.wmflabs.org 
@en.wikipedia.org @sandbox.translatewiki.net @test2.wikipedia.org
 Feature: Create account
 
   Scenario Outline: Go to Create account page
diff --git a/features/uls.feature b/features/uls.feature
index 2d3bf5f..ae8f8da 100644
--- a/features/uls.feature
+++ b/features/uls.feature
@@ -1,3 +1,4 @@
+@sandbox.translatewiki.net
 Feature: Universal Language Selector User language selector
 
   Scenario: Open Language selector
diff --git a/features/uls_accept_language.feature 
b/features/uls_accept_language.feature
index 4df402b..f273357 100644
--- a/features/uls_accept_language.feature
+++ b/features/uls_accept_language.feature
@@ -1,4 +1,4 @@
-@language
+@language @sandbox.translatewiki.net
 Feature: Universal Language Selector Accept-Language
 
   Scenario Outline: Accept-Language
diff --git a/features/uls_ime.feature b/features/uls_ime.feature
index 35c118e..f172ff2 100644
--- a/features/uls_ime.feature
+++ b/features/uls_ime.feature
@@ -1,3 +1,4 @@
+@sandbox.translatewiki.net
 Feature: Universal Language Selector input method engine
 
   Scenario: User can see input method keyboard icon

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9abebfa0252c013f4be86a9bab30a252e68c7637
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Cmcmahon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] renaming rfaulk's new key so it doesn't conflict - change (operations/puppet)

[Lcarr (Code Review)]

Lcarr has uploaded a new change for review.

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


Change subject: renaming rfaulk's new key so it doesn't conflict
..

renaming rfaulk's new key so it doesn't conflict

Change-Id: Icc4153623fd739374bcceb0381c1edbb0b74b9a2
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/61589/1

diff --git a/manifests/admins.pp b/manifests/admins.pp
index 0efaa7e..476688a 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1486,7 +1486,7 @@
type=> "ssh-rsa",
key => 
"B3NzaC1yc2EBIwAAAQEA1WerRcJULxj26JimklCkoFUO6XKBjwTbPH54/hUv5c3lvyuUol6AF86rWziHgwIAy4+jPlm9mTS3IzWoRf0sSMgSrjkmykVaD4Zc+7QnXXGtnehHfryKTyB30TI39/JB5CoS1pGQQoMg67kF0nl2RKP47r0HY07m3rl1m5MWMTKByZ9p6/oVAuJ7XNxLjfN1N+Li7HhyueQonkw8Na4CxSz/Uj6zDgxB1Odw9LgHErgOe99Nza4yOsvpa9iq30eLJjXYKJ+9s8aPI68H+nBh8/CaBaPJkuTcYfwXhE6EG9JTtUrf43y88J+SDeN0lRF8w0SMluheIzkv/3TNyDdr1w=="
}
-   ssh_authorized_key { "rfaulk":
+   ssh_authorized_key { "rfaulk2":
ensure  => present,
user=> $username,
type=> "ssh-rsa",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc4153623fd739374bcceb0381c1edbb0b74b9a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 

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

[MediaWiki-commits] [Gerrit] renaming rfaulk's new key so it doesn't conflict - change (operations/puppet)

[Lcarr (Code Review)]

Lcarr has submitted this change and it was merged.

Change subject: renaming rfaulk's new key so it doesn't conflict
..


renaming rfaulk's new key so it doesn't conflict

Change-Id: Icc4153623fd739374bcceb0381c1edbb0b74b9a2
---
M manifests/admins.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Lcarr: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/admins.pp b/manifests/admins.pp
index 0efaa7e..476688a 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -1486,7 +1486,7 @@
type=> "ssh-rsa",
key => 
"B3NzaC1yc2EBIwAAAQEA1WerRcJULxj26JimklCkoFUO6XKBjwTbPH54/hUv5c3lvyuUol6AF86rWziHgwIAy4+jPlm9mTS3IzWoRf0sSMgSrjkmykVaD4Zc+7QnXXGtnehHfryKTyB30TI39/JB5CoS1pGQQoMg67kF0nl2RKP47r0HY07m3rl1m5MWMTKByZ9p6/oVAuJ7XNxLjfN1N+Li7HhyueQonkw8Na4CxSz/Uj6zDgxB1Odw9LgHErgOe99Nza4yOsvpa9iq30eLJjXYKJ+9s8aPI68H+nBh8/CaBaPJkuTcYfwXhE6EG9JTtUrf43y88J+SDeN0lRF8w0SMluheIzkv/3TNyDdr1w=="
}
-   ssh_authorized_key { "rfaulk":
+   ssh_authorized_key { "rfaulk2":
ensure  => present,
user=> $username,
type=> "ssh-rsa",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc4153623fd739374bcceb0381c1edbb0b74b9a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr 
Gerrit-Reviewer: Lcarr 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Adding maintenance file for updating user caches after CopyE... - change (mediawiki...Echo)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Adding maintenance file for updating user caches after 
CopyExistingEmailPreference
..


Adding maintenance file for updating user caches after 
CopyExistingEmailPreference

Change-Id: If938e352e4aaa44d1e9e0718cc1bece26c7a7f74
---
A maintenance/rebuildUpdatedUserCache.php
1 file changed, 67 insertions(+), 0 deletions(-)

Approvals:
  Bsitu: Looks good to me, but someone else must approve
  Lwelling: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/rebuildUpdatedUserCache.php 
b/maintenance/rebuildUpdatedUserCache.php
new file mode 100755
index 000..dff5d73
--- /dev/null
+++ b/maintenance/rebuildUpdatedUserCache.php
@@ -0,0 +1,67 @@
+mDescription = "Script for clearing user cache for 
updated users";
+   $this->addOption( 'batch', 'Batch size', false, true );
+   }
+
+   public function execute() {
+   global $wgMemc;
+
+   if( $this->hasOption( 'batch' ) ) {
+   $batch = $this->getOption( 'batch' );
+   } else {
+   $batch = 100;
+   }
+
+   $begin = time();
+   $dbr = $this->getDB( DB_SLAVE );
+   $updated = 0;
+   $lastUserID = 0;
+
+   while ( true ) {
+   $res = $dbr->select(
+   'user_properties', // table
+   array( 'up_user' ), // fields
+   array(
+   'up_property' => 'enotifusertalkpages',
+   'up_user > ' . $dbr->addQuotes( 
$lastUserID ),
+   ), // conditions
+   __METHOD__, // caller
+   array( 'LIMIT' => $batch, 'ORDER BY' => 
'up_user' ) // options
+   );
+   if ( !$res->numRows() ) {
+   break;
+   }
+   foreach ( $res as $row ) {
+   $lastUserID = $row->up_user;
+   $user = User::newFromId( $row->up_user );
+   $user->invalidateCache();
+   $updated++;
+   }
+   $this->output( "Updated: $updated; Last ID processed: 
$lastUserID\n" );
+   wfWaitForSlaves();
+   }
+
+   $end = time();
+   $duration = $end - $begin;
+   $this->output( "Done. Elapsed seconds: $duration\n" );
+   }
+}
+
+$maintClass = 'RebuildUpdatedUserCache'; // Tells it to run the class
+require_once( RUN_MAINTENANCE_IF_MAIN );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If938e352e4aaa44d1e9e0718cc1bece26c7a7f74
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari 
Gerrit-Reviewer: Bsitu 
Gerrit-Reviewer: Lwelling 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Minor style and code fixes. - change (mediawiki...SecureSessions)

[Parent5446 (Code Review)]

Parent5446 has uploaded a new change for review.

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


Change subject: Minor style and code fixes.
..

Minor style and code fixes.

Fixed spacing around if and foreach statements. Fixed default
value of a variable to be an integer rather than a boolean.

Change-Id: Ia5f954b44d807c9f4acf796a19e5db02a62d8fb3
---
M SecureSessions.hooks.php
M SpecialSessions.php
2 files changed, 33 insertions(+), 33 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecureSessions 
refs/changes/90/61590/1

diff --git a/SecureSessions.hooks.php b/SecureSessions.hooks.php
index be17817..f71c0a9 100644
--- a/SecureSessions.hooks.php
+++ b/SecureSessions.hooks.php
@@ -62,7 +62,7 @@
// Regenerate session ID to avoid fixation, but don't trash
// the old session immediately in case there are some 
asynchronous
// requests still using it.
-   if( $wgSessionCycleId && $wgSessionStarted && 
$request->getSessionData( 'wsExpiry' ) === null ) {
+   if ( $wgSessionCycleId && $wgSessionStarted && 
$request->getSessionData( 'wsExpiry' ) === null ) {
// Set obsolete and expiration time.
$data = $_SESSION;
$request->setSessionData( 'wsObsolete', true );
@@ -79,16 +79,16 @@
}
 
// Boolean values are translated to constant options.
-   if( $wgEnhancedSessionAuth === true ) {
+   if ( $wgEnhancedSessionAuth === true ) {
$options = array( 'useragent' => true, 'ip' => true, 
'singlesession' => null );
-   } elseif( $wgEnhancedSessionAuth === false ) {
+   } elseif ( $wgEnhancedSessionAuth === false ) {
$options = array();
} else {
$options = $wgEnhancedSessionAuth;
}
 
// Instantiate and register hooks.
-   if( $options instanceof self ) {
+   if ( $options instanceof self ) {
$clPropAuth = $options;
} else {
$clPropAuth = new self( $options );
@@ -109,13 +109,13 @@
 * @param array $options Authentication options
 */
public function __construct( array $options ) {
-   if( array_key_exists( 'ip', $options ) ) {
+   if ( array_key_exists( 'ip', $options ) ) {
$this->ip = $options['ip'];
}
-   if( array_key_exists( 'useragent', $options ) ) {
+   if ( array_key_exists( 'useragent', $options ) ) {
$this->userAgent = $options['useragent'];
}
-   if( array_key_exists( 'singlesession', $options ) ) {
+   if ( array_key_exists( 'singlesession', $options ) ) {
$this->oneSession = $options['singlesession'];
}
}
@@ -177,7 +177,7 @@
global $wgMemc;
$request = $this->getRequest();
 
-   if(
+   if (
$this->oneSession === true ||
$this->oneSession === null &&
$request->getCheck( 'wpLimitSessionOne' )
@@ -193,25 +193,25 @@
}
 
// Store the user agent and IP address if needed.
-   if(
+   if (
$this->userAgent === true ||
$this->userAgent === null &&
( $request->getCheck( 'wpLimitSessionUA' ) || 
$request->getCookie( 'RestrictUA' ) )
) {
// Only set cookie if user checked Remember Me.
-   if( $cookies['Token'] !== false ) {
+   if ( $cookies['Token'] !== false ) {
$cookies['RestrictUA'] = true;
}
$session['wsUserAgent'] = $_SERVER['HTTP_USER_AGENT'];
}
 
-   if(
+   if (
$this->ip === true ||
$this->ip === null &&
( $request->getCheck( 'wpLimitSessionIP' ) || 
$request->getCookie( 'RestrictIP' ) )
) {
// Only set cookie if user checked Remember Me.
-   if( $cookies['Token'] !== false ) {
+   if ( $cookies['Token'] !== false ) {
$cookies['RestrictIP'] = true;
}
$session['wsIPAddress'] = $request->getIP();
@@ -238,7 +238,7 @@
$request->setSessionData( 'wsUserAgent', null );
$request->setSessionData( 'wsIPAddress', null );
 
-   if( $request->getCookie( 'forceHTTPS' ) && 
WebR

[MediaWiki-commits] [Gerrit] Use Upstart rather than supervisor to manage IPython - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Use Upstart rather than supervisor to manage IPython
..


Use Upstart rather than supervisor to manage IPython

This change transfers responsibility for starting and stopping IPython Notebook
from supervisor to Upstart. I'm doing so for the sake of simplicity and
consistency. I did not use the `upstart_job` resource type in
generic-definitions.pp because I wanted to keep the module self-contained and
because I wanted to use template (`upstart_job` looks for a static file in
files/upstart).

Change-Id: I2c10bb25bc31285be2f1dd3b31b5252855f76f11
---
M modules/eventlogging/manifests/notebook.pp
A modules/eventlogging/templates/ipython-notebook.conf.erb
D modules/eventlogging/templates/notebook.conf.erb
3 files changed, 40 insertions(+), 16 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/eventlogging/manifests/notebook.pp 
b/modules/eventlogging/manifests/notebook.pp
index 9d1488f..504c470 100644
--- a/modules/eventlogging/manifests/notebook.pp
+++ b/modules/eventlogging/manifests/notebook.pp
@@ -89,11 +89,22 @@
mode=> '0444',
}
 
-   file { '/etc/supervisor/conf.d/notebook.conf':
-   content => template('eventlogging/notebook.conf.erb'),
-   require => [ Package['ipython-notebook'], File[$notebook_dir], 
File[$graph_dir] ],
-   notify  => Service['supervisor'],
-   mode=> '0444',
+   file { '/etc/init.d/ipython-notebook':
+   ensure => link,
+   target => '/lib/init/upstart-job',
+   }
+
+   file { '/etc/init/ipython-notebook.conf':
+   content => template('eventlogging/ipython-notebook.conf.erb'),
+   require => File['/etc/init.d/ipython-notebook'],
+   notify  => Exec['start ipython-notebook'],
+   }
+
+   exec { 'Start IPython Notebook':
+   command => '/sbin/start ipython-notebook',
+   refreshonly => true,
+   require => [ Package['ipython-notebook'], 
File[$notebook_dir], File[$graph_dir] ],
+   returns => [ 0, 1 ],  # OK if "Job is already running"
}
 
 }
diff --git a/modules/eventlogging/templates/ipython-notebook.conf.erb 
b/modules/eventlogging/templates/ipython-notebook.conf.erb
new file mode 100644
index 000..2471fd4
--- /dev/null
+++ b/modules/eventlogging/templates/ipython-notebook.conf.erb
@@ -0,0 +1,24 @@
+# vim: set ft=upstart:
+
+# Upstart job configuration for IPython Notebook
+# This file is managed by Puppet
+
+description "IPython Notebook"
+author "Ori Livneh "
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+setuid <%= ipython_user %>
+setgid <%= ipython_dir %>
+
+chdir "<%= ipython_dir %>"
+
+env HOME="<%= ipython_dir %>"
+env IPYTHONDIR="<%= ipython_dir %>"
+env MPLCONFIGDIR="<%= graph_dir %>"
+
+exec ipython notebook \
+--ipython-dir="<%= ipython_dir %>" \
+--profile="<%= ipython_profile %>"
+respawn
diff --git a/modules/eventlogging/templates/notebook.conf.erb 
b/modules/eventlogging/templates/notebook.conf.erb
deleted file mode 100644
index e90b128..000
--- a/modules/eventlogging/templates/notebook.conf.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-; supervisor configuration for ipython-notebook
-; This file is managed by Puppet.
-
-[program:notebook]
-command = ipython notebook --ipython-dir="<%= ipython_dir %>" --profile="<%= 
ipython_profile %>"
-user = <%= ipython_user %>
-directory = <%= ipython_dir %>
-redirect_stderr = true
-stdout_logfile = /var/log/supervisor/%(program_name)s.log
-stderr_logfile = NONE
-environment = IPYTHONDIR=<%= ipython_dir %>,MPLCONFIGDIR=<%= graph_dir %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c10bb25bc31285be2f1dd3b31b5252855f76f11
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Faidon 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Minor style and code fixes. - change (mediawiki...SecureSessions)

[Parent5446 (Code Review)]

Parent5446 has submitted this change and it was merged.

Change subject: Minor style and code fixes.
..


Minor style and code fixes.

Fixed spacing around if and foreach statements. Fixed default
value of a variable to be an integer rather than a boolean.

Change-Id: Ia5f954b44d807c9f4acf796a19e5db02a62d8fb3
---
M SecureSessions.hooks.php
M SpecialSessions.php
2 files changed, 33 insertions(+), 33 deletions(-)

Approvals:
  Parent5446: Verified; Looks good to me, approved



diff --git a/SecureSessions.hooks.php b/SecureSessions.hooks.php
index be17817..f71c0a9 100644
--- a/SecureSessions.hooks.php
+++ b/SecureSessions.hooks.php
@@ -62,7 +62,7 @@
// Regenerate session ID to avoid fixation, but don't trash
// the old session immediately in case there are some 
asynchronous
// requests still using it.
-   if( $wgSessionCycleId && $wgSessionStarted && 
$request->getSessionData( 'wsExpiry' ) === null ) {
+   if ( $wgSessionCycleId && $wgSessionStarted && 
$request->getSessionData( 'wsExpiry' ) === null ) {
// Set obsolete and expiration time.
$data = $_SESSION;
$request->setSessionData( 'wsObsolete', true );
@@ -79,16 +79,16 @@
}
 
// Boolean values are translated to constant options.
-   if( $wgEnhancedSessionAuth === true ) {
+   if ( $wgEnhancedSessionAuth === true ) {
$options = array( 'useragent' => true, 'ip' => true, 
'singlesession' => null );
-   } elseif( $wgEnhancedSessionAuth === false ) {
+   } elseif ( $wgEnhancedSessionAuth === false ) {
$options = array();
} else {
$options = $wgEnhancedSessionAuth;
}
 
// Instantiate and register hooks.
-   if( $options instanceof self ) {
+   if ( $options instanceof self ) {
$clPropAuth = $options;
} else {
$clPropAuth = new self( $options );
@@ -109,13 +109,13 @@
 * @param array $options Authentication options
 */
public function __construct( array $options ) {
-   if( array_key_exists( 'ip', $options ) ) {
+   if ( array_key_exists( 'ip', $options ) ) {
$this->ip = $options['ip'];
}
-   if( array_key_exists( 'useragent', $options ) ) {
+   if ( array_key_exists( 'useragent', $options ) ) {
$this->userAgent = $options['useragent'];
}
-   if( array_key_exists( 'singlesession', $options ) ) {
+   if ( array_key_exists( 'singlesession', $options ) ) {
$this->oneSession = $options['singlesession'];
}
}
@@ -177,7 +177,7 @@
global $wgMemc;
$request = $this->getRequest();
 
-   if(
+   if (
$this->oneSession === true ||
$this->oneSession === null &&
$request->getCheck( 'wpLimitSessionOne' )
@@ -193,25 +193,25 @@
}
 
// Store the user agent and IP address if needed.
-   if(
+   if (
$this->userAgent === true ||
$this->userAgent === null &&
( $request->getCheck( 'wpLimitSessionUA' ) || 
$request->getCookie( 'RestrictUA' ) )
) {
// Only set cookie if user checked Remember Me.
-   if( $cookies['Token'] !== false ) {
+   if ( $cookies['Token'] !== false ) {
$cookies['RestrictUA'] = true;
}
$session['wsUserAgent'] = $_SERVER['HTTP_USER_AGENT'];
}
 
-   if(
+   if (
$this->ip === true ||
$this->ip === null &&
( $request->getCheck( 'wpLimitSessionIP' ) || 
$request->getCookie( 'RestrictIP' ) )
) {
// Only set cookie if user checked Remember Me.
-   if( $cookies['Token'] !== false ) {
+   if ( $cookies['Token'] !== false ) {
$cookies['RestrictIP'] = true;
}
$session['wsIPAddress'] = $request->getIP();
@@ -238,7 +238,7 @@
$request->setSessionData( 'wsUserAgent', null );
$request->setSessionData( 'wsIPAddress', null );
 
-   if( $request->getCookie( 'forceHTTPS' ) && 
WebRequest::detectProtocol() === 'https' ) {
+   if ( $request->get

[MediaWiki-commits] [Gerrit] Create self-standing IPython Notebook Puppet module - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Create self-standing IPython Notebook Puppet module
..


Create self-standing IPython Notebook Puppet module

- For the sake of portability, replaced dependency on 'systemuser' resource
  (from generic-definitions.pp) with equivalent user & group resources.

- Dito generic-definitions.pp's 'upstart_job' resource (which could stand to be
  improved..) Replaced with a proper service resource, specifying upstart as
  the provider, but also creating an init.d symlink to /lib/init/upstart-job.

- Added README, expanded parameter description, and documented default values.

- Change default IPYTHONDIR from '/var/lib/ipython' to '/srv/ipython', which
  better conforms to the Filesystem Hierarchy Standard.

- Changed ill-named 'graphs_dir' to 'mplconfigdir', in keeping with the name of
  the environment variable it shadows.

- Followed Puppet's style guide for specifying default values for parametrized
  classes that are based on other variables.

- In erb templates, use '@varname' rather than 'varname'. (The latter notation
  is liable to conflict with Ruby built-ins and is thus discouraged.)

I tested it using Vagrant and it works well.

Change-Id: I2db8206d91e929c943fddab8e09db60f458739b0
---
A modules/eventlogging/manifests/analysis.pp
M modules/eventlogging/manifests/init.pp
D modules/eventlogging/manifests/notebook.pp
D modules/eventlogging/templates/ipython-notebook.conf.erb
A modules/ipython/README
A modules/ipython/manifests/init.pp
A modules/ipython/manifests/notebook.pp
A modules/ipython/manifests/profile.pp
A modules/ipython/templates/ipython-notebook.conf.erb
R modules/ipython/templates/ipython_notebook_config.py.erb
10 files changed, 267 insertions(+), 140 deletions(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/eventlogging/manifests/analysis.pp 
b/modules/eventlogging/manifests/analysis.pp
new file mode 100644
index 000..1ee5633
--- /dev/null
+++ b/modules/eventlogging/manifests/analysis.pp
@@ -0,0 +1,10 @@
+# Data analysis environment for EventLogging, based on IPython.
+class eventlogging::analysis {
+   package { [ 'python-pandas', 'python-sympy' ]:
+   ensure => latest,
+   }
+
+   class { 'ipython::notebook':
+   exec_files => [ '/var/lib/ipython/helpers/helpers.py' ],
+   }
+}
diff --git a/modules/eventlogging/manifests/init.pp 
b/modules/eventlogging/manifests/init.pp
index 16b44e0..f999bb6 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -3,9 +3,7 @@
 class eventlogging( $archive_destinations = [] ) {
 
class { 'eventlogging::supervisor': }
-   class { 'eventlogging::notebook':
-   exec_files => [ '/var/lib/ipython/helpers/helpers.py' ],
-   }
+   class { 'eventlogging::analysis': }
class { 'eventlogging::ganglia': }
class { 'eventlogging::archive':
destinations => $archive_destinations,
diff --git a/modules/eventlogging/manifests/notebook.pp 
b/modules/eventlogging/manifests/notebook.pp
deleted file mode 100644
index 504c470..000
--- a/modules/eventlogging/manifests/notebook.pp
+++ /dev/null
@@ -1,110 +0,0 @@
-# == Class: eventlogging::notebook
-#
-# Configures an integrated, web-based numeric computation environment
-# (like Mathematica), based on PyLab and IPython Notebook.
-# See 
-# and .
-#
-# === Parameters
-#
-# [*ipython_dir*]
-#   IPython working directory.
-#
-# [*ipython_profile*]
-#   Name of IPython profile to create.
-#
-# [*ipython_user*]
-#   Create this user account and run IPython as this user.
-#
-# [*notebook_dir*]
-#   Specifies where IPython should archive notebooks.
-#
-# [*notebook_ip*]
-#   Interface on which the notebook server will listen (or '*' for all
-#   interfaces).
-#
-# [*notebook_port*]
-#   The port the notebook server will listen on.
-#
-# [*exec_files*]
-#   Array of Python files to execute at start of Notebook session.
-#
-class eventlogging::notebook(
-   $ipython_dir = '/var/lib/ipython',
-   $ipython_profile = 'nbserver',
-   $ipython_user = 'ipython',
-   $graph_dir = '/var/lib/ipython/graphs',
-   $notebook_dir = '/var/lib/ipython/notebooks',
-   $notebook_ip = '*',
-   $notebook_port = ,
-   $exec_files = []
-) {
-
-   package { [
-   'ipython-notebook',
-   'python-matplotlib',
-   'python-numpy',
-   'python-pandas',
-   'python-pexpect',
-   'python-scipy',
-   ]:
-   ensure => latest,
-   }
-
-   systemuser { $ipython_user:
-   name => $ipython_user,
-   home => $ipython_dir,
-   }
-
-   file { $notebook_dir:
-   ensure  => directory,
-   

[MediaWiki-commits] [Gerrit] Update README - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Update README
..


Update README

Re-write the documentation, on the off-chance that this module proves useful to
people outside the WMF.

Change-Id: I9b3297f540154b1d08f1d4be3324a4a08bb84c25
---
D modules/ipython/README
A modules/ipython/README.mkd
2 files changed, 56 insertions(+), 34 deletions(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/ipython/README b/modules/ipython/README
deleted file mode 100644
index 5a02dc7..000
--- a/modules/ipython/README
+++ /dev/null
@@ -1,34 +0,0 @@
-== Puppet module for IPython
-
-=== What is it?
-
-This folder contains a Puppet module for configuring an integrated, web-based
-numeric computation environment (like Mathematica), based on PyLab and IPython
-Notebook.
-
-See RDoc in manifests/init.pp for a listing of various configuration options
-and their default values.
-
-
-=== Usage
-
-To use the default options, you can simply add this to your manifest:
-
-   class { 'ipython::notebook': }
-
-
-=== Limitations
-
- * Ubuntu-specific, as it depends on Upstart.
-
-
-=== Links
-
- * http://ipython.org/ipython-doc/dev/interactive/htmlnotebook.html
- * http://www.scipy.org/PyLab
-
-
-=== Copyright
-
-  Copyright (C) 2013 by Ori Livneh 
-  Licensed under the GNU Public License, version 2 or later.
diff --git a/modules/ipython/README.mkd b/modules/ipython/README.mkd
new file mode 100644
index 000..99a3d9a
--- /dev/null
+++ b/modules/ipython/README.mkd
@@ -0,0 +1,56 @@
+Puppet module for IPython
+=
+
+What is it?
+---
+
+This folder contains a Puppet module for [IPython][1], a platform for
+interactive computing using Python. The module is especially suited for
+configuring [IPython Notebook][2], an integrated, web-based numeric
+computation environment (like Mathematica), with rich support for
+mathematical expressions, inline plots and other rich media.
+
+
+Usage
+-
+
+The typical use-case for this module is the configuration of an IPython
+Notebook server. To provision this setup, simply include the class
+'ipython::notebook'. By default, it will set up an IPython Notebook
+web server, running under a dedicated 'ipython' user account.
+
+Example:
+
+class { 'ipython::notebook':
+port => 80,
+}
+
+For a full listing of module parameters, see the comment blocks at the
+top of each file in the 'manifests' subdirectory.
+
+
+Limitations
+---
+
+ * This module targets Ubuntu and has not been tested against other
+   platforms. It depends on Upstart and on packages in Ubuntu's
+   'universe' component.
+ * Support for configuring [IPython for parallel computing][3] is
+   currently rudimentary, but additional work on this front is
+   forthcoming.
+
+
+License
+---
+
+  Copyright (C) 2013 by Ori Livneh 
+
+  Licensed under the GNU Public License, version 2 or later.
+
+
+
+ [1]: http://ipython.org/
+
+ [2]: http://ipython.org/ipython-doc/dev/interactive/htmlnotebook.html
+
+ [3]: http://ipython.org/ipython-doc/dev/parallel/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9b3297f540154b1d08f1d4be3324a4a08bb84c25
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Faidon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Provide 'certfile' and 'password' parameters - change (operations/puppet)

[Faidon (Code Review)]

Faidon has submitted this change and it was merged.

Change subject: Provide 'certfile' and 'password' parameters
..


Provide 'certfile' and 'password' parameters

IPython's auth and SSL features are a bit dinky, so we decided to keep the
service private rather than rely on the robustness of these features. I'd like
this module to be useful to third parties, though, so I added class parameters
for these configuration options. I'm sure they have their use-cases -- just not
for us.

I also added an explicit check for $::operatingsystem which fails if it's not
"Ubuntu". I'd like to add support for additional platforms in the future, but
in the meantime it's better to clearly communicate this limitation.

Change-Id: Idd4f5c6f6ac6c286d7fd661908748cd4c8d3f759
---
M modules/ipython/manifests/init.pp
M modules/ipython/manifests/notebook.pp
M modules/ipython/templates/ipython_notebook_config.py.erb
3 files changed, 23 insertions(+), 1 deletion(-)

Approvals:
  Faidon: Verified; Looks good to me, approved



diff --git a/modules/ipython/manifests/init.pp 
b/modules/ipython/manifests/init.pp
index b5d24ba..1dbbb3b 100644
--- a/modules/ipython/manifests/init.pp
+++ b/modules/ipython/manifests/init.pp
@@ -37,6 +37,10 @@
$group  = 'ipython'
 ) {
 
+   if $::operatingsystem != "Ubuntu" {
+   fail("Module $module_name is not supported on 
$::operatingsystem")
+   }
+
package { 'ipython':
ensure => latest,
}
diff --git a/modules/ipython/manifests/notebook.pp 
b/modules/ipython/manifests/notebook.pp
index 85206c4..70f82cd 100644
--- a/modules/ipython/manifests/notebook.pp
+++ b/modules/ipython/manifests/notebook.pp
@@ -37,6 +37,15 @@
 # [*port*]
 #   The port the Notebook server will listen on (default: ).
 #
+# [*certfile*]
+#   Fully qualified path to your SSL certificate's .pem file. If
+#   unspecified, the server will not be configured for SSL.
+#
+# [*password*]
+#   If specified, the web interface will require users to authenticate
+#   using this shared secret key. By default, the server does not
+#   attempt to authenticate users.
+#
 # [*exec_files*]
 #   Array of fully qualified paths to Python files to execute at start of
 #   Notebook session (default: none).
@@ -50,6 +59,8 @@
$notebookdir  = "${ipython::ipythondir}/notebooks",
$port = ,
$ip   = '*',
+   $certfile = undef,
+   $password = undef,
$exec_files   = []
 ) inherits ipython {
 
@@ -94,6 +105,6 @@
require   => [
Package['ipython-notebook'],
File['/etc/init/ipython-notebook.conf'],
-   ]
+   ],
}
 }
diff --git a/modules/ipython/templates/ipython_notebook_config.py.erb 
b/modules/ipython/templates/ipython_notebook_config.py.erb
index da81fd6..107bfc4 100644
--- a/modules/ipython/templates/ipython_notebook_config.py.erb
+++ b/modules/ipython/templates/ipython_notebook_config.py.erb
@@ -7,6 +7,13 @@
 c.NotebookApp.open_browser = False
 c.NotebookApp.ip = '<%= @ip %>'
 c.NotebookApp.port = <%= @port %>
+<% if @certfile -%>
+c.NotebookApp.certfile = u'<%= @certfile %>'
+<% end -%>
+<% if @password -%>
+c.NotebookApp.password = u'sha1:<%= scope.function_sha1([password]) %>'
+<% end -%>
+
 c.NotebookManager.notebook_dir = '<%= @notebookdir %>'
 
 c.InteractiveShellApp.exec_files = [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd4f5c6f6ac6c286d7fd661908748cd4c8d3f759
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh 
Gerrit-Reviewer: Faidon 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Remove usage of DataType->getParsers - change (mediawiki...Wikibase)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has uploaded a new change for review.

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


Change subject: Remove usage of DataType->getParsers
..

Remove usage of DataType->getParsers

Change-Id: Iae25b06c54b4e022bea9e139fe74e7b2e3efdc02
---
M lib/tests/phpunit/DataTypesTest.php
1 file changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/91/61591/1

diff --git a/lib/tests/phpunit/DataTypesTest.php 
b/lib/tests/phpunit/DataTypesTest.php
index 978fe10..88e8a65 100644
--- a/lib/tests/phpunit/DataTypesTest.php
+++ b/lib/tests/phpunit/DataTypesTest.php
@@ -40,16 +40,7 @@
}
 
public function testItemDataType() {
-   $dataType = $this->getFactory()->getType( 'wikibase-item' );
-
-   $parsers = $dataType->getParsers();
-   $parser = $parsers[0];
-
-   $expected = new \Wikibase\EntityId( 
\Wikibase\Item::ENTITY_TYPE, 42 );
-
-   $result = $parser->parse( $expected->getPrefixedId() );
-
-   $this->assertTrue( $expected->equals( $result ) );
+   $this->markTestIncomplete();
}
 
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae25b06c54b4e022bea9e139fe74e7b2e3efdc02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

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

[MediaWiki-commits] [Gerrit] (bug 47219) Allow specifying change type of Wikipedia feed i... - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: (bug 47219) Allow specifying change type of Wikipedia feed items
..


(bug 47219) Allow specifying change type of Wikipedia feed items

It exposes field /rc_type/ as ApiQueryRecentChanges does thus allowing
user to define which (edit, external, new, log) changes to show in feed.

Bug: 47219
Change-Id: If22827129b04d423711f921307dc820d4840d9d1
---
M RELEASE-NOTES-1.22
M includes/api/ApiFeedWatchlist.php
M includes/api/ApiQueryWatchlist.php
3 files changed, 85 insertions(+), 0 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index aad11a0..ebff9d4 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -95,6 +95,7 @@
 * BREAKING CHANGE: list=allpages, list=langbacklinks, and prop=langlinks do not
   apply the new LanguageLinks hook, and thus only consider language links
   stored in the database.
+* (bug 47219) Allow specifying change type of Wikipedia feed items
 
 === Languages updated in 1.22===
 
diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index ddcd6ac..9f6b8b4 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -91,6 +91,9 @@
if ( $params['wlshow'] !== null ) {
$fauxReqArr['wlshow'] = $params['wlshow'];
}
+   if ( $params['wltype'] !== null ) {
+   $fauxReqArr['wltype'] = $params['wltype'];
+   }
 
// Support linking to diffs instead of article
if ( $params['linktodiffs'] ) {
@@ -222,12 +225,14 @@
$ret['wlowner'] = $wlparams['owner'];
$ret['wltoken'] = $wlparams['token'];
$ret['wlshow'] = $wlparams['show'];
+   $ret['wltype'] = $wlparams['type'];
$ret['wlexcludeuser'] = $wlparams['excludeuser'];
} else {
$ret['allrev'] = null;
$ret['wlowner'] = null;
$ret['wltoken'] = null;
$ret['wlshow'] = null;
+   $ret['wltype'] = null;
$ret['wlexcludeuser'] = null;
}
return $ret;
@@ -244,6 +249,7 @@
'wlowner' => $wldescr['owner'],
'wltoken' => $wldescr['token'],
'wlshow' => $wldescr['show'],
+   'wltype' => $wldescr['type'],
'wlexcludeuser' => $wldescr['excludeuser'],
);
}
diff --git a/includes/api/ApiQueryWatchlist.php 
b/includes/api/ApiQueryWatchlist.php
index 3ee15f6..22843f5 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -170,6 +170,10 @@
$this->addWhereIf( 'rc_patrolled != 0', isset( 
$show['patrolled'] ) );
}
 
+   if ( !is_null( $params['type'] ) ) {
+   $this->addWhereFld( 'rc_type', $this->parseRCType( 
$params['type'] ) );
+   }
+
if ( !is_null( $params['user'] ) && !is_null( 
$params['excludeuser'] ) ) {
$this->dieUsage( 'user and excludeuser cannot be used 
together', 'user-excludeuser' );
}
@@ -224,6 +228,32 @@
 
private function extractRowInfo( $row ) {
$vals = array();
+
+   $type = intval( $row->rc_type );
+
+   /* Determine what kind of change this was. */
+   switch ( $type ) {
+   case RC_EDIT:
+   $vals['type'] = 'edit';
+   break;
+   case RC_NEW:
+   $vals['type'] = 'new';
+   break;
+   case RC_MOVE:
+   $vals['type'] = 'move';
+   break;
+   case RC_LOG:
+   $vals['type'] = 'log';
+   break;
+   case RC_EXTERNAL:
+   $vals['type'] = 'external';
+   break;
+   case RC_MOVE_OVER_REDIRECT:
+   $vals['type'] = 'move over redirect';
+   break;
+   default:
+   $vals['type'] = $type;
+   }
 
if ( $this->fld_ids ) {
$vals['pageid'] = intval( $row->rc_cur_id );
@@ -311,6 +341,27 @@
return $vals;
}
 
+   /* Copied from ApiQueryRecentChanges. */
+  

[MediaWiki-commits] [Gerrit] add test for Preferences/Date and time, consolidate Preferen... - change (qa/browsertests)

[Cmcmahon (Code Review)]

Cmcmahon has uploaded a new change for review.

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


Change subject: add test for Preferences/Date and time, consolidate Preferences 
tests in preferences_readonly.feature, use new target tags
..

add test for Preferences/Date and time, consolidate Preferences tests in 
preferences_readonly.feature, use new target tags

Change-Id: Idf3db3b3ac756bcf3e0802b30474c4deacdecd51
---
R features/preferences_readonly.feature
A features/step_definitions/preferences_datetime_steps.rb
A features/support/pages/date_time_page.rb
3 files changed, 61 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests 
refs/changes/92/61592/1

diff --git a/features/preferences_appearance_readonly.feature 
b/features/preferences_readonly.feature
similarity index 66%
rename from features/preferences_appearance_readonly.feature
rename to features/preferences_readonly.feature
index f33a9ed..058d9c6 100644
--- a/features/preferences_appearance_readonly.feature
+++ b/features/preferences_readonly.feature
@@ -1,5 +1,4 @@
-# Feature files that end with "_readonly.feature" should be read only, so they 
could be run at en.wikipedia.org
-@en.wikipedia.beta.wmflabs.org @en.wikipedia.org @login
+@login @en.wikipedia.beta.wmflabs.org @en.wikipedia.org @test2.wikipedia.org
 Feature: Preferences
 
   Background:
@@ -19,3 +18,11 @@
 And I have Math options radio buttons
 And I can click Save
 And I can restore default settings
+
+Scenario: Date and time
+  When I click Date and time
+Then I can select date format
+  And I can see server time
+  And I can see local time
+  And I can select my time zone
+  
diff --git a/features/step_definitions/preferences_datetime_steps.rb 
b/features/step_definitions/preferences_datetime_steps.rb
new file mode 100644
index 000..0c0cd7a
--- /dev/null
+++ b/features/step_definitions/preferences_datetime_steps.rb
@@ -0,0 +1,30 @@
+When(/^I click Date and time$/) do
+  on(PreferencesPage).date_and_time_link
+end
+
+Then(/^I can select date format$/) do
+  on(DateTimePage) do |page|
+page.no_preference_radio_element.should exist
+page.mo_day_year_radio_element.should exist
+page.day_mo_year_radio_element.should exist
+page.year_mo_day_radio_element.should exist
+page.iso_8601_radio_element.should exist
+  end
+end
+
+Then(/^I can see server time$/) do
+  @browser.text.should match Regexp.escape('Server time')
+end
+
+Then(/^I can see local time$/) do
+  @browser.text.should match Regexp.escape('Local time')
+  on(DateTimePage).local_time_span_element.should exist
+end
+
+Then(/^I can select my time zone$/) do
+  @browser.text.should match Regexp.escape('Time zone')
+on(DateTimePage) do |page|
+  page.time_offset_select_element.should exist
+  page.other_offset_element.should exist
+  end
+end
diff --git a/features/support/pages/date_time_page.rb 
b/features/support/pages/date_time_page.rb
new file mode 100644
index 000..b773145
--- /dev/null
+++ b/features/support/pages/date_time_page.rb
@@ -0,0 +1,22 @@
+class DateTimePage
+  include PageObject
+
+  def self.url
+if ENV['MEDIAWIKI_URL']
+  mediawiki_url = ENV['MEDIAWIKI_URL']
+else
+  mediawiki_url = 'http://en.wikipedia.beta.wmflabs.org/wiki/'
+end
+"#{mediawiki_url}Special:Preferences#mw-prefsection-rendering"
+  end
+  page_url url
+  
+  radio_button(:day_mo_year_radio, id: 'mw-input-wpdate-dmy')
+  radio_button(:iso_8601_radio, id: 'mw-input-wpdate-ISO_8601')
+  span(:local_time_span, id: 'wpLocalTime')
+  radio_button(:mo_day_year_radio, id: 'mw-input-wpdate-mdy')
+  radio_button(:no_preference_radio, id: 'mw-input-wpdate-default')
+  text_field(:other_offset, id: 'mw-input-wptimecorrection-other')
+  select_list(:time_offset_select, id: 'mw-input-wptimecorrection')
+  radio_button(:year_mo_day_radio, id: 'mw-input-wpdate-ymd')
+end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf3db3b3ac756bcf3e0802b30474c4deacdecd51
Gerrit-PatchSet: 1
Gerrit-Project: qa/browsertests
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon 

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