from:"Tobias Gritschacher $Code Review$"

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Add dropdown indicator to namespace selection field

2017-12-14 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398251 )

Change subject: Add dropdown indicator to namespace selection field
..

Add dropdown indicator to namespace selection field

Bug: T177928
Bug: T182044
Change-Id: I981d03b4b18ff227d6d5f1ffe8504ab7eda3e0f9
---
M modules/ui/ext.advancedSearch.NamespaceFilters.js
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/modules/ui/ext.advancedSearch.NamespaceFilters.js 
b/modules/ui/ext.advancedSearch.NamespaceFilters.js
index 71db8ff..b65be49 100644
--- a/modules/ui/ext.advancedSearch.NamespaceFilters.js
+++ b/modules/ui/ext.advancedSearch.NamespaceFilters.js
@@ -17,6 +17,7 @@
 */
mw.libs.advancedSearch.ui.NamespaceFilters = function ( store, config ) 
{
config = $.extend( {
+   indicator: 'down',
namespaces: {},
namespaceIcons: {
2: 'userAvatar',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I981d03b4b18ff227d6d5f1ffe8504ab7eda3e0f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Adding placeholder text to namespace selection field

2017-12-14 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398245 )

Change subject: Adding placeholder text to namespace selection field
..

Adding placeholder text to namespace selection field

Bug: T182044
Change-Id: I492dda985ba2696fa25bd605449ecea3d25598e8
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.advancedSearch.init.js
4 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/45/398245/1

diff --git a/extension.json b/extension.json
index cb8d090..0ee97e0 100644
--- a/extension.json
+++ b/extension.json
@@ -63,6 +63,7 @@
"advancedSearch-namespaces-articles",
"advancedSearch-namespaces-preset-all",
"advancedSearch-namespaces-search-in",
+   "advancedSearch-namespaces-placeholder",
"advancedSearch-placeholder-commas",
"advancedsearch-field-plain",
"advancedsearch-field-phrase",
diff --git a/i18n/en.json b/i18n/en.json
index 5a0fd49..dc5463a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -57,6 +57,7 @@
"advancedSearch-namespaces-articles": "Articles",
"advancedSearch-namespaces-search-in": "Search in:",
"advancedSearch-namespaces-preset-all": "All",
+   "advancedSearch-namespaces-placeholder": "Add namespaces",
 
"advancedSearch-beta-feature-message": "Advanced Search Interface",
"advancedSearch-beta-feature-description": "Easy access to advanced 
search capabilities on [[Special:Search]]."
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 1656304..bfd63fb 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -55,6 +55,7 @@
"advancedSearch-namespaces-articles": "Label for the 'Articles' 
namespace (usually with an empty translated namespace 
label)\n{{Identical|Article}}",
"advancedSearch-namespaces-search-in": "Label for the 'Search in' 
section heading of the namespace section",
"advancedSearch-namespaces-preset-all": "Label for the namespace preset 
'All namespaces'\n{{Identical|All}}",
+   "advancedSearch-namespaces-placeholder": "Placeholder text shown in the 
namespace selection field",
"advancedSearch-beta-feature-message": "Label for the AdvancedSearch 
Beta Feature.",
"advancedSearch-beta-feature-description": "Description for the 
AdvancedSearch Beta Feature, describing the feature that will be enabled."
 }
diff --git a/modules/ext.advancedSearch.init.js 
b/modules/ext.advancedSearch.init.js
index 1c7f506..d3d4b07 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -444,7 +444,8 @@
$advancedSearch.append( currentSearch.$element );
 
var namespaceSelection = new 
mw.libs.advancedSearch.ui.NamespaceFilters( state, {
-   namespaces: prepareNamespaces()
+   namespaces: prepareNamespaces(),
+   placeholder: mw.msg( 
'advancedSearch-namespaces-placeholder' )
} ),
namespacePresets = new 
mw.libs.advancedSearch.ui.NamespacePresets( state, {
classes: [ 'mw-advancedSearch-namespacePresets' ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I492dda985ba2696fa25bd605449ecea3d25598e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Remove Main Page as default value and add hint

2017-10-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383118 )

Change subject: Remove Main Page as default value and add hint
..

Remove Main Page as default value and add hint

We don't support to simulate edit conflicts for protected pages, so
removing the default value and placeholder for the Main Page as it is
proteted in most Wikis. Adding a hint that only non-protected pages can be
used.

Bug: T177480
Change-Id: I5f11983f564d875727cfe4769d57e8ee97384b38
---
M i18n/en.json
M includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
M 
tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
3 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/18/383118/1

diff --git a/i18n/en.json b/i18n/en.json
index c3c64b3..983b332 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,7 +43,7 @@
"twoColConflict-previous-dialog": "Previous",
"twoColConflict-next-dialog": "Next",
"twoColConflict-close-dialog": "Close",
-   "twoColConflict-test-title-label": "Enter the title of a wiki page for 
which the edit conflict should be simulated:",
+   "twoColConflict-test-title-label": "Enter the title of a non-protected 
wiki page for which the edit conflict should be simulated:",
"twoColConflict-test-title-submit": "Show edit page",
"twoColConflict-test-title-not-existing": "There is no page with this 
title.",
"twoColConflict-test-text-submit": "Create conflict",
diff --git a/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php 
b/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
index cb1f46a..8342e36 100644
--- a/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
+++ b/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
@@ -38,9 +38,7 @@
new TextInputWidget(
[
'name' => 
'mw-twocolconflict-test-title',
-   'value' => 
Title::newMainPage()->getText(),
'classes' => [ 
'mw-twocolconflict-test-title' ],
-   'placeholder' => 
Title::newMainPage()->getText(),
'suggestions' => false,
'autofocus' => true,
'required' => true,
diff --git 
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
 
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
index b5370e8..dbe8f35 100644
--- 
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
+++ 
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
@@ -96,7 +96,6 @@
$html,
is( htmlPiece( havingChild(
both( withTagName( 'input' ) )
-   ->andAlso( withAttribute( 'placeholder' 
)->havingValue( 'Main Page' ) )
->andAlso( withAttribute( 'name' 
)->havingValue( 'mw-twocolconflict-test-title' ) )
) ) )
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f11983f564d875727cfe4769d57e8ee97384b38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: New beta feature description text

2017-10-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382150 )

Change subject: New beta feature description text
..


New beta feature description text

Bug: T170375
Change-Id: I50b293d77194e6892ebbaf099883f308562152e8
---
M i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved



diff --git a/i18n/en.json b/i18n/en.json
index 3f3b01e..c3c64b3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -7,7 +7,7 @@
"twoColConflict": "TwoColConflict",
"twoColConflict-desc": "Showing a side-by-side edit merge screen for 
edit conflict resolution",
"twoColConflict-beta-feature-message": "Two column edit conflict",
-   "twoColConflict-beta-feature-description": "Show the edit conflict view 
using a more advanced two column view.",
+   "twoColConflict-beta-feature-description": "Show the edit conflict view 
using a more advanced two column view.\n\nHint: If you don't want to wait until 
you run into a real edit conflict, you can simulate edit conflicts on our test 
page. 
[//meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts/Feedback_Round_Test_Page
 Click here] to find out how it works.",
"twoColConflict-explainconflict": "Warning: Another 
user just edited and saved this page. There is a conflict between your version 
and the current version. You will have to merge your changes into the current 
text version. Only the text in the editor field will be saved when you click on 
\"$1\".",
"twoColConflict-changes-col-title": "Conflicting changes",
"twoColConflict-changes-col-desc-1": "Differences between",
@@ -43,7 +43,7 @@
"twoColConflict-previous-dialog": "Previous",
"twoColConflict-next-dialog": "Next",
"twoColConflict-close-dialog": "Close",
-   "twoColConflict-test-title-label": "Title of the wiki page for which 
the edit conflict should be simulated",
+   "twoColConflict-test-title-label": "Enter the title of a wiki page for 
which the edit conflict should be simulated:",
"twoColConflict-test-title-submit": "Show edit page",
"twoColConflict-test-title-not-existing": "There is no page with this 
title.",
"twoColConflict-test-text-submit": "Create conflict",
@@ -51,7 +51,7 @@
"twoColConflict-test-edit-hint": "Make some changes below. They won't 
be saved. They will only be used to simulate an example edit conflict.",
"twoColConflict-test-conflict-hint": "This is the test conflict. 
Changes won't be saved but can be previewed.",
"twoColConflict-test-preview-submit": "Simulate save changes",
-   "twoColConflict-test-preview-hint": "Thanks for trying out the Two 
Column Edit Conflict interface! Help us make it better by 
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View letting us 
know what you think].\n\nBelow the result of your test edit conflict 
resolution.",
+   "twoColConflict-test-preview-hint": "Thanks for trying out the Two 
Column Edit Conflict interface! Help us make improvements by providing us with 
your feedback 
[//meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts/Feedback_Round_Test_Page
 here].\n\nBelow are the results of your test edit conflict resolution.",
"twoColConflict-test-username": "ConflictTest User",
"twoColConflict-test-summary-text": "Conflict test edit summary"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50b293d77194e6892ebbaf099883f308562152e8
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Andrew-WMDE 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: onSpecialPage_initList get user from context & check type

2017-10-05 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382432 )

Change subject: onSpecialPage_initList get user from context & check type
..


onSpecialPage_initList get user from context & check type

Bug: T177468
Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
---
M includes/TwoColConflictHooks.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved



diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index f59fdf4..5cef329 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -110,8 +110,7 @@
 * @return bool
 */
public static function onSpecialPage_initList( &$aSpecialPages ) {
-   global $wgUser;
-
+   $user = RequestContext::getMain()->getUser();
$config = MediaWikiServices::getInstance()->getMainConfig();
 
/**
@@ -121,7 +120,8 @@
if (
$config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
-   !BetaFeatures::isFeatureEnabled( $wgUser, 
'twocolconflict' )
+   $user instanceof User &&
+   !BetaFeatures::isFeatureEnabled( $user, 
'twocolconflict' )
) {
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb721279bb9443922377d40cc9dbf0fee538898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Check for Wikidiff2 version 0.3 NOT for 0.3.0

2017-09-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/375784 )

Change subject: Check for Wikidiff2 version 0.3 NOT for 0.3.0
..

Check for Wikidiff2 version 0.3 NOT for 0.3.0

version_compare( '0.3', '0.3.0', '>=' ) gives false, so we need to check
for 0.3 since the Wikidiff2 version is defined as 0.3 in
https://gerrit.wikimedia.org/r/#/c/319866/60/Wikidiff2.h

Bug: T166571
Change-Id: Id6e9f402af2fab784a3db2444f201022e2d0de3e
---
M includes/diff/DifferenceEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/84/375784/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 7f9af60..34f28523 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -918,7 +918,7 @@
$wikidiff2Version = phpversion( 'wikidiff2' );
if (
$wikidiff2Version !== false &&
-   version_compare( $wikidiff2Version, '0.3.0', 
'>=' )
+   version_compare( $wikidiff2Version, '0.3', '>=' 
)
) {
$text = wikidiff2_do_diff(
$otext,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6e9f402af2fab784a3db2444f201022e2d0de3e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[REL1_27]: Fix errors leading to wrong slider scroll positions

2017-06-23 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/361037 )

Change subject: Fix errors leading to wrong slider scroll positions
..


Fix errors leading to wrong slider scroll positions

The detection touched in this patch addresses slightly different
kinds of RTL handling in browsers. The detection how things are
handled seems to be broken in the mentioned Chrome V8 versions.

The workaround takes care of that issue. With Chrome V8 6.0 this
should be fixed and the workaround can be removed.

P.S.: Credits to Leszek for the idea what's actually going on.

Bug: T168299
Change-Id: I068c2fb6ba60189004c0ec6661fcd346af16126c
(cherry picked from commit 6ffe96bc4c2d9ee9ae3dcf1865e1993278f50d03)
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved
  WMDE-Fisch: Verified



diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index 8b6cc98..a6796dc 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -621,7 +621,16 @@
 * @return {string} - 'default', 'negative' or 'reverse'
 */
determineRtlScrollType: function () {
-   var $dummy = $( '' )
+   var isChrome = /chrom(e|ium)/.test( 
navigator.userAgent.toLowerCase() ),
+   $dummy;
+
+   // in Chrome V8 5.8.283 and 5.9.211 the detection below 
gives wrong results leading to strange behavior
+   // Chrome V8 6.0 seems to fix that issue so this 
workaround can be removed then
+   if ( isChrome ) {
+   return 'default';
+   }
+
+   $dummy = $( '' )
.css( {
dir: 'rtl',
width: '1px',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I068c2fb6ba60189004c0ec6661fcd346af16126c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: REL1_27
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Configure AdvancedSearch as a betafeature

2017-06-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/358597 )

Change subject: Configure AdvancedSearch as a betafeature
..

Configure AdvancedSearch as a betafeature

Bug: T167277
Change-Id: I383810b07739f3761bd15a04819ecbe4fd929f5b
---
M AdvancedSearch.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
A resources/AdvancedSearch-beta-features-ltr.svg
A resources/AdvancedSearch-beta-features-rtl.svg
6 files changed, 1,153 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/97/358597/1

diff --git a/AdvancedSearch.hooks.php b/AdvancedSearch.hooks.php
index ce7d65b..24000a9 100644
--- a/AdvancedSearch.hooks.php
+++ b/AdvancedSearch.hooks.php
@@ -2,7 +2,10 @@
 
 namespace AdvancedSearch;
 
+use BetaFeatures;
+use MediaWiki\MediaWikiServices;
 use SpecialPage;
+use User;
 
 class Hooks {
 
@@ -13,6 +16,15 @@
 * @param string $subpage
 */
public static function onSpecialPageBeforeExecute( SpecialPage 
$special, $subpage ) {
+   /**
+* If the BetaFeatures extension is loaded then require the 
current user to have the feature enabled.
+*/
+   if (
+   class_exists( BetaFeatures::class ) &&
+   !BetaFeatures::isFeatureEnabled( $special->getUser(), 
'advancedsearch' )
+   ) {
+   return true;
+   }
if ( $special->getName() === 'Search' ) {
$special->getOutput()->addModules( 
'ext.advancedSearch.init' );
}
@@ -38,4 +50,25 @@
$profiles = [];
}
 
+   /**
+* @param User $user
+* @param array[] &$prefs
+*/
+   public static function getBetaFeaturePreferences( User $user, array 
&$prefs ) {
+   $config = MediaWikiServices::getInstance()->getMainConfig();
+   $extensionAssetsPath = $config->get( 'ExtensionAssetsPath' );
+
+   $prefs['advancedsearch'] = [
+   'label-message' => 
'advancedSearch-beta-feature-message',
+   'desc-message' => 
'advancedSearch-beta-feature-description',
+   'screenshot' => [
+   'ltr' => 
"$extensionAssetsPath/AdvancedSearch/resources/AdvancedSearch-beta-features-ltr.svg",
+   'rtl' => 
"$extensionAssetsPath/AdvancedSearch/resources/AdvancedSearch-beta-features-rtl.svg",
+   ],
+   'info-link'
+   => 
'https://www.mediawiki.org/wiki/Extension:AdvancedSearch',
+   'discussion-link'
+   => 
'https://www.mediawiki.org/wiki/Extension_talk:AdvancedSearch',
+   ];
+   }
 }
diff --git a/extension.json b/extension.json
index b7a3950..c530165 100644
--- a/extension.json
+++ b/extension.json
@@ -13,6 +13,9 @@
"AdvancedSearch\\Hooks": "AdvancedSearch.hooks.php"
},
"Hooks": {
+   "GetBetaFeaturePreferences": [
+   "AdvancedSearch\\Hooks::getBetaFeaturePreferences"
+   ],
"SpecialPageBeforeExecute": [
"AdvancedSearch\\Hooks::onSpecialPageBeforeExecute"
],
diff --git a/i18n/en.json b/i18n/en.json
index 250f231..6113159 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -26,5 +26,7 @@
"advancedsearch-filetype-document-pdf": "PDF",
"advancedSearch-filesize-equals": "equal to",
"advancedSearch-filesize-greater-than": "greater than",
-   "advancedSearch-filesize-smaller-than": "lower than"
+   "advancedSearch-filesize-smaller-than": "lower than",
+   "advancedSearch-beta-feature-message": "Advanced Search Interface",
+   "advancedSearch-beta-feature-description": "Easy access to advanced 
search capabilities on [[Special:Search]]."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5777a88..01af3be 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -26,5 +26,7 @@
"advancedsearch-filetype-document-pdf": "Label for PDF file/mime type",
"advancedSearch-filesize-equals": "Label for the file width/height 
'equals' comparator selection",
"advancedSearch-filesize-greater-than": "Label for the file 
width/height 'greater than' comparator selection",
-   "advancedSearch-filesize-smaller-than": "Label for the file 
width/height 'smaller than' comparator selection"
+   "advancedSearch-filesize-smaller-than": "Label for the file 
width/height 'smaller than' comparator selection",
+   "advancedSearch-beta-feature-message": "Label for the AdvancedSearch 
Beta Feature.",
+   "advancedSearch-beta-feature-description": "Description for the 
AdvancedSearch Beta Feature, describing the feature that will be

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Introduce config var for moved-paragraph-detection threshold

2017-06-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357826 )

Change subject: Introduce config var for moved-paragraph-detection threshold
..

Introduce config var for moved-paragraph-detection threshold

This introduces a configuration variable for the bailout threshold for
the moved-paragraph-detection in wikidiff2.
This allows to rollout a new version of wikidiff2 that supports
detecting changes in moved paragraphs without changing behaviour of all
wikis in production as the default value of the setting (0) will leave the
new feature disabled.

Bug: T166571
Change-Id: Ic01054354a4fbba410e58c9873edcbde797f883d
Depends-On: Ibf53658299115c2a86628c30e8ebe96795379193
---
M includes/DefaultSettings.php
M includes/diff/DifferenceEngine.php
M tests/phan/stubs/wikidiff.php
3 files changed, 23 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/26/357826/4

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5b7ca3e..0e132d0 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8282,6 +8282,19 @@
 $wgExternalDiffEngine = false;
 
 /**
+ * wikidiff2 supports detection of changes in moved paragraphs.
+ * This setting controls the maximum number of paragraphs to compare before it 
bails out.
+ * Supported values:
+ * * 0: detection of moved paragraphs is disabled
+ * * int > 0: maximum number of paragraphs to compare
+ * This setting is only effective if the wikidiff2 PHP/HHVM module is used as 
diffengine.
+ * See $wgExternalDiffEngine.
+ *
+ * @since 1.30
+ */
+$wgWikiDiff2MoveParagraphDetectionCutoff = 0;
+
+/**
  * Disable redirects to special pages and interwiki redirects, which use a 302
  * and have no "redirected from" link.
  *
diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index b0ab244..e8c19d6 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -909,9 +909,16 @@
}
 
if ( function_exists( 'wikidiff2_do_diff' ) && 
$wgExternalDiffEngine === false ) {
+   $config = 
MediaWikiServices::getInstance()->getMainConfig();
+
# Better external diff engine, the 2 may some day be 
dropped
# This one does the escaping and segmenting itself
-   $text = wikidiff2_do_diff( $otext, $ntext, 2 );
+   $text = wikidiff2_do_diff(
+   $otext,
+   $ntext,
+   2,
+   $config->get( 
'WikiDiff2MoveParagraphDetectionCutoff ' )
+   );
$text .= $this->debug( 'wikidiff2' );
 
return $text;
diff --git a/tests/phan/stubs/wikidiff.php b/tests/phan/stubs/wikidiff.php
index 9bd5d8d..0897574 100644
--- a/tests/phan/stubs/wikidiff.php
+++ b/tests/phan/stubs/wikidiff.php
@@ -22,7 +22,8 @@
  * @param string $text1
  * @param string $text2
  * @param int $numContextLines
+ * @param int $moveParagraphDetectionCutoff
  * @return string
  */
-function wikidiff2_do_diff( $text1, $text2, $numContextLines ) {
+function wikidiff2_do_diff( $text1, $text2, $numContextLines, 
$moveParagraphDetectionCutoff = 0 ) {
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic01054354a4fbba410e58c9873edcbde797f883d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Jkroll 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Configure AdvancedSearch as a betafeature

2017-06-08 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357843 )

Change subject: Configure AdvancedSearch as a betafeature
..

Configure AdvancedSearch as a betafeature

Bug: T167277
Change-Id: I27f1d4a51a074e2b664295f71a2174167c25e601
---
M AdvancedSearch.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
A resources/AdvancedSearch-beta-features-ltr.svg
A resources/AdvancedSearch-beta-features-rtl.svg
6 files changed, 850 insertions(+), 2 deletions(-)


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

diff --git a/AdvancedSearch.hooks.php b/AdvancedSearch.hooks.php
index bbd41f7..12b7db0 100644
--- a/AdvancedSearch.hooks.php
+++ b/AdvancedSearch.hooks.php
@@ -4,6 +4,8 @@
 
 use OutputPage;
 use Skin;
+use User;
+use MediaWiki\MediaWikiServices;
 
 class Hooks {
 
@@ -40,4 +42,25 @@
$profiles = [];
}
 
+   /**
+* @param User $user
+* @param array[] &$prefs
+*/
+   public static function getBetaFeaturePreferences( User $user, array 
&$prefs ) {
+   $config = MediaWikiServices::getInstance()->getMainConfig();
+   $extensionAssetsPath = $config->get( 'ExtensionAssetsPath' );
+
+   $prefs['advancedsearch'] = [
+   'label-message' => 
'advancedSearch-beta-feature-message',
+   'desc-message' => 
'advancedSearch-beta-feature-description',
+   'screenshot' => [
+   'ltr' => 
"$extensionAssetsPath/AdvancedSearch/resources/AdvancedSearch-beta-features-ltr.svg",
+   'rtl' => 
"$extensionAssetsPath/AdvancedSearch/resources/AdvancedSearch-beta-features-rtl.svg",
+   ],
+   'info-link'
+   => 
'https://www.mediawiki.org/wiki/Extension:AdvancedSearch',
+   'discussion-link'
+   => 
'https://www.mediawiki.org/wiki/Extension_talk:AdvancedSearch',
+   ];
+   }
 }
diff --git a/extension.json b/extension.json
index 6d68cef..f0da627 100644
--- a/extension.json
+++ b/extension.json
@@ -13,6 +13,9 @@
"AdvancedSearch\\Hooks": "AdvancedSearch.hooks.php"
},
"Hooks": {
+   "GetBetaFeaturePreferences": [
+   "AdvancedSearch\\Hooks::getBetaFeaturePreferences"
+   ],
"BeforePageDisplay": [
"AdvancedSearch\\Hooks::onBeforePageDisplay"
],
diff --git a/i18n/en.json b/i18n/en.json
index 250f231..6113159 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -26,5 +26,7 @@
"advancedsearch-filetype-document-pdf": "PDF",
"advancedSearch-filesize-equals": "equal to",
"advancedSearch-filesize-greater-than": "greater than",
-   "advancedSearch-filesize-smaller-than": "lower than"
+   "advancedSearch-filesize-smaller-than": "lower than",
+   "advancedSearch-beta-feature-message": "Advanced Search Interface",
+   "advancedSearch-beta-feature-description": "Easy access to advanced 
search capabilities on [[Special:Search]]."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 5777a88..01af3be 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -26,5 +26,7 @@
"advancedsearch-filetype-document-pdf": "Label for PDF file/mime type",
"advancedSearch-filesize-equals": "Label for the file width/height 
'equals' comparator selection",
"advancedSearch-filesize-greater-than": "Label for the file 
width/height 'greater than' comparator selection",
-   "advancedSearch-filesize-smaller-than": "Label for the file 
width/height 'smaller than' comparator selection"
+   "advancedSearch-filesize-smaller-than": "Label for the file 
width/height 'smaller than' comparator selection",
+   "advancedSearch-beta-feature-message": "Label for the AdvancedSearch 
Beta Feature.",
+   "advancedSearch-beta-feature-description": "Description for the 
AdvancedSearch Beta Feature, describing the feature that will be enabled."
 }
diff --git a/resources/AdvancedSearch-beta-features-ltr.svg 
b/resources/AdvancedSearch-beta-features-ltr.svg
new file mode 100644
index 000..c123041
--- /dev/null
+++ b/resources/AdvancedSearch-beta-features-ltr.svg
@@ -0,0 +1,409 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="264"
+   height="162"
+   viewBox="0 0 264 162"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="v3.svg">
+

[MediaWiki-commits] [Gerrit] integration/config[master]: Add CI jobs for AdvancedSearch extension

2017-06-06 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357370 )

Change subject: Add CI jobs for AdvancedSearch extension
..

Add CI jobs for AdvancedSearch extension

Bug: T11
Change-Id: Iefbb7b2bed55e60bff8dabf54d1b8821292f90f6
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/70/357370/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ce0e6bc..2f3f246 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2455,6 +2455,11 @@
   - name: extension-unittests-generic
   - name: mwgate-npm
 
+  - name: mediawiki/extensions/AdvancedSearch
+template:
+  - name: extension-unittests-generic
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/AdminLinks
 template:
   - name: extension-unittests-generic

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefbb7b2bed55e60bff8dabf54d1b8821292f90f6
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Report contributions to AdvancedSearch to wikimedia-de-tech ...

2017-06-06 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/357357 )

Change subject: Report contributions to AdvancedSearch to wikimedia-de-tech 
channel
..

Report contributions to AdvancedSearch to wikimedia-de-tech channel

Bug: T167094
Change-Id: I34cc15b827f317755dabaf6ddce198f88e2035b2
---
M gerrit-channels.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/wikibugs2 
refs/changes/57/357357/1

diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index d1e4361..cffb079 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -182,6 +182,7 @@
 mediawiki/extensions/RevisionSlider:
 mediawiki/extensions/FileImporter:
 mediawiki/extensions/FileExporter:
+mediawiki/extensions/AdvancedSearch:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:
 mediawiki/extensions/UploadWizard.*:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I34cc15b827f317755dabaf6ddce198f88e2035b2
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Replace deprecated method zone() with utcOffset()

2017-04-05 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346533 )

Change subject: Replace deprecated method zone() with utcOffset()
..

Replace deprecated method zone() with utcOffset()

Also removed the workaround of making the offset negative since utcOffset
now does this correctly. See http://momentjs.com/guides/#/warnings/zone/

Change-Id: I0cecd525ba131a1c32a9ea60f80d269060e022b0
---
M modules/ext.RevisionSlider.Revision.js
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/33/346533/1

diff --git a/modules/ext.RevisionSlider.Revision.js 
b/modules/ext.RevisionSlider.Revision.js
index 3f8a5d5..e026075 100644
--- a/modules/ext.RevisionSlider.Revision.js
+++ b/modules/ext.RevisionSlider.Revision.js
@@ -120,10 +120,8 @@
 * @return {string}
 */
formatDate: function ( rawDate ) {
-   // Moment's offset works "backwards", as the number of 
minutes
-   // behind UTC, so we need to make this number negative
-   var offset = -mw.libs.revisionSlider.userOffset;
-   return moment( rawDate ).zone( offset ).format( 'LLL' );
+   var offset = mw.libs.revisionSlider.userOffset;
+   return moment( rawDate ).utcOffset( offset ).format( 
'LLL' );
},
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cecd525ba131a1c32a9ea60f80d269060e022b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add an alternative ssh-key for goransm

2017-03-30 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/345587 )

Change subject: Add an alternative ssh-key for goransm
..

Add an alternative ssh-key for goransm

Change-Id: I5701d7397d283197bd2904a9745bd55ce9ab2f3e
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/345587/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index a5fc62c..b7a7993 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2469,6 +2469,7 @@
 realname: Goran S. Milovanovic
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC6jc1W0mqEnurNhtYXF9YQpCX3H4h1pQA9jgZXKGTPUczQJ2rRVZKWXxuPfbg0OwZFzVKhTtSi0HO2v0Dy4gOtrDMpxfX51HnsB/Sm+ifngkj5AgSiAylT7P4PNm7F804m7iJF277DDx/+R9JAL59NT0C9nTZ6oKghL37TQr/PdHBRhjZjRzMOjuplwoFh+I9ZtLGQJpqTENKWqqYwxwMdjog/fRf3+tkvB7kxwmZHRiVPBl8BS64JkNmKXX+xQCtR0YMYH8HkfE4GarSnDXSqmhwS6Zx8TY7oVPy0d5H8cZaA2RyoYWzEH4K2rbvllLoZCnto5Elb6ic0BVP7P8Fn
 goran@goranNET
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDDqwfn3ofrvHW/tLwTlVnQW0J5bD6LXJWRiVnmwILhDZK7JzWxKHDWXylO865AuHPHii6i5A6vFIu9/R72iKtAmd+X+MhIOH3+K7ErqX2S8tIIHghAac96VSNZnlDW/XTuOvFOB8TUhh+SEctlvNes3a9C5Ysxp+VYW7YLRQG+PYs3/A6ifWsPS1dwtGQtysWhkjfGvFNy31VmVVJMng54SH14uxpS+Fc87xRLbpXUVL6Pd7ixKsEfF0z6Rf0V8zS8VmchiJf7Q/EllH7c/6UFZu/fHvVnY653/Miei/6wgdtKrOX5ajai5ZbM6tWbHX4GUz3BncjrrD8Qe6nSJIMz
 goransm@Ubuntu-1604-xenial-64-minimal
 uid: 16664
 email: goran.milovanovic_...@wikimedia.de
   pnorman:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5701d7397d283197bd2904a9745bd55ce9ab2f3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Adjust credits

2017-03-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342223 )

Change subject: Adjust credits
..

Adjust credits

Andrew actually did more relevant work than me in this extension :)

Change-Id: I06435f497350a20e185a2c2e43bff88565fcdec7
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/23/342223/1

diff --git a/extension.json b/extension.json
index c874305..cf142e2 100644
--- a/extension.json
+++ b/extension.json
@@ -5,7 +5,7 @@
"TCB team (Wikimedia Deutschland)",
"Christoph Jauera",
"Addshore",
-   "Tobias Gritschacher"
+   "Andrew Kostka"
],
"url": "https://www.mediawiki.org/wiki/Extension:TwoColConflict";,
"descriptionmsg": "twoColConflict-desc",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06435f497350a20e185a2c2e43bff88565fcdec7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Revert "Do not run selenium-Wikibase Jenkins job on test wiki"

2017-02-14 Thread Tobias Gritschacher (Code Review)

Hello Daniel Kinzler, Lydia Pintscher, Aude, Hoo man, Jonas Kress (WMDE), 
Zfilipin, Addshore, jenkins-bot, Thiemo Mättig (WMDE),

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Do not run selenium-Wikibase Jenkins job on test wiki"
..

Revert "Do not run selenium-Wikibase Jenkins job on test wiki"

This reverts commit dce866dfeb07e0bcca77687002fca8964be6816d.

The IP was unblocked, so this shouldn't run into editing issues anymore.

Change-Id: I92e47d92f0c65d4165b6915f8d3f7e7f35b803d5
---
M tests/browser/ci.yml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml
index 9487007..5fa93ad 100644
--- a/tests/browser/ci.yml
+++ b/tests/browser/ci.yml
@@ -3,6 +3,7 @@
 
 MEDIAWIKI_ENVIRONMENT:
   - beta
+  - test
 
 PLATFORM:
   - Linux

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92e47d92f0c65d4165b6915f8d3f7e7f35b803d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lydia Pintscher 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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] mediawiki...Wikibase[master]: Login when creating new items in browsertests

2017-02-14 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337577 )

Change subject: Login when creating new items in browsertests
..

Login when creating new items in browsertests

Bug: T157050
Change-Id: I34412e37a5ccc8d5fc37dc657b195653e4c64543
---
M tests/browser/features/step_definitions/entity_steps.rb
M tests/browser/features/support/pages/item_page.rb
2 files changed, 106 insertions(+), 90 deletions(-)


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

diff --git a/tests/browser/features/step_definitions/entity_steps.rb 
b/tests/browser/features/step_definitions/entity_steps.rb
index 80ebf6a..2b6ea05 100644
--- a/tests/browser/features/step_definitions/entity_steps.rb
+++ b/tests/browser/features/step_definitions/entity_steps.rb
@@ -7,124 +7,140 @@
 # basic steps for entities
 
 Given(/^I am logged in to the repo$/) do
-  as_user(:b) do
-visit(RepoLoginPage).login_with(user(:b), password(:b))
-  end
+   as_user(:b) do
+   visit(RepoLoginPage).login_with(user(:b), password(:b))
+   end
 end
 
 Given(/^I am not logged in to the repo$/) do
-  visit(RepoLogoutPage)
+   visit(RepoLogoutPage)
 end
 
 Given(/^I am on an item page$/) do
-  step 'I have an item to test'
-  step 'I am on the page of the item to test'
+   step 'I have an item to test'
+   step 'I am on the page of the item to test'
 end
 
 Given(/^I have an item to test$/) do
-  step 'I have an item with label "' + generate_random_string(8) + '" and 
description "' + generate_random_string(20) + '"'
+   step 'I have an item with label "' + generate_random_string(8) + '" and 
description "' + generate_random_string(20) + '"'
 end
 
 Given(/^I have an item with empty label and description$/) do
-  step 'I have an item with label "" and description ""'
+   step 'I have an item with label "" and description ""'
 end
 
 Given(/^I have an item with label "([^"]*)"$/) do |label|
-  step 'I have an item with label "' + label + '" and description "' + 
generate_random_string(20) + '"'
+   step 'I have an item with label "' + label + '" and description "' + 
generate_random_string(20) + '"'
 end
 
 Given(/^I have (\d+) items beginning with "([^"]*)"$/) do |num, pre|
-  (1..num.to_i).each do
-step 'I have an item with label "' + pre + generate_random_string(5) + '" 
and description "' + generate_random_string(20) + '"'
-  end
+   (1..num.to_i).each do
+   step 'I have an item with label "' + pre + 
generate_random_string(5) + '" and description "' + generate_random_string(20) 
+ '"'
+   end
 end
 
 Given(/^I have an item with label "(.*)" and description "(.*)"$/) do |label, 
description|
-  item_data = '{"labels":{"en":{"language":"en","value":"' + label + 
'"}},"descriptions":{"en":{"language":"en","value":"' + description + '"}}}'
-  @item_under_test = visit(ItemPage).create_item(item_data)
+   item_data = '{"labels":{"en":{"language":"en","value":"' + label + 
'"}},"descriptions":{"en":{"language":"en","value":"' + description + '"}}}'
+
+   wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
+   as_user(:b) do
+   wb_api.log_in(user(:b), password(:b))
+   end
+
+   @item_under_test = visit(ItemPage).create_item(item_data, wb_api)
 end
 
 Given(/^I am on the page of the item to test$/) do
-  on(ItemPage).navigate_to_entity @item_under_test['url']
+   on(ItemPage).navigate_to_entity @item_under_test['url']
 end
 
 Given(/^I am on the page of item (.*)$/) do |item_handle|
-  on(ItemPage).navigate_to_entity @items[item_handle]['url']
+   on(ItemPage).navigate_to_entity @items[item_handle]['url']
 end
 
 Given(/^I navigate to item (.*) with resource loader debug mode (.*)$/) do 
|item_id, debug_mode|
-  entity_url = URL.repo_url(ENV['ITEM_NAMESPACE'] + item_id) + '&debug=' + 
debug_mode
-  visit(ItemPage).navigate_to_entity entity_url
-  @item_under_test = on(ItemPage).create_item_data_from_page
+   entity_url = URL.repo_url(ENV['ITEM_NAMESPACE'] + item_id) + '&debug=' 
+ debug_mode
+   visit(ItemPage).navigate_to_entity entity_url
+   @item_under_test = on(ItemPage).create_item_data_from_page
 end
 
 Given(/^I navigate to property (.*) with resource loader debug mode (.*)$/) do 
|property_id, debug_mode|
-  entity_url = URL.repo_url(ENV['PROPERTY_NAMESPACE'] + property_id) + 
'&debug=' + debug_mode
-  visit(ItemPage).navigate_to_entity entity_url
-  @item_under_test = on(ItemPage).create_item_data_from_page
+   entity_url = URL.repo_url(ENV['PROPERTY_NAMESPACE'] + property_id) + 
'&debug=' + debug_mode
+   visit(ItemPage).navigate_to_entity entity_url
+   @item_under_test = on(ItemPage).create_item_data_from_page
 end
 
 Given(/^I navigate to property id (.*)$/) do |property_id|
-  entity_url = URL.repo_url(ENV['PROPERTY_NAMESPACE'] + property_id)
-  visit

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Don't set min-height and min-width for oo-ui buttons

2017-02-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337024 )

Change subject: Don't set min-height and min-width for oo-ui buttons
..

Don't set min-height and min-width for oo-ui buttons

OOJS-UI 0.19.0 introduced min-height and min-width for
oo-ui-buttonElement in which caused our UI elements to be mis-dimentioned.

Bug: 157800
Change-Id: I24b4d2ff6abfe02581b99b48a622972e7ef2f6b1
---
M modules/ext.RevisionSlider.css
M modules/ext.RevisionSlider.lazy.css
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/24/337024/1

diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 70c5ca1..085c838 100644
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -175,6 +175,8 @@
 }
 
 .mw-revslider-arrow .oo-ui-buttonElement-button {
+   min-height: 0;
+   min-width: 0;
height: 140px;
width: 20px;
padding: 0;
@@ -197,6 +199,8 @@
z-index: 10;
padding: 0;
box-sizing: border-box;
+   min-height: 0;
+   min-width: 0;
width: 1.775em;
height: 1.775em;
background-color: transparent;
diff --git a/modules/ext.RevisionSlider.lazy.css 
b/modules/ext.RevisionSlider.lazy.css
index 94158cd..baf1475 100644
--- a/modules/ext.RevisionSlider.lazy.css
+++ b/modules/ext.RevisionSlider.lazy.css
@@ -20,6 +20,8 @@
 }
 
 .mw-revslider-toggle-button .oo-ui-buttonElement-button {
+   min-height: 0;
+   min-width: 0;
width: 100%;
padding: 0.06em 0 0.06em 0;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24b4d2ff6abfe02581b99b48a622972e7ef2f6b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Check if QUnit tests are language-setting-proof

2016-12-20 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328365 )

Change subject: Check if QUnit tests are language-setting-proof
..

Check if QUnit tests are language-setting-proof

Change-Id: I6ed0cc013db676a587f734c1f35f117525405db7
---
M tests/qunit/RevisionSlider.RevisionListView.test.js
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/tests/qunit/RevisionSlider.RevisionListView.test.js 
b/tests/qunit/RevisionSlider.RevisionListView.test.js
index 9e40500..5578b6f 100644
--- a/tests/qunit/RevisionSlider.RevisionListView.test.js
+++ b/tests/qunit/RevisionSlider.RevisionListView.test.js
@@ -167,24 +167,18 @@
 
QUnit.test( 'big change number is formatted correctly', function ( 
assert ) {
var revisionListView = new RevisionListView(),
-   originalUserLangSetting = mw.config.get( 
'wgUserLanguage' ),
$changeSizeLineHtml;
 
-   mw.config.set( 'wgUserLanguage', 'en' );
$changeSizeLineHtml = revisionListView.makeChangeSizeLine( 1000 
);
-   mw.config.set( 'wgUserLanguage', originalUserLangSetting );
 
assert.equal( $changeSizeLineHtml.find( 
'.mw-revslider-change-positive' ).text(), '+1,000' );
} );
 
QUnit.test( 'page size is formatted correctly', function ( assert ) {
var revisionListView = new RevisionListView(),
-   originalUserLangSetting = mw.config.get( 
'wgUserLanguage' ),
$pageSizeLineHtml;
 
-   mw.config.set( 'wgUserLanguage', 'en' );
$pageSizeLineHtml = revisionListView.makePageSizeLine( 1337 );
-   mw.config.set( 'wgUserLanguage', originalUserLangSetting );
 
assert.ok( $pageSizeLineHtml.text().match( /1,337/ ) );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ed0cc013db676a587f734c1f35f117525405db7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Revert "Reset custom separator transform tables in number fo...

2016-12-20 Thread Tobias Gritschacher (Code Review)

Hello WMDE-leszek, Addshore, jenkins-bot,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "Reset custom separator transform tables in number 
formatting tests"
..

Revert "Reset custom separator transform tables in number formatting tests"

This reverts commit b46c1052024ded25bff187ae8ee0208e04b48188.

Checking if this was fixed by changes to core.

Change-Id: Ia8dcae5227163edd5911cd1ea3c1b0213f7e654d
---
M tests/qunit/RevisionSlider.RevisionListView.test.js
1 file changed, 1 insertion(+), 12 deletions(-)


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

diff --git a/tests/qunit/RevisionSlider.RevisionListView.test.js 
b/tests/qunit/RevisionSlider.RevisionListView.test.js
index 3e327df..9e40500 100644
--- a/tests/qunit/RevisionSlider.RevisionListView.test.js
+++ b/tests/qunit/RevisionSlider.RevisionListView.test.js
@@ -65,18 +65,14 @@
minor: true
} ),
tooltip,
-   tooltipHtml,
-   originalSeparatorTransformTable = mw.language.getData( 
'en', 'separatorTransformTable' );
+   tooltipHtml;
 
revision.setRelativeSize( 2100 );
 
mw.libs.revisionSlider.userOffset = 0;
 
-   mw.language.setData( 'en', 'separatorTransformTable', null );
-
tooltip = revisionListView.makeTooltip( revision );
tooltipHtml = tooltip.$element.html();
-   mw.language.setData( 'en', 'separatorTransformTable', 
originalSeparatorTransformTable );
 
assert.ok( tooltipHtml.match( /User1/ ), 'Test the user.' );
assert.ok( tooltipHtml.match( /Hello/ ), 'Test the comment.' );
@@ -84,7 +80,6 @@
assert.ok( tooltipHtml.match( /\+2,100/ ), 'Test the change 
size.' );
assert.ok( tooltipHtml.match( /26 April 2016 10:27 AM/ ), 'Test 
the date.' );
assert.ok( tooltipHtml.match( /minor/ ), 'Test minor.' );
-
}, mw.config.get( 'wgUserLanguage' ) !== 'en' );
 
QUnit.test( 'empty user leads to no user line', function ( assert ) {
@@ -173,14 +168,11 @@
QUnit.test( 'big change number is formatted correctly', function ( 
assert ) {
var revisionListView = new RevisionListView(),
originalUserLangSetting = mw.config.get( 
'wgUserLanguage' ),
-   originalSeparatorTransformTable = mw.language.getData( 
'en', 'separatorTransformTable' ),
$changeSizeLineHtml;
 
mw.config.set( 'wgUserLanguage', 'en' );
-   mw.language.setData( 'en', 'separatorTransformTable', null );
$changeSizeLineHtml = revisionListView.makeChangeSizeLine( 1000 
);
mw.config.set( 'wgUserLanguage', originalUserLangSetting );
-   mw.language.setData( 'en', 'separatorTransformTable', 
originalSeparatorTransformTable );
 
assert.equal( $changeSizeLineHtml.find( 
'.mw-revslider-change-positive' ).text(), '+1,000' );
} );
@@ -188,14 +180,11 @@
QUnit.test( 'page size is formatted correctly', function ( assert ) {
var revisionListView = new RevisionListView(),
originalUserLangSetting = mw.config.get( 
'wgUserLanguage' ),
-   originalSeparatorTransformTable = mw.language.getData( 
'en', 'separatorTransformTable' ),
$pageSizeLineHtml;
 
mw.config.set( 'wgUserLanguage', 'en' );
-   mw.language.setData( 'en', 'separatorTransformTable', null );
$pageSizeLineHtml = revisionListView.makePageSizeLine( 1337 );
mw.config.set( 'wgUserLanguage', originalUserLangSetting );
-   mw.language.setData( 'en', 'separatorTransformTable', 
originalSeparatorTransformTable );
 
assert.ok( $pageSizeLineHtml.text().match( /1,337/ ) );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8dcae5227163edd5911cd1ea3c1b0213f7e654d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Respect $wgTwoColConflictBetaFeature setting

2016-12-15 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327487 )

Change subject: Respect $wgTwoColConflictBetaFeature setting
..

Respect $wgTwoColConflictBetaFeature setting

Bug: T153311
Change-Id: Iae239f9c36ea783fc63af0a055a948d0bb058384
---
M TwoColConflict.hooks.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/87/327487/1

diff --git a/TwoColConflict.hooks.php b/TwoColConflict.hooks.php
index 2e905de..3034a0c 100644
--- a/TwoColConflict.hooks.php
+++ b/TwoColConflict.hooks.php
@@ -14,8 +14,14 @@
 
public static function onAlternateEdit( EditPage $editPage ) {
global $wgHooks;
+   $config = MediaWikiServices::getInstance()->getMainConfig();
 
+   /**
+* If this extension is configured to be a beta feature, and 
the BetaFeatures extension
+* is loaded then require the current user to have the feature 
enabled.
+*/
if (
+   $config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
!BetaFeatures::isFeatureEnabled( 
$editPage->getContext()->getUser(), 'twocolconflict' )
) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae239f9c36ea783fc63af0a055a948d0bb058384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Cognate[master]: Script to recalculate normalized hashes

2016-12-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/321011 )

Change subject: Script to recalculate normalized hashes
..


Script to recalculate normalized hashes

Change-Id: I83181ffb3a78bd98fb34bfcbb8613a7618816f23
---
A maintenance/recalculateCognateNormalizedHashes.php
1 file changed, 151 insertions(+), 0 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/maintenance/recalculateCognateNormalizedHashes.php 
b/maintenance/recalculateCognateNormalizedHashes.php
new file mode 100644
index 000..cacb312
--- /dev/null
+++ b/maintenance/recalculateCognateNormalizedHashes.php
@@ -0,0 +1,151 @@
+addDescription( 'Recalculate the normalized Cognate 
hashes' );
+   $this->addOption( 'dry-run', 'Perform a dry run' );
+   $this->setBatchSize( 100 );
+   }
+
+   private function setupServices() {
+   $services = MediaWikiServices::getInstance();
+   /** @var ConnectionManager $connectionManager */
+   $connectionManager = $services->getService( 
'CognateConnectionManager' );
+   $this->dbr = $connectionManager->getReadConnection();
+   $this->dbw = $connectionManager->getWriteConnection();
+   $this->stringHasher = new StringHasher();
+   $this->stringNormalizer = new StringNormalizer();
+   }
+
+   public function execute() {
+   $this->output( "Started processing...\n" );
+   $dryrun = $this->hasOption( 'dry-run' );
+   $this->setupServices();
+   $batchStart = $this->getLowestRawKey();
+
+   if ( !$batchStart ) {
+   $this->output( "Nothing to do.\n" );
+   return true;
+   }
+
+   $totalUpdates = 0;
+
+   while ( $batchStart ) {
+   $this->output( "Getting batch starting from 
$batchStart\n" );
+   $rows = $this->dbw->select(
+   CognateStore::TITLES_TABLE_NAME,
+   [ 'cgti_raw', 'cgti_raw_key', 
'cgti_normalized_key' ],
+   [ 'cgti_raw_key > ' . $batchStart ],
+   __METHOD__,
+   [ 'LIMIT ' . $this->mBatchSize, 'ORDER BY 
cgti_raw_key ASC' ]
+   );
+
+   $this->output( "Calculating new hashes..\n" );
+   $batchStart = false;
+   $rowsToUpdate = [];
+   foreach ( $rows as $key => $row ) {
+   $batchStart = $row->cgti_raw_key;
+
+   $newNormalizedHash = $this->normalizeAndHash( 
$row->cgti_raw );
+   if ( $newNormalizedHash != 
$row->cgti_normalized_key ) {
+   $newRow = (array)$row;
+   $newRow['cgti_normalized_key'] = 
$newNormalizedHash;
+   $rowsToUpdate[] = $newRow;
+   }
+   }
+
+   $numberOfUpdates = count( $rowsToUpdate );
+   $totalUpdates += $numberOfUpdates;
+
+   if ( !$dryrun ) {
+   $this->output( "Performing $numberOfUpdates 
updates\n" );
+   $this->dbw->upsert(
+   CognateStore::TITLES_TABLE_NAME,
+   $rowsToUpdate,
+   [ 'cgti_raw_key' ],
+   [
+   
'cgti_normalized_key=VALUES(cgti_normalized_key)',
+   ],
+   __METHOD__
+   );
+   }
+   }
+
+   $this->output( "$totalUpdates hashes recalculated\n" );
+   $this->output( "Done!\n" );
+
+   return true;
+   }
+
+   /**
+* Select 1 less than the minimum so that > can be used in selects in 
this script.
+*
+* @return int|false
+* @throws \DBUnexpectedError
+*/
+   private function getLowestRawKey() {
+   return $this->dbr->selectField(
+   CognateStore::TITLES_TABLE_NAME,
+   'MIN(cgti_raw_key)-1',
+   false,
+   __METHOD__
+   );
+   }
+
+   /**
+* @param string $string
+*
+* @return string
+*/
+   private function normalizeAndHash( $string ) {
+   return $this->stringHasher->hash(
+

[MediaWiki-commits] [Gerrit] mediawiki...Cognate[master]: Use ConnectionManager from Core

2016-12-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/322409 )

Change subject: Use ConnectionManager from Core
..


Use ConnectionManager from Core

Depends-On: I0c58e15aed5bed88323d18cb95e5008f8d3381c5
Change-Id: Iff20a22f9f2bc7ceefd6defc0ed9a494a6fe62c0
---
M src/CognateStore.php
M src/ServiceWiring.php
M tests/phpunit/ServiceWiringTest.php
3 files changed, 30 insertions(+), 30 deletions(-)

Approvals:
  Daniel Kinzler: Looks good to me, approved
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/CognateStore.php b/src/CognateStore.php
index 3ae3660..3c2b34c 100644
--- a/src/CognateStore.php
+++ b/src/CognateStore.php
@@ -2,9 +2,8 @@
 
 namespace Cognate;
 
-use DBConnRef;
-use ILoadBalancer;
 use MediaWiki\Linker\LinkTarget;
+use Wikimedia\Rdbms\ConnectionManager;
 
 /**
  * @license GNU GPL v2+
@@ -14,9 +13,9 @@
 class CognateStore {
 
/**
-* @var ILoadBalancer
+* @var ConnectionManager
 */
-   private $loadBalancer;
+   private $connectionManager;
 
/**
 * @var StringNormalizer
@@ -33,32 +32,18 @@
const TITLES_TABLE_NAME = 'cognate_titles';
 
/**
-* @param ILoadBalancer $loadBalancer
-* @param string $databaseName
+* @param ConnectionManager $connectionManager
 * @param StringNormalizer $stringNormalizer
+* @param StringHasher $stringHasher
 */
public function __construct(
-   ILoadBalancer $loadBalancer,
-   $databaseName,
+   ConnectionManager $connectionManager,
StringNormalizer $stringNormalizer,
StringHasher $stringHasher
) {
-   $this->loadBalancer = $loadBalancer;
-   $this->databaseName = $databaseName;
+   $this->connectionManager = $connectionManager;
$this->stringNormalizer = $stringNormalizer;
$this->stringHasher = $stringHasher;
-   }
-
-   /**
-* @param int $db
-* @return DBConnRef
-*/
-   private function getDB( $db ) {
-   return $this->loadBalancer->getConnectionRef(
-   $db,
-   [],
-   $this->databaseName
-   );
}
 
/**
@@ -92,7 +77,7 @@
'cgpa_title' => $this->getStringHash( 
$linkTarget->getDBkey() ),
'cgpa_namespace' => $linkTarget->getNamespace(),
];
-   $dbw = $this->getDB( DB_MASTER );
+   $dbw = $this->connectionManager->getWriteConnectionRef();
$result = $dbw->delete( self::PAGES_TABLE_NAME, $pageData, 
__METHOD__ );
 
return (bool)$result;
@@ -106,7 +91,7 @@
 * [ 'interwiki' => 'en', 'namespaceID' => 0, 'title' 
=> 'Berlin' ]
 */
public function selectLinkDetailsForPage( $dbName, LinkTarget 
$linkTarget ) {
-   $dbr = $this->getDB( DB_REPLICA );
+   $dbr = $this->connectionManager->getReadConnectionRef();
$result = $dbr->select(
[
self::TITLES_TABLE_NAME,
@@ -146,7 +131,7 @@
 * @return string[] array of dbnames
 */
public function selectSitesForPage( LinkTarget $linkTarget ) {
-   $dbr = $this->getDB( DB_REPLICA );
+   $dbr = $this->connectionManager->getWriteConnectionRef();
$result = $dbr->select(
[
self::TITLES_TABLE_NAME,
@@ -181,7 +166,7 @@
 * @return bool
 */
public function insertPages( array $pageDetailsArray ) {
-   $dbw = $this->getDB( DB_MASTER );
+   $dbw = $this->connectionManager->getWriteConnectionRef();
 
$pagesToInsert = [];
$titlesToInsert = [];
@@ -222,7 +207,7 @@
 *e.g. 'enwiktionary' => 'en'
 */
public function insertSites( array $sites ) {
-   $dbw = $this->getDB( DB_MASTER );
+   $dbw = $this->connectionManager->getWriteConnectionRef();
 
$toInsert = [];
foreach ( $sites as $dbname => $interwikiPrefix ) {
diff --git a/src/ServiceWiring.php b/src/ServiceWiring.php
index 9cab398..87eb2eb 100644
--- a/src/ServiceWiring.php
+++ b/src/ServiceWiring.php
@@ -4,6 +4,7 @@
 
 use JobQueueGroup;
 use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\ConnectionManager;
 
 /**
  * Cognate wiring for MediaWiki services.
@@ -23,19 +24,29 @@
);
},
 
-   'CognateStore' => function( MediaWikiServices $services ) {
+   'CognateConnectionManager' => function( MediaWikiServices $services ) {
$lbFactory = $services->getDBLoadBalancerFactory();

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Include namespace when setting hidden form field

2016-12-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326436 )

Change subject: Include namespace when setting hidden form field
..

Include namespace when setting hidden form field

Change-Id: I1fb3676be2053ce8e73401a1ca36cdd72d304af0
---
M specials/SpecialElectronPdf.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/36/326436/1

diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index d9fe326..4c394e9 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -84,7 +84,7 @@
->appendContent(
$this->getLabeledOptionField( 
'redirect-to-electron', 'single', true ),
$this->getLabeledOptionField( 
'redirect-to-collection', 'two' ),
-   $this->getHiddenField( 'page', 
$title->getText() ),
+   $this->getHiddenField( 'page', 
$title->getPrefixedText() ),
$this->getHiddenField( 
'coll-download-url', $collectionDownloadUrl ),
new OOUI\ButtonGroupWidget( [
'items' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fb3676be2053ce8e73401a1ca36cdd72d304af0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: RevisionSlider should always be on top of the page

2016-12-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326431 )

Change subject: RevisionSlider should always be on top of the page
..

RevisionSlider should always be on top of the page

E.g. in combination with FlaggedRevs extension, the RevisionSlider
was positioned between FlaggedRevs headers and diffs which looked odd.

Still todo: in combination with FlaggedRevs there is still an issue
with the connector-lines that should be fixed.

Bug: T151450
Change-Id: Ieb1a21549092063729f66656127f59918ec07c90
---
M RevisionSlider.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/31/326431/1

diff --git a/RevisionSlider.hooks.php b/RevisionSlider.hooks.php
index fd1877e..fa8407e 100644
--- a/RevisionSlider.hooks.php
+++ b/RevisionSlider.hooks.php
@@ -99,7 +99,7 @@
'style' => 'margin: 0 auto;',
] );
 
-   $out->addHTML(
+   $out->prependHTML(
Html::rawElement(
'div',
[

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb1a21549092063729f66656127f59918ec07c90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Change reciepients for Wikibase browsertests

2016-12-01 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Change reciepients for Wikibase browsertests
..

Change reciepients for Wikibase browsertests

We've got a separate list for that now.

Bug: T150856
Change-Id: I1ff93438fed1933328d9242f7c4e8a0ece990fd4
---
M jjb/selenium.yaml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/98/324698/1

diff --git a/jjb/selenium.yaml b/jjb/selenium.yaml
index 887cbab..ed8b96e 100644
--- a/jjb/selenium.yaml
+++ b/jjb/selenium.yaml
@@ -120,8 +120,8 @@
 
 - project:
 name: Wikibase
-# recipients: @Tobi_WMDE_SW, @hoo, @aude, @Lydia_Pintscher, @Addshore
-recipients: qa-ale...@lists.wikimedia.org wikidata-monitor...@wikimedia.de 
# wikidata
+# recipients: @Tobi_WMDE_SW, @hoo, @aude, @Lydia_Pintscher, @Addshore, 
@daniel, @thiemowmde, @jonas
+recipients: qa-ale...@lists.wikimedia.org wikidata-ci-sta...@wikimedia.de 
# wikidata
 repository: mediawiki/extensions/Wikibase
 
 jobs:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ff93438fed1933328d9242f7c4e8a0ece990fd4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add Vagrant role for Wikibase Repo

2016-11-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add Vagrant role for Wikibase Repo
..

Add Vagrant role for Wikibase Repo

Adding a simple Wikibase-repo role for developing.
I tried using the Wikidata role but it requires setting up
a bunch of additional language wikis which did not work for me.
Also, using WikidataBuildResources might not be necessary, if
someone just wants a quick Wikibase installation for hacking.

Change-Id: I7da8f3f7a3ff3c267acb36edc5ca074cb8492011
---
A puppet/modules/role/manifests/wikibase_repo.pp
A puppet/modules/role/templates/wikibase_repo/init.php.erb
2 files changed, 26 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/41/323841/1

diff --git a/puppet/modules/role/manifests/wikibase_repo.pp 
b/puppet/modules/role/manifests/wikibase_repo.pp
new file mode 100644
index 000..5e379f2
--- /dev/null
+++ b/puppet/modules/role/manifests/wikibase_repo.pp
@@ -0,0 +1,22 @@
+# == Class: role::wikibase_repo
+class role::wikibase_repo {
+  require ::role::mediawiki
+  include ::role::sitematrix
+  include ::role::wikimediamessages
+
+  mediawiki::extension { 'Wikibase':
+composer => true,
+needs_update => true,
+  }
+
+  mediawiki::settings { 'Wikibase-Init':
+values   => template('role/wikibase_repo/init.php.erb'),
+  }
+
+  mediawiki::maintenance { 'wikidata-populate-sites-table':
+command => "/usr/local/bin/foreachwikiwithextension Wikibase 
extensions/Wikibase/lib/maintenance/populateSitesTable.php --load-from 
http://en${mediawiki::multiwiki::base_domain}${::port_fragment}/w/api.php";,
+refreshonly => true,
+  }
+
+  Mediawiki::Wiki<| |> ~> 
Mediawiki::Maintenance['wikidata-populate-sites-table']
+}
diff --git a/puppet/modules/role/templates/wikibase_repo/init.php.erb 
b/puppet/modules/role/templates/wikibase_repo/init.php.erb
new file mode 100644
index 000..6e7e5a2
--- /dev/null
+++ b/puppet/modules/role/templates/wikibase_repo/init.php.erb
@@ -0,0 +1,4 @@
+$wgEnableWikibaseRepo = true;
+$wgEnableWikibaseClient = false;
+require_once "$IP/extensions/Wikibase/repo/Wikibase.php";
+require_once "$IP/extensions/Wikibase/repo/ExampleSettings.php";

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7da8f3f7a3ff3c267acb36edc5ca074cb8492011
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Don't show opt-out preference for betafeature

2016-11-25 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Don't show opt-out preference for betafeature
..

Don't show opt-out preference for betafeature

Bug: T151452
Change-Id: I8c80afc1c05180a3ff28234db92e117b82a82348
---
M RevisionSlider.hooks.php
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/10/323510/1

diff --git a/RevisionSlider.hooks.php b/RevisionSlider.hooks.php
index 72bee71..ea5722f 100644
--- a/RevisionSlider.hooks.php
+++ b/RevisionSlider.hooks.php
@@ -176,6 +176,11 @@
}
 
public static function onGetPreferences( User $user, array 
&$preferences ) {
+   $config = MediaWikiServices::getInstance()->getMainConfig();
+   if ( $config->get( 'RevisionSliderBetaFeature' ) ) {
+   return true;
+   }
+
$preferences['revisionslider-disable'] = [
'type' => 'toggle',
'label-message' => 'revisionslider-preference-disable',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c80afc1c05180a3ff28234db92e117b82a82348
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Extend browsertests to test new conflict-view

2016-11-22 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Extend browsertests to test new conflict-view
..

Extend browsertests to test new conflict-view

Bug: T149720
Change-Id: I86b4b3f397af22658da4577915f9c434ba011167
---
M tests/browser/features/edit_conflict.feature
M tests/browser/features/support/pages/edit_conflict_page.rb
M tests/browser/features/support/step_definitions/edit_conflict_steps.rb
3 files changed, 56 insertions(+), 5 deletions(-)


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

diff --git a/tests/browser/features/edit_conflict.feature 
b/tests/browser/features/edit_conflict.feature
index 0aa3d46..83d9ccc 100644
--- a/tests/browser/features/edit_conflict.feature
+++ b/tests/browser/features/edit_conflict.feature
@@ -8,4 +8,7 @@
 And I save the edit
 Then The two column edit conflict screen should be shown
 And The editor should contain "I am a longer sentence than before."
-And The changes textbox should contain "Adding some random content."
+And Changes should be shown as split into foreign and own
+And Section for common changes should not be there
+And Own changes section should contain "Adding some random content."
+And Foreign changes section should contain "I am a longer sentence than 
before."
diff --git a/tests/browser/features/support/pages/edit_conflict_page.rb 
b/tests/browser/features/support/pages/edit_conflict_page.rb
index bbeb44a..e64f140 100644
--- a/tests/browser/features/support/pages/edit_conflict_page.rb
+++ b/tests/browser/features/support/pages/edit_conflict_page.rb
@@ -6,4 +6,9 @@
   div(:twocolconflict_changes_text, id: 'mw-twocolconflict-changes-editor')
   div(:twocolconflict_editor_desc, css: '.mw-twocolconflict-editor-col 
.mw-twocolconflict-col-desc')
   text_area(:twocolconflict_editor_text, css: '.mw-twocolconflict-editor-col 
textarea')
+  div(:twocolconflict_changes_same, css: '#mw-twocolconflict-changes-editor 
.mw-twocolconflict-diffchange-same')
+  div(:twocolconflict_changes_foreign, css: '#mw-twocolconflict-changes-editor 
.mw-twocolconflict-diffchange-foreign')
+  div(:twocolconflict_changes_own, css: '#mw-twocolconflict-changes-editor 
.mw-twocolconflict-diffchange-own')
+  div(:twocolconflict_changes_title_foreign, css: 
'#mw-twocolconflict-changes-editor .mw-twocolconflict-diffchange-foreign 
.mw-twocolconflict-diffchange-title')
+  div(:twocolconflict_changes_title_own, css: 
'#mw-twocolconflict-changes-editor .mw-twocolconflict-diffchange-own 
.mw-twocolconflict-diffchange-title')
 end
diff --git 
a/tests/browser/features/support/step_definitions/edit_conflict_steps.rb 
b/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
index 3fbc7cf..2ce61eb 100644
--- a/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
+++ b/tests/browser/features/support/step_definitions/edit_conflict_steps.rb
@@ -2,8 +2,15 @@
   step 'An explanation header should be shown'
   step 'A description for the changes column should be shown'
   step 'A description for the editor column should be shown'
-  step 'A textbox with changes from the user should be shown'
+  step 'A textbox with conflicting changes should be shown'
   step 'A textbox for the editor should be shown'
+end
+
+Then(/^Changes should be shown as split into foreign and own$/) do
+  step 'Foreign version title should be there'
+  step 'Own version title should be there'
+  step 'Section for foreign changes should be there'
+  step 'Section for own changes should be there'
 end
 
 Then(/^An explanation header should be shown$/) do
@@ -18,7 +25,7 @@
   expect(on(EditConflictPage).twocolconflict_editor_desc_element).to be_visible
 end
 
-Then(/^A textbox with changes from the user should be shown$/) do
+Then(/^A textbox with conflicting changes should be shown$/) do
   expect(on(EditConflictPage).twocolconflict_changes_text_element).to 
be_visible
 end
 
@@ -30,6 +37,42 @@
   expect(on(EditConflictPage).twocolconflict_editor_text_element.text).to 
match(text)
 end
 
-Then(/^The changes textbox should contain "(.+?)"$/) do |text|
-  expect(on(EditConflictPage).twocolconflict_changes_text_element.text).to 
match(text + @random_string)
+Then(/^Own changes section should contain "(.+?)"$/) do |text|
+  expect(on(EditConflictPage).twocolconflict_changes_own_element.text).to 
match(text + @random_string)
+end
+
+Then(/^Foreign changes section should contain "(.+?)"$/) do |text|
+  expect(on(EditConflictPage).twocolconflict_changes_foreign_element.text).to 
match(text)
+end
+
+Then(/^Section for common changes should be there$/) do
+  expect(on(EditConflictPage).twocolconflict_changes_same_element).to 
be_visible
+end
+
+Then(/^Section for foreign changes should be there$/) do
+  expect(on(EditConflictPage).twocolconflict_changes_foreign_element).to 
be_visible
+e

[MediaWiki-commits] [Gerrit] integration/config[master]: Notify wikidata-monitoring on WIkibase browsertest failures

2016-11-17 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Notify wikidata-monitoring on WIkibase browsertest failures
..

Notify wikidata-monitoring on WIkibase browsertest failures

per T150856.

Bug: T150856
Change-Id: Ifd0965938617af48d7d10fd21b1fa07a65a47ac1
---
M jjb/selenium.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/82/322082/1

diff --git a/jjb/selenium.yaml b/jjb/selenium.yaml
index 39c9d7c..887cbab 100644
--- a/jjb/selenium.yaml
+++ b/jjb/selenium.yaml
@@ -120,7 +120,8 @@
 
 - project:
 name: Wikibase
-recipients: qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de 
# @Tobi_WMDE_SW #wikidata
+# recipients: @Tobi_WMDE_SW, @hoo, @aude, @Lydia_Pintscher, @Addshore
+recipients: qa-ale...@lists.wikimedia.org wikidata-monitor...@wikimedia.de 
# wikidata
 repository: mediawiki/extensions/Wikibase
 
 jobs:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd0965938617af48d7d10fd21b1fa07a65a47ac1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Check for unitsuggester in browsertests

2016-11-17 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Check for unitsuggester in browsertests
..

Check for unitsuggester in browsertests

Bug: T150161
Change-Id: Ie9b82d85d6455ed408810b8bc15a3baacbf6cd86
---
M tests/browser/features/statements_quantity.feature
M tests/browser/features/step_definitions/statement_steps.rb
M tests/browser/features/support/modules/statement_module.rb
3 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/tests/browser/features/statements_quantity.feature 
b/tests/browser/features/statements_quantity.feature
index 43989cc..4b6dd21 100644
--- a/tests/browser/features/statements_quantity.feature
+++ b/tests/browser/features/statements_quantity.feature
@@ -23,6 +23,7 @@
   And I enter 1 in the claim value input field
 Then Statement save button should be there
   And Statement cancel button should be there
+  And Unit suggester should be there
 
   @ui_only
   Scenario Outline: Check quantity UI for invalid values
diff --git a/tests/browser/features/step_definitions/statement_steps.rb 
b/tests/browser/features/step_definitions/statement_steps.rb
index 5000fe2..1bea7c1 100644
--- a/tests/browser/features/step_definitions/statement_steps.rb
+++ b/tests/browser/features/step_definitions/statement_steps.rb
@@ -296,3 +296,7 @@
 Then(/^InputExtender dropdown should be there$/) do
   expect(on(ItemPage).inputextender_dropdown_element.when_visible).to 
be_visible
 end
+
+Then(/^Unit suggester should be there$/) do
+  expect(on(ItemPage).inputextender_unitsuggester_element.when_visible).to 
be_visible
+end
diff --git a/tests/browser/features/support/modules/statement_module.rb 
b/tests/browser/features/support/modules/statement_module.rb
index aba3011..1936474 100644
--- a/tests/browser/features/support/modules/statement_module.rb
+++ b/tests/browser/features/support/modules/statement_module.rb
@@ -29,6 +29,7 @@
 
   div(:inputextender_preview, css: 'div.ui-inputextender-extension > 
div.ui-preview > div.ui-preview-value')
   text_field(:inputextender_input, css: 'div.ui-inputextender-extension > 
input')
+  text_field(:inputextender_unitsuggester, css: 
'div.ui-inputextender-extension > .ui-unitsuggester-input')
   span(:time_hint, css: 'div.ui-inputextender-extension > 
div.valueview-expertextender-calendarhint > span')
   a(:time_precision, css: 'div.ui-inputextender-extension 
div.valueview-expert-TimeInput-precision > a.ui-listrotator-curr')
   a(:time_calendar, css: 'div.ui-inputextender-extension 
div.valueview-expert-TimeInput-calendar > a.ui-listrotator-curr')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9b82d85d6455ed408810b8bc15a3baacbf6cd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Exclude authority control gadget tests with debug=true from ...

2016-11-15 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Exclude authority control gadget tests with debug=true from 
browsertests
..

Exclude authority control gadget tests with debug=true from browsertests

Bug: T150739
Change-Id: I6e6bcc96373619d37db623e7a234c1abeca4159a
---
M tests/browser/features/authority_control_gadget.feature
1 file changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/tests/browser/features/authority_control_gadget.feature 
b/tests/browser/features/authority_control_gadget.feature
index 4ca5d7f..806812c 100644
--- a/tests/browser/features/authority_control_gadget.feature
+++ b/tests/browser/features/authority_control_gadget.feature
@@ -35,4 +35,7 @@
   Examples:
 | item_id | debug_mode |
 | Q12480  | false |
+
+  Examples:
+| item_id | debug_mode |
 | Q12480  | true |

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e6bcc96373619d37db623e7a234c1abeca4159a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Enable browsertests for TwoColConflict extension

2016-11-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Enable browsertests for TwoColConflict extension
..

Enable browsertests for TwoColConflict extension

Bug: T149719
Change-Id: Ib018039a5ce1cf8c4ccdd4440460915d4c653066
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/70/320770/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d69e85c..f2b2f8c 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -6475,11 +6475,10 @@
   - name: composer-test
   - name: extension-unittests-generic
   - name: npm
+  - name: extension-selenium
 check:
   - jsonlint
   - jshint
-experimental:
-  - mwext-mw-selenium
 
   - name: mediawiki/extensions/TwoFactorAuthentication
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib018039a5ce1cf8c4ccdd4440460915d4c653066
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Fix default setting

2016-11-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Fix default setting
..

Fix default setting

setting $wgElectronPdfServiceMaxDocumentSize to exactly 1 GByte
to avoid confusion.
Per comments in https://gerrit.wikimedia.org/r/#/c/320195/4/extension.json

Change-Id: If80bb0921e47750b227ae534dfab69dcf0161d00
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/extension.json b/extension.json
index 13c51e7..75e4b5f 100644
--- a/extension.json
+++ b/extension.json
@@ -20,7 +20,7 @@
"key":"secret",
"pageUrl":""
},
-   "ElectronPdfServiceMaxDocumentSize": 102400
+   "ElectronPdfServiceMaxDocumentSize": 1073741824
},
"ExtensionMessagesFiles": {
"ElectronPdfServiceAlias": "ElectronPdfService.i18n.alias.php"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If80bb0921e47750b227ae534dfab69dcf0161d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Add browsertests for two column edit conflict page

2016-11-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add browsertests for two column edit conflict page
..

Add browsertests for two column edit conflict page

Bug: T149719
Change-Id: Ia215a2d5753a55a196f05cda013764be4ed707b4
---
M .gitignore
A Gemfile
A tests/browser/README.mediawiki
A tests/browser/environments.yml
A tests/browser/features/edit_conflict.feature
A tests/browser/features/support/env.rb
A tests/browser/features/support/hooks.rb
A tests/browser/features/support/pages/edit_conflict_page.rb
A tests/browser/features/support/step_definitions/edit_conflict_steps.rb
A tests/browser/features/support/step_definitions/edit_steps.rb
10 files changed, 180 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/13/320613/1

diff --git a/.gitignore b/.gitignore
index 51d4694..fb1c829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /composer.lock
 /vendor
 /node_modules
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000..19a0e9d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,8 @@
+source 'http://rubygems.org'
+
+gem 'chunky_png', '~> 1.3.4'
+gem 'jsduck', '~> 5.3.4'
+gem 'mediawiki_selenium', '~> 1.6.5'
+gem 'require_all', '~> 1.3', '>= 1.3.3'
+gem 'rake', '~> 10.4', '>= 10.4.2'
+gem 'rubocop', '~> 0.29.1', require: false
\ No newline at end of file
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
new file mode 100644
index 000..f30c427
--- /dev/null
+++ b/tests/browser/README.mediawiki
@@ -0,0 +1,50 @@
+To run the Selenium tests you will have to install Ruby (for the exact
+version see Gemfile), the latest versions of RubyGems and Firefox.
+
+The easiest way to install Ruby on *nix is RVM (https://rvm.io/) and on
+Windows RubyInstaller (http://rubyinstaller.org/).
+
+Open terminal in tests/browser. Update RubyGems and install required
+gems with:
+
+  gem update --system
+  gem install bundler  # on Mac OS X Yosemite append ` --user-install -n~/bin`,
+   # where ~/bin is the install folder
+  bundle install
+
+Environment variables MEDIAWIKI_USER and MEDIAWIKI_PASSWORD are required for
+tests that require a logged in user. For local testing, create a test user on 
your local wiki
+and export the user and password as the values for those variables.
+For example:
+
+  export MEDIAWIKI_USER= # Linux/Unix/Mac
+  set MEDIAWIKI_USER= # Windows
+
+  export MEDIAWIKI_PASSWORD= # Linux/Unix/Mac
+  set MEDIAWIKI_PASSWORD= # Windows
+
+In addition to this create another user which will be reserved for new uploads
+"Selenium_newuser". The password for this user should be the same as
+MEDIAWIKI_PASSWORD
+
+Tests that use the "Given I create a random page using the API" step need to 
set
+the MEDIAWIKI_API_URL environment variable, e.g.
+export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php
+
+Run the tests from the TwoColConflict/tests/browser directory with:
+
+  bundle exec cucumber
+
+If you want to run a single set of tests, go to the tests/browser directory and
+call 'bundle exec cucumber' with the path to the test file. For example, to run
+only the edit conflict tests:
+
+  bundle exec cucumber features/edit_conflict.feature
+
+XML report (for Jenkins) is created at tests/browser/reports/junit.
+
+Jenkins is hosted at https://wmf.ci.cloudbees.com/ and it drives
+browsers at http://saucelabs.com/
+
+For more information about running Selenium tests please see
+https://github.com/wikimedia/mediawiki-selenium
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
new file mode 100644
index 000..2e54bb8
--- /dev/null
+++ b/tests/browser/environments.yml
@@ -0,0 +1,45 @@
+# Customize this configuration as necessary to provide defaults for various
+# test environments.
+#
+# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT
+# environment variable.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   bundle exec cucumber
+#
+# Additional variables set by the environment will override the corresponding
+# defaults defined here.
+#
+#   export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host
+#   export MEDIAWIKI_USER=Selenium_user2
+#   bundle exec cucumber
+#
+mw-vagrant-host: &default
+  mediawiki_url: http://127.0.0.1:8080/wiki/
+  user_factory: true
+
+barry:
+  browser: phantomjs
+  user_factory: false
+  # mediawiki_url: Will be set manually
+
+mw-vagrant-guest:
+  mediawiki_url: http://127.0.0.1/wiki/
+  user_factory: true
+
+beta:
+  mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
+  mediawiki_user: Selenium_user
+  # mediawiki_password: SET THIS IN THE ENVIRONMENT!
+
+test2:
+  mediawiki_url: http://test2.wikipedia.org/wiki/
+  mediawiki_user: Selenium_user
+  # mediawiki_password: SET THIS IN THE ENVIRONMENT!
+
+integration:
+  browser: chrome
+  user_factory: t

[MediaWiki-commits] [Gerrit] integration/config[master]: Enable experimental browsertests for TwoColConflict extension

2016-11-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Enable experimental browsertests for TwoColConflict extension
..

Enable experimental browsertests for TwoColConflict extension

I've also moved the whole block to the correct place in layout.yaml

Bug: T149719
Change-Id: Ifc577d1269e1be7cdac228e7126335fd84fd2eef
---
M zuul/layout.yaml
1 file changed, 11 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/95/320595/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c251572..bb2d91a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2509,15 +2509,6 @@
 
  MediaWiki extensions ##
 
-  - name: mediawiki/extensions/TwoColConflict
-template:
-  - name: composer-test
-  - name: extension-unittests-generic
-  - name: npm
-check:
-  - jsonlint
-  - jshint
-
   - name: mediawiki/extensions/AbuseFilter
 template:
   - name: composer-test
@@ -6486,6 +6477,17 @@
   - jshint
   - jsonlint
 
+  - name: mediawiki/extensions/TwoColConflict
+template:
+  - name: composer-test
+  - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
+experimental:
+  - mwext-mw-selenium
+
   - name: mediawiki/extensions/TwoFactorAuthentication
 template:
   - name: jshint

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc577d1269e1be7cdac228e7126335fd84fd2eef
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Fix browsertests README

2016-11-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Fix browsertests README
..

Fix browsertests README

Change-Id: Id90b33de9d4a84e1bb1afb365c4fe06f3af24fe3
---
M tests/browser/README.mediawiki
1 file changed, 3 insertions(+), 3 deletions(-)


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

diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index 128154a..9a5d7d2 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -31,15 +31,15 @@
 the MEDIAWIKI_API_URL environment variable, e.g.
 export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php
 
-Run the tests from the ElectronPdfService tests/browser directory with:
+Run the tests from the ElectronPdfService/tests/browser directory with:
 
   bundle exec cucumber
 
 If you want to run a single set of tests, go to the tests/browser directory and
 call 'bundle exec cucumber' with the path to the test file. For example, to run
-only the watchlist tests:
+only the selectionscreen tests:
 
-  bundle exec cucumber features/betafeature.feature
+  bundle exec cucumber features/selectionscreen.feature
 
 XML report (for Jenkins) is created at tests/browser/reports/junit.
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id90b33de9d4a84e1bb1afb365c4fe06f3af24fe3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Fix browsertests README

2016-11-09 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Fix browsertests README
..

Fix browsertests README

Change-Id: I4ec4c22a69b4cf896b0f5a719f47ea84b7faaec3
---
M tests/browser/README.mediawiki
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/86/320586/1

diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index 6aab0a2..0627ea7 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -31,13 +31,13 @@
 the MEDIAWIKI_API_URL environment variable, e.g.
 export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php
 
-Run the tests from the RevisionSlider tests/browser directory with:
+Run the tests from the RevisionSlider/tests/browser directory with:
 
   bundle exec cucumber
 
 If you want to run a single set of tests, go to the tests/browser directory and
 call 'bundle exec cucumber' with the path to the test file. For example, to run
-only the watchlist tests:
+only the betafeature tests:
 
   bundle exec cucumber features/betafeature.feature
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ec4c22a69b4cf896b0f5a719f47ea84b7faaec3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Introduce hard limit for document byte size

2016-11-07 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Introduce hard limit for document byte size
..

Introduce hard limit for document byte size

Bug: T149780
Change-Id: Idc14f4472adbc2350e91ebd8ce043a08f9bf1c1f
---
M extension.json
M specials/SpecialElectronPdf.php
2 files changed, 19 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/95/320195/1

diff --git a/extension.json b/extension.json
index bbc34cc..13c51e7 100644
--- a/extension.json
+++ b/extension.json
@@ -19,7 +19,8 @@
"format":"pdf",
"key":"secret",
"pageUrl":""
-   }
+   },
+   "ElectronPdfServiceMaxDocumentSize": 102400
},
"ExtensionMessagesFiles": {
"ElectronPdfServiceAlias": "ElectronPdfService.i18n.alias.php"
diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index 321f992..2ddba62 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -16,6 +16,13 @@
 */
public $tempFileHandle;
 
+   /**
+* @var $totalBytesWritten
+*
+* Variable to keep track of total number of bytes written to the 
temporary file
+*/
+   public $totalBytesWritten;
+
public $config;
 
public function __construct() {
@@ -142,6 +149,7 @@
}
$tempFile = TempFSFile::factory( 'electron_', 'pdf' );
$this->tempFileHandle = fopen( $tempFile->getPath(), 'w+' );
+   $this->totalBytesWritten = 0;
 
$request = MWHttpRequest::factory( $this->constructServiceUrl( 
$title ) );
$request->setCallback( [ $this, 'writeToTempFile' ] );
@@ -161,7 +169,15 @@
}
 
public function writeToTempFile( $res, $content ) {
-   return fwrite( $this->tempFileHandle, $content );
+   $maxDocumentSize = $electronPdfService = $this->config->get( 
'ElectronPdfServiceMaxDocumentSize' );
+   $bytes =  fwrite( $this->tempFileHandle, $content );
+   $this->totalBytesWritten += $bytes;
+
+   if ( $this->totalBytesWritten > $maxDocumentSize ) {
+   return false;
+   }
+
+   return $bytes;
}
 
public function setHeaders() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc14f4472adbc2350e91ebd8ce043a08f9bf1c1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Run scenario that shows quantity precision issue

2016-11-07 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Run scenario that shows quantity precision issue
..

Run scenario that shows quantity precision issue

Some recent patch broke behavior for entering a quantity value
without a precision.
This scenario shows that the save-button is not enabled when
a quantity value without precision is entered.
This is currently also breaking on beta.wikidata and should be
fixed before the next deployment.

Change-Id: I5226c5bd57e60fa90985705d64e0bfcc7bf0eacd
---
M tests/browser/features/statements_quantity.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/statements_quantity.feature 
b/tests/browser/features/statements_quantity.feature
index 53d59df..0dcf566 100644
--- a/tests/browser/features/statements_quantity.feature
+++ b/tests/browser/features/statements_quantity.feature
@@ -13,7 +13,7 @@
   | quantprop | quantity |
   And I am not logged in to the repo
 
-  @ui_only
+  @ui_only @integration
   Scenario: Quantity UI should work properly
 Given I am on an item page
   And The copyright warning has been dismissed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5226c5bd57e60fa90985705d64e0bfcc7bf0eacd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Change labelling of selection options

2016-11-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Change labelling of selection options
..

Change labelling of selection options

per discussion in T149097

Bug: T149097
Change-Id: I43546914704a5f8791907a07b1e10f724b000e85
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/i18n/en.json b/i18n/en.json
index 7f6348c..95a26c6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,8 +10,8 @@
"electronPdfService-select-layout-header": "Select a layout",
"electronPdfService-single-column-label": "Single column",
"electronPdfService-two-column-label": "Two column",
-   "electronPdfService-single-column-desc": "Includes tables and 
templates",
-   "electronPdfService-two-column-desc": "Without tables and templates",
+   "electronPdfService-single-column-desc": "Includes tables and 
infoboxes",
+   "electronPdfService-two-column-desc": "Without tables and infoboxes",
"electronPdfService-download-button": "Download",
"electronPdfService-sidebar-portlet-heading": "Print/export",
"electronPdfService-sidebar-portlet-print-text": "Download as PDF",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43546914704a5f8791907a07b1e10f724b000e85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Use MW StreamFile class to stream PDF file to browser

2016-11-04 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use MW StreamFile class to stream PDF file to browser
..

Use MW StreamFile class to stream PDF file to browser

Bug: T149775
Change-Id: Ie68ebddb5409f69cf3509219796994be0cf1a6b5
---
M specials/SpecialElectronPdf.php
1 file changed, 8 insertions(+), 7 deletions(-)


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

diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index 9201322..321f992 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -201,13 +201,14 @@
private function sendPdfToOutput( $page ) {
$fileMetaData = stream_get_meta_data( $this->tempFileHandle );
$contentDisposition = FileBackend::makeContentDisposition( 
'inline', $page . '.pdf' );
-   wfResetOutputBuffers();
-   header( 'Content-Type:application/pdf' );
-   header( 'Content-Length: ' . filesize( $fileMetaData['uri'] ) );
-   header( 'Content-Disposition: ' . $contentDisposition );
-   fseek( $this->tempFileHandle, 0 );
-   fpassthru( $this->tempFileHandle );
-   $this->getOutput()->disable();
+
+   $headers = [
+   'Content-Type:application/pdf',
+   'Content-Length: ' . filesize( $fileMetaData['uri'] ),
+   'Content-Disposition: ' . $contentDisposition
+   ];
+
+   StreamFile::stream( $fileMetaData['uri'], $headers );
}
 
private function redirectToCollection( $collectionDownloadUrl ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68ebddb5409f69cf3509219796994be0cf1a6b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Use MW function to generate Content-Disposition header

2016-11-03 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use MW function to generate Content-Disposition header
..

Use MW function to generate Content-Disposition header

Bug: T149773
Change-Id: Ie1c151652dfde6b9680a281d385de8cdd03fff5b
---
M specials/SpecialElectronPdf.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/95/319595/1

diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index 53b93d4..292e523 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -140,7 +140,7 @@
$request->setCallback( [ $this, 'writeToTempFile' ] );
 
if ( $request->execute()->isOK() ) {
-   $this->sendPdfToOutput( $title->getText() );
+   $this->sendPdfToOutput( $title->getPrefixedText() );
} else {
$this->getOutput()->showErrorPage(
'electronPdfService-page-notfound-title',
@@ -196,7 +196,7 @@
wfResetOutputBuffers();
header( 'Content-Type:application/pdf' );
header( 'Content-Length: ' . filesize( $fileMetaData['uri'] ) );
-   header( 'Content-Disposition: inline; filename=' . $page . 
'.pdf' );
+   header( FileBackend::makeContentDisposition( 'inline', $page ) 
);
fseek( $this->tempFileHandle, 0 );
fpassthru( $this->tempFileHandle );
$this->getOutput()->disable();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1c151652dfde6b9680a281d385de8cdd03fff5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Call checkUrlExtension() when doing pdf download

2016-11-02 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Call checkUrlExtension() when doing pdf download
..

Call checkUrlExtension() when doing pdf download

Bug: T149782
Change-Id: I44dd79f3000ab2e4264a1ced34775aab9ebbda3a
---
M specials/SpecialElectronPdf.php
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/40/319340/1

diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index 53b93d4..c990e62 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -133,6 +133,12 @@
}
 
public function renderAndShowPdf( Title $title ) {
+   if ( !$this->getRequest()->checkUrlExtension() ) {
+   $this->getOutput()->showErrorPage(
+   'electronPdfService-page-notfound-title',
+   'electronPdfService-page-notfound-text'
+   );
+   }
$tempFile = TempFSFile::factory( 'electron_', 'pdf' );
$this->tempFileHandle = fopen( $tempFile->getPath(), 'w+' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44dd79f3000ab2e4264a1ced34775aab9ebbda3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: 2ColConflict has been renamed to TwoColConflict

2016-10-31 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: 2ColConflict has been renamed to TwoColConflict
..

2ColConflict has been renamed to TwoColConflict

Change-Id: Iaa43ba767671923ddf2bc051c2415cfb3ef97659
---
M config.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/08/318908/1

diff --git a/config.yaml b/config.yaml
index a400c91..f7ff032 100644
--- a/config.yaml
+++ b/config.yaml
@@ -171,7 +171,7 @@
 "#wikimedia-de-tech":
 analytics/wmde/.*:
 mediawiki/extensions/Cognate:
-mediawiki/extensions/2ColConflict:
+mediawiki/extensions/TwoColConflict:
 mediawiki/extensions/ElectronPdfService:
 mediawiki/extensions/InterwikiSorting:
 mediawiki/extensions/RevisionSlider:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa43ba767671923ddf2bc051c2415cfb3ef97659
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Add margin to pin button

2016-10-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add margin to pin button
..

Add margin to pin button

This also fixes the "border-overlapping-issue" when hovering
the pin button in Chrome.

Bug: T145726
Bug: T145519
Change-Id: I6d3788ca5f54937f84c6a7f0fcc456ddf4b665d7
---
M modules/ext.RevisionSlider.css
1 file changed, 6 insertions(+), 2 deletions(-)


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

diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 16bae44..95064a0 100644
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -187,16 +187,20 @@
z-index: 10;
padding: 0;
box-sizing: border-box;
-   width: 1.875em;
-   height: 1.875em;
+   width: 1.775em;
+   height: 1.775em;
background-color: transparent;
border: 0;
+   margin-top: 0.05em;
+   margin-bottom: 0.05em;
 }
 
 .mw-revslider-auto-expand-button.oo-ui-iconElement > 
.oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
position: static;
left: auto;
top: auto;
+   width: 1.775em;
+   height: 1.775em;
 }
 
 .mw-revslider-arrow.oo-ui-iconElement > .oo-ui-buttonElement-button > 
.oo-ui-iconElement-icon {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d3788ca5f54937f84c6a7f0fcc456ddf4b665d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki/selenium[master]: Avoid endless recursion when environments.yml is missing

2016-10-27 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Avoid endless recursion when environments.yml is missing
..

Avoid endless recursion when environments.yml is missing

File.dirname('.') is returning '.' and thus causing
endless recursion in search_for_configuration if
environments.yml is missing.

Bug: T149311
Change-Id: Id032ff33aaeeb827c51948b6813087adbd1353a7
---
M lib/mediawiki_selenium/environment.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/selenium 
refs/changes/05/318305/1

diff --git a/lib/mediawiki_selenium/environment.rb 
b/lib/mediawiki_selenium/environment.rb
index efaaf87..fab29f6 100644
--- a/lib/mediawiki_selenium/environment.rb
+++ b/lib/mediawiki_selenium/environment.rb
@@ -108,7 +108,7 @@
   # @return [String] Qualified path to the configuration file
   #
   def search_for_configuration(path)
-return default_configuration if path.nil? || path.empty?
+return default_configuration if path.nil? || path.empty? || path == '.'
 
 file_path = File.join(path, default_configuration)
 return file_path if File.exist?(file_path)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id032ff33aaeeb827c51948b6813087adbd1353a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/selenium
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Turn on browsertests for ElectronPdfService extension

2016-10-27 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Turn on browsertests for ElectronPdfService extension
..

Turn on browsertests for ElectronPdfService extension

Bug: T149189
Change-Id: I68327efe4d57a9b3c2f971e7bf1d54e79bcd3df8
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/84/318284/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index db5437c..506dee0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3325,11 +3325,10 @@
   - name: composer-test
   - name: extension-unittests-generic
   - name: npm
+  - name: extension-selenium
 check:
   - jsonlint
   - jshint
-experimental:
-  - mwext-mw-selenium
 
   - name: mediawiki/extensions/EmailCapture
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68327efe4d57a9b3c2f971e7bf1d54e79bcd3df8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Enable experimental browsertests for ELectronPdfService

2016-10-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Enable experimental browsertests for ELectronPdfService
..

Enable experimental browsertests for ELectronPdfService

Bug: T149189
Change-Id: I872ea6c18def34c84c1289e61913118b6c5927e9
---
M zuul/layout.yaml
M zuul/parameter_functions.py
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/91/318091/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 0f4f5a6..5cafba5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3326,6 +3326,8 @@
 check:
   - jsonlint
   - jshint
+experimental:
+  - mwext-mw-selenium
 
   - name: mediawiki/extensions/EmailCapture
 template:
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2ab2b88..8cd4b5f 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -101,6 +101,7 @@
 'Disambiguator': ['VisualEditor'],
 'DonationInterface': ['ContributionTracking'],
 'EducationProgram': ['cldr', 'WikiEditor'],
+'ElectronPdfService': ['Collection'],
 'FileAnnotations': ['EventLogging'],
 'FlaggedRevs': ['Scribunto'],
 'GettingStarted': ['CentralAuth', 'EventLogging', 'GuidedTour'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I872ea6c18def34c84c1289e61913118b6c5927e9
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Adding basic browsertests

2016-10-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Adding basic browsertests
..

Adding basic browsertests

Change-Id: I080be6304e7be3cfadbead182a23302d6de9d72f
---
M .gitignore
A Gemfile
A tests/browser/README.mediawiki
A tests/browser/features/selectionscreen.feature
A tests/browser/features/support/env.rb
A tests/browser/features/support/hooks.rb
A tests/browser/features/support/pages/mainpage_page.rb
A tests/browser/features/support/pages/selectionscreen_page.rb
A tests/browser/features/support/step_definitions/mainpage.rb
A tests/browser/features/support/step_definitions/selectionscreen.rb
10 files changed, 123 insertions(+), 0 deletions(-)


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

diff --git a/.gitignore b/.gitignore
index 51d4694..fb1c829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /composer.lock
 /vendor
 /node_modules
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000..8f7df47
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'chunky_png', '~> 1.3.4'
+gem 'jsduck', '~> 5.3.4'
+gem 'mediawiki_selenium', '~> 1.6.5'
+gem 'rake', '~> 10.4', '>= 10.4.2'
+gem 'rubocop', '~> 0.29.1', require: false
\ No newline at end of file
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
new file mode 100644
index 000..6aab0a2
--- /dev/null
+++ b/tests/browser/README.mediawiki
@@ -0,0 +1,50 @@
+To run the Selenium tests you will have to install Ruby (for the exact
+version see Gemfile), the latest versions of RubyGems and Firefox.
+
+The easiest way to install Ruby on *nix is RVM (https://rvm.io/) and on
+Windows RubyInstaller (http://rubyinstaller.org/).
+
+Open terminal in tests/browser. Update RubyGems and install required
+gems with:
+
+  gem update --system
+  gem install bundler  # on Mac OS X Yosemite append ` --user-install -n~/bin`,
+   # where ~/bin is the install folder
+  bundle install
+
+Environment variables MEDIAWIKI_USER and MEDIAWIKI_PASSWORD are required for
+tests that require a logged in user. For local testing, create a test user on 
your local wiki
+and export the user and password as the values for those variables.
+For example:
+
+  export MEDIAWIKI_USER= # Linux/Unix/Mac
+  set MEDIAWIKI_USER= # Windows
+
+  export MEDIAWIKI_PASSWORD= # Linux/Unix/Mac
+  set MEDIAWIKI_PASSWORD= # Windows
+
+In addition to this create another user which will be reserved for new uploads
+"Selenium_newuser". The password for this user should be the same as
+MEDIAWIKI_PASSWORD
+
+Tests that use the "Given I create a random page using the API" step need to 
set
+the MEDIAWIKI_API_URL environment variable, e.g.
+export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php
+
+Run the tests from the RevisionSlider tests/browser directory with:
+
+  bundle exec cucumber
+
+If you want to run a single set of tests, go to the tests/browser directory and
+call 'bundle exec cucumber' with the path to the test file. For example, to run
+only the watchlist tests:
+
+  bundle exec cucumber features/betafeature.feature
+
+XML report (for Jenkins) is created at tests/browser/reports/junit.
+
+Jenkins is hosted at https://wmf.ci.cloudbees.com/ and it drives
+browsers at http://saucelabs.com/
+
+For more information about running Selenium tests please see
+https://github.com/wikimedia/mediawiki-selenium
diff --git a/tests/browser/features/selectionscreen.feature 
b/tests/browser/features/selectionscreen.feature
new file mode 100644
index 000..1998194
--- /dev/null
+++ b/tests/browser/features/selectionscreen.feature
@@ -0,0 +1,11 @@
+@chrome @en.wikipedia.beta.wmflabs.org @firefox @integration
+Feature: ElectronPdfService Selection Screen
+  Background:
+Given I am on the Main Page
+
+  Scenario: Selection screen is shown with correct default selection
+When I click Download as PDF
+Then Selection screen header should be there
+And Selection elements should be there
+And Download button should be there
+And Single column option should be selected
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
new file mode 100644
index 000..3c896c2
--- /dev/null
+++ b/tests/browser/features/support/env.rb
@@ -0,0 +1,3 @@
+require 'mediawiki_selenium/cucumber'
+require 'mediawiki_selenium/pages'
+require 'mediawiki_selenium/step_definitions'
\ No newline at end of file
diff --git a/tests/browser/features/support/hooks.rb 
b/tests/browser/features/support/hooks.rb
new file mode 100644
index 000..9e8e4cd
--- /dev/null
+++ b/tests/browser/features/support/hooks.rb
@@ -0,0 +1,6 @@
+# Needed for cucumber --dry-run -f stepdefs
+require_relative 'env'
+
+Before('@skip') do |scenario|
+  scenario.skip_invoke!
+end
\ No newline at end of f

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Apply to view & purge action only

2016-10-24 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Apply to view & purge action only
..

Apply to view & purge action only

also added additional check for potential non-existing key.

Change-Id: Ia9b8738e9615e74314af19bc638f6bd0b2c02dbf
---
M ElectronPdfService.hooks.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/96/317496/1

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index 224f285..4b5b7e1 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -27,7 +27,12 @@
return false;
}
 
-   if ( $config->has( 'CollectionFormats' ) ) {
+   $action = $skin->getRequest()->getVal( 'action', 'view' );
+   if ( $action != 'view' && $action != 'purge' ) {
+   return false;
+   }
+
+   if ( $config->has( 'CollectionFormats' ) && array_key_exists( 
'coll-print_export', $bar ) ) {
$index = self::getIndexOfDownloadPdfSidebarItem(
$bar['coll-print_export'],
$config->get( 'CollectionFormats' )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9b8738e9615e74314af19bc638f6bd0b2c02dbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Fix selecting betafeature in browsertests

2016-10-21 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Fix selecting betafeature in browsertests
..

Fix selecting betafeature in browsertests

this broke due to https://gerrit.wikimedia.org/r/#/c/315850/

Bug: T148841
Change-Id: I8997ec6d8bb210b87bb984a8f6aed2ba10dbd3f6
---
M tests/browser/features/support/pages/special_preferences_page.rb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/support/pages/special_preferences_page.rb 
b/tests/browser/features/support/pages/special_preferences_page.rb
index 3501957..e30a022 100644
--- a/tests/browser/features/support/pages/special_preferences_page.rb
+++ b/tests/browser/features/support/pages/special_preferences_page.rb
@@ -3,7 +3,7 @@
   page_url 'Special:Preferences'
 
   a(:beta_features_tab, css: '#preftab-betafeatures')
-  text_field(:revisionslider_checkbox, css: '#mw-input-wprevisionslider')
+  text_field(:revisionslider_checkbox, css: '[name=wprevisionslider]')
   button(:submit_button, css: '#prefcontrol')
 
   def enable_revisionslider

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8997ec6d8bb210b87bb984a8f6aed2ba10dbd3f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Don't replace printable version link

2016-10-20 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Don't replace printable version link
..

Don't replace printable version link

Removing functionality that replaces the printable version link
with a link to the ElectronPDF rendered version, as it needs
to be discussed if we want that at all.

Change-Id: I923c704ca1c47504ed73e35d439b0ea53e127f71
---
M ElectronPdfService.hooks.php
M extension.json
2 files changed, 0 insertions(+), 33 deletions(-)


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

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index a2cc0a1..dc1034f 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -27,36 +27,6 @@
[ 'page' => $title->getPrefixedText() ]
)
];
-
-   // find the element for the print version and override 
it with the link to our SpecialPage
-   foreach ( $bar['coll-print_export'] as $index => 
$element ) {
-   if ( $element['id'] === 't-print' ) {
-   
$bar['coll-print_export'][$index]['href'] = $specialPageTitle->getLocalURL(
-   [ 'page' => 
$title->getPrefixedText() ]
-   );
-   }
-   }
-   }
-
-   return true;
-   }
-
-   public static function onBuildNavUrls( Skin $skin, &$navUrls ) {
-   $title = $skin->getTitle();
-   if ( is_null( $title ) || !$title->exists() ) {
-   return false;
-   }
-
-   $specialPageTitle = SpecialPage::getTitleFor( 'ElectronPdf' );
-
-   // if there's an element for a print version, override it with 
the link to our SpecialPage
-   if ( array_key_exists( 'print', $navUrls ) && $navUrls['print'] 
!== false ) {
-   $navUrls['print'] = [
-   'text' => $skin->msg( 'printableversion' 
)->text(),
-   'href' => $specialPageTitle->getLocalURL(
-   [ 'page' => $title->getPrefixedText() ]
-   )
-   ];
}
 
return true;
diff --git a/extension.json b/extension.json
index 409bdc5..551b711 100644
--- a/extension.json
+++ b/extension.json
@@ -27,9 +27,6 @@
"Hooks": {
  "SidebarBeforeOutput": [
"ElectronPdfServiceHooks::onSidebarBeforeOutput"
- ],
- "SkinTemplateBuildNavUrlsNav_urlsAfterPermalink": [
-   "ElectronPdfServiceHooks::onBuildNavUrls"
  ]
},
"MessagesDirs": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I923c704ca1c47504ed73e35d439b0ea53e127f71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: [WIP] Wiring up form and service

2016-10-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [WIP] Wiring up form and service
..

[WIP] Wiring up form and service

Bug: T146895
Change-Id: I0942e5af84dedaf4532c7bd6ffe988c027c3d78e
---
M ElectronPdfService.hooks.php
M specials/SpecialElectronPdf.php
2 files changed, 17 insertions(+), 8 deletions(-)


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

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index a2cc0a1..f2c61ed 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -32,7 +32,10 @@
foreach ( $bar['coll-print_export'] as $index => 
$element ) {
if ( $element['id'] === 't-print' ) {

$bar['coll-print_export'][$index]['href'] = $specialPageTitle->getLocalURL(
-   [ 'page' => 
$title->getPrefixedText() ]
+   [
+   'page' => 
$title->getPrefixedText(),
+   'cmd' => 'download'
+   ]
);
}
}
@@ -54,7 +57,10 @@
$navUrls['print'] = [
'text' => $skin->msg( 'printableversion' 
)->text(),
'href' => $specialPageTitle->getLocalURL(
-   [ 'page' => $title->getPrefixedText() ]
+   [
+   'page' => 
$title->getPrefixedText(),
+   'cmd' => 'download'
+   ]
)
];
}
diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index 13ef9f4..0670001 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -37,10 +37,13 @@
return;
}
 
-   // TODO: build a propper switch here and consider input if a 
method was selected
-
-   $this->showRenderModeSelectionPage( $title );
-   // $this->renderAndShowPdf( $title, $page );
+   switch ( $request->getVal( 'cmd', '' ) ) {
+   case 'download':
+   $this->renderAndShowPdf( $title, $page );
+   return;
+   default:
+   $this->showRenderModeSelectionPage( $title );
+   }
}
 
public function showRenderModeSelectionPage( Title $title ) {
@@ -52,8 +55,8 @@
$out->addSubtitle( $title->getText() );
 
$form = new OOUI\FormLayout( [
-   'method' => 'POST',
-   'action' => '',
+   'method' => 'GET',
+   'action' => $this->getPageTitle()->getLocalURL(),
] );
 
$form->addClasses( [ 'mw-electronPdfService-selection-form' ] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0942e5af84dedaf4532c7bd6ffe988c027c3d78e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor tooltips browsertests

2016-10-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Refactor tooltips browsertests
..

Refactor tooltips browsertests

- Applied the Given-When-Then rule

Bug: T146176
Change-Id: Ie9eb48cafd85ef7a00c9d9f9fd626fab5f128824
---
M tests/browser/features/tooltips.feature
1 file changed, 10 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/09/315509/1

diff --git a/tests/browser/features/tooltips.feature 
b/tests/browser/features/tooltips.feature
index a7491a4..b35e394 100644
--- a/tests/browser/features/tooltips.feature
+++ b/tests/browser/features/tooltips.feature
@@ -5,23 +5,21 @@
 And I have reset my preferences
 And RevisionSlider is enabled as a beta feature
 And a page with 4 revision(s) exists
-And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
 
   Scenario: RevisionSlider revision tooltip appears on hover
-Given I hover over revision 1
-Then a tooltip should be present for revision 1
-Given I hover over revision 2
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I hover over revision 1
+And I hover over revision 2
 Then a tooltip should be present for revision 2
 And no tooltip should be present for revision 1
 
   Scenario: RevisionSlider revision tooltip appears and remains on hover
-Given I hover over revision 1
-Then a tooltip should be present for revision 1
-Given I hover over the revision 1 tooltip
-Then a tooltip should be present for revision 1
-Given I hover over revision 2
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I hover over revision 1
+And I hover over the revision 1 tooltip
+And I hover over revision 2
+And I hover over the revision 2 tooltip
 Then a tooltip should be present for revision 2
 And no tooltip should be present for revision 1
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9eb48cafd85ef7a00c9d9f9fd626fab5f128824
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Update pointer position attributes immediately

2016-10-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Update pointer position attributes immediately
..

Update pointer position attributes immediately

Update attributes right after setting position and
don't wait until revisions are refreshed.

Change-Id: Ic32a554d6939806ce95d4e7b441ee08965b81940
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/06/315506/1

diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index cfa4756..090ceac 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -306,12 +306,14 @@
 
if ( hasClickedTop ) {
pNew.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
+   view.updatePointerPositionAttributes();
view.refreshRevisions(
view.getRevElementAtPosition( 
$revisions, pOld.getPosition() ).data( 'revid' ),
$clickedRev.data( 'revid' )
);
} else {
pOld.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
+   view.updatePointerPositionAttributes();
view.refreshRevisions(
$clickedRev.data( 'revid' ),
view.getRevElementAtPosition( 
$revisions, pNew.getPosition() ).data( 'revid' )
@@ -321,7 +323,6 @@
view.resetPointerColorsBasedOnValues( 
view.pointerOlder.getPosition(), view.pointerNewer.getPosition() );
view.resetRevisionStylesBasedOnPointerPosition( 
$revisions );
view.alignPointers();
-   view.updatePointerPositionAttributes();
},
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic32a554d6939806ce95d4e7b441ee08965b81940
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Remove obsolete step

2016-10-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Remove obsolete step
..

Remove obsolete step

Bug: T146276
Change-Id: I9b1b8e2aa87b88bd18d58a46834e6090284314ee
---
M tests/browser/features/autoexpand.feature
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/tests/browser/features/autoexpand.feature 
b/tests/browser/features/autoexpand.feature
index e68be9d..c3cb8d8 100644
--- a/tests/browser/features/autoexpand.feature
+++ b/tests/browser/features/autoexpand.feature
@@ -37,7 +37,6 @@
 When I click on the auto expand button
 And I wait for the setting to be saved
 And I have dismissed the help dialog
-And The help dialog is hidden
 And I click on the auto expand button
 And I wait for the setting to be saved
 And I refresh the page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b1b8e2aa87b88bd18d58a46834e6090284314ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: [WIP] Refactor timeline browsertests

2016-10-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [WIP] Refactor timeline browsertests
..

[WIP] Refactor timeline browsertests

- Applied the Given-When-Then rule

Bug: T146276
Change-Id: I0278ef607f96851ed69e7373b952f5d02139cb0c
---
M tests/browser/features/timeline.feature
1 file changed, 4 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/76/315476/1

diff --git a/tests/browser/features/timeline.feature 
b/tests/browser/features/timeline.feature
index 94df85b..16f8f9a 100644
--- a/tests/browser/features/timeline.feature
+++ b/tests/browser/features/timeline.feature
@@ -8,9 +8,7 @@
   Scenario: RevisionSlider timeline arrows to be disabled with 3 revisions
 Given a page with 3 revision(s) exists
 And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
+When I have loaded the RevisionSlider and dismissed the help dialog
 Then The backward arrow should be disabled
 And The forward arrow should be disabled
 
@@ -18,15 +16,8 @@
 Given a page with 30 revision(s) exists
 And The window size is 800 by 600
 And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
-And The help dialog is hidden
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I click on the backward arrow
+And I click on the forward arrow
 Then The backward arrow should be enabled
 And The forward arrow should be disabled
-Given I click on the backward arrow
-Then The backward arrow should be disabled
-And The forward arrow should be enabled
-Given I click on the forward arrow
-Then The backward arrow should be enabled
-And The forward arrow should be disabled
\ No newline at end of file

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0278ef607f96851ed69e7373b952f5d02139cb0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use Chrome for selenium-Wikibase job

2016-10-11 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use Chrome for selenium-Wikibase job
..

Use Chrome for selenium-Wikibase job

Bug: T147401
Change-Id: Id8f65daf99b330d2cba1ec5c549642fbb9c6aca2
---
M tests/browser/ci.yml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml
index 0902f17..5fa93ad 100644
--- a/tests/browser/ci.yml
+++ b/tests/browser/ci.yml
@@ -1,5 +1,5 @@
 BROWSER:
-  - firefox
+  - chrome
 
 MEDIAWIKI_ENVIRONMENT:
   - beta

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8f65daf99b330d2cba1ec5c549642fbb9c6aca2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Always apply data-pos attribute to pointers as well

2016-10-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Always apply data-pos attribute to pointers as well
..

Always apply data-pos attribute to pointers as well

Adding position data-attribute to the pointer elements and always
apply the same value as for the revision bars they are pointing to.

This will allow us to reduce the complexity of browsertests.

Bug: T146276
Change-Id: I6e6db55204b0c45fe94a5173e297a67a7ed38d00
---
M modules/ext.RevisionSlider.SliderView.js
1 file changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/94/315094/1

diff --git a/modules/ext.RevisionSlider.SliderView.js 
b/modules/ext.RevisionSlider.SliderView.js
index c1dfd48..36b03fa 100644
--- a/modules/ext.RevisionSlider.SliderView.js
+++ b/modules/ext.RevisionSlider.SliderView.js
@@ -213,6 +213,11 @@
 
self.refreshRevisions( revId1, revId2 );
 
+   self.updatePointerPositionAttributes(
+   self.getRevElementAtPosition( 
$revisions, self.pointerNewer.getPosition() ).data( 'pos' ),
+   self.getRevElementAtPosition( 
$revisions, self.pointerOlder.getPosition() ).data( 'pos' )
+   );
+
$( '.mw-revslider-revision-wrapper' 
).removeClass( 'mw-revslider-pointer-cursor' );
},
drag: function ( event, ui ) {
@@ -308,12 +313,14 @@
view.getRevElementAtPosition( 
$revisions, pOld.getPosition() ).data( 'revid' ),
$clickedRev.data( 'revid' )
);
+   view.updatePointerPositionAttributes( 
$clickedRev.attr( 'data-pos' ), null );
} else {
pOld.setPosition( parseInt( $clickedRev.attr( 
'data-pos' ), 10 ) );
view.refreshRevisions(
$clickedRev.data( 'revid' ),
view.getRevElementAtPosition( 
$revisions, pNew.getPosition() ).data( 'revid' )
);
+   view.updatePointerPositionAttributes( null, 
$clickedRev.attr( 'data-pos' ) );
}
 
view.resetPointerColorsBasedOnValues( 
view.pointerOlder.getPosition(), view.pointerNewer.getPosition() );
@@ -402,6 +409,7 @@
}
this.pointerNewer.setPosition( $newRevElement.data( 
'pos' ) );
this.resetPointerStylesBasedOnPosition();
+   this.updatePointerPositionAttributes( 
$newRevElement.data( 'pos' ), $oldRevElement.data( 'pos' ) )
},
 
/**
@@ -453,6 +461,22 @@
},
 
/**
+* Updates value of pointers' position data attribute
+*
+* @param {string|null} $newPos
+* @param {string|null} $oldPos
+*/
+   updatePointerPositionAttributes: function ( newPos, oldPos ) {
+   if ( newPos !== null ) {
+   
this.getNewRevPointer().getView().getElement().attr('data-pos', newPos);
+   }
+
+   if ( oldPos !== null ) {
+   
this.getOldRevPointer().getView().getElement().attr( 'data-pos', oldPos );
+   }
+   },
+
+   /**
 * @return {number}
 */
calculateSliderContainerWidth: function () {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e6db55204b0c45fe94a5173e297a67a7ed38d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use when_present instead of when_visible in badges test

2016-10-10 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use when_present instead of when_visible in badges test
..

Use when_present instead of when_visible in badges test

Trying to work around the overlapping-issue described in
https://phabricator.wikimedia.org/T147401#2703382

Bug: T147401
Change-Id: Ib19cf54c6e58372704f1fccc705421f424e2d4d1
---
M tests/browser/features/step_definitions/sitelinks_steps.rb
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/step_definitions/sitelinks_steps.rb 
b/tests/browser/features/step_definitions/sitelinks_steps.rb
index f195ebb..eae155f 100644
--- a/tests/browser/features/step_definitions/sitelinks_steps.rb
+++ b/tests/browser/features/step_definitions/sitelinks_steps.rb
@@ -20,7 +20,7 @@
 
 When(/^I click the sitelink save button$/) do
   on(ItemPage) do |page|
-page.save_sitelink_link_element.when_visible.click
+page.save_sitelink_link_element.when_present.click
 page.wait_for_api_callback
   end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib19cf54c6e58372704f1fccc705421f424e2d4d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: [WIP] Refactor history browsertests

2016-10-07 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [WIP] Refactor history browsertests
..

[WIP] Refactor history browsertests

Change-Id: Iad5abbb6e73a31afad1e2058b26ece3fbc7ad942
---
M tests/browser/features/history.feature
M tests/browser/features/support/step_definitions/common_steps.rb
M tests/browser/features/support/step_definitions/help.rb
M tests/browser/features/support/step_definitions/pointers.rb
4 files changed, 30 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/06/314706/1

diff --git a/tests/browser/features/history.feature 
b/tests/browser/features/history.feature
index d8a5dc2..c0b1a41 100644
--- a/tests/browser/features/history.feature
+++ b/tests/browser/features/history.feature
@@ -5,39 +5,38 @@
 And I have reset my preferences
 And RevisionSlider is enabled as a beta feature
 And a page with 4 revision(s) exists
-And I am on the diff page
-And I click on the expand button
-And The RevisionSlider has loaded
-And I have dismissed the help dialog
-And The help dialog is hidden
 
   Scenario: RevisionSlider history can be accessed using browser back and 
forward buttons after clicking on a revision
-Given I click on revision 1
-And the diff has loaded
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
+And I click on revision 1
+And I wait until the diff has loaded
 And I click the browser back button
-And the diff has loaded
+And I wait until the diff has loaded
 Then the lower pointer should be on revision 3
-And the lower pointer should be on revision 4
+And the upper pointer should be on revision 4
 And revision 3 should be loaded on the left of the diff
 And revision 4 should be loaded on the right of the diff
 Given I click the browser forward button
-And the diff has loaded
+And I wait until the diff has loaded
 Then the lower pointer should be on revision 1
-And the lower pointer should be on revision 4
+And the upper pointer should be on revision 4
 And revision 1 should be loaded on the left of the diff
 And revision 4 should be loaded on the right of the diff
 
   Scenario: RevisionSlider history can be accessed using browser back and 
forward buttons after dragging to a revision
+Given I am on the diff page
+When I have loaded the RevisionSlider and dismissed the help dialog
 Given I drag the lower pointer to revision 1
-And the diff has loaded
+And I wait until the diff has loaded
 And I click the browser back button
-And the diff has loaded
+And I wait until the diff has loaded
 Then the lower pointer should be on revision 3
 And the lower pointer should be on revision 4
 And revision 3 should be loaded on the left of the diff
 And revision 4 should be loaded on the right of the diff
 Given I click the browser forward button
-And the diff has loaded
+And I wait until the diff has loaded
 Then the lower pointer should be on revision 1
 And the lower pointer should be on revision 4
 And revision 1 should be loaded on the left of the diff
diff --git a/tests/browser/features/support/step_definitions/common_steps.rb 
b/tests/browser/features/support/step_definitions/common_steps.rb
index 5dbccb7..4c7d995 100644
--- a/tests/browser/features/support/step_definitions/common_steps.rb
+++ b/tests/browser/features/support/step_definitions/common_steps.rb
@@ -30,6 +30,12 @@
   step 'The RevisionSlider has loaded'
 end
 
+When(/^I have loaded the RevisionSlider and dismissed the help dialog$/) do
+  step 'I click on the expand button'
+  step 'I wait until the RevisionSlider has loaded'
+  step 'I have dismissed the help dialog'
+end
+
 Then(/^The RevisionSlider has loaded$/) do
   on(DiffPage).wait_for_slider_to_load
 end
diff --git a/tests/browser/features/support/step_definitions/help.rb 
b/tests/browser/features/support/step_definitions/help.rb
index 2fef943..5407e86 100644
--- a/tests/browser/features/support/step_definitions/help.rb
+++ b/tests/browser/features/support/step_definitions/help.rb
@@ -1,5 +1,6 @@
 When(/^I have dismissed the help dialog$/) do
   step 'I have closed the help dialog at the start'
+  step 'I wait until help dialog is hidden'
 end
 
 When(/^I have closed the help dialog at the start$/) do
@@ -14,6 +15,10 @@
   on(DiffPage).revisionslider_help_next_element.when_visible.click
 end
 
+When (/^I wait until help dialog is hidden$/) do
+  step 'The help dialog is hidden'
+end
+
 Given(/^The help dialog is hidden$/) do
   on(DiffPage).wait_for_help_dialog_to_hide
 end
diff --git a/tests/browser/features/support/step_definitions/pointers.rb 
b/tests/browser/features/support/step_definitions/pointers.rb
index 571498f..a8d2e

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor help browsertest

2016-10-07 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Refactor help browsertest
..

Refactor help browsertest

- Applied the Given-When-Then rule
- Created alias of "close-help-dialog" step for readability

Bug: T146276
Change-Id: Icc8aeb8720025bd3c6d6bc811713fac48a9919dd
---
M tests/browser/features/autoexpand.feature
M tests/browser/features/help.feature
M tests/browser/features/history.feature
M tests/browser/features/pointers.feature
M tests/browser/features/support/step_definitions/help.rb
M tests/browser/features/timeline.feature
M tests/browser/features/tooltips.feature
7 files changed, 29 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/96/314696/1

diff --git a/tests/browser/features/autoexpand.feature 
b/tests/browser/features/autoexpand.feature
index bf9625a..e68be9d 100644
--- a/tests/browser/features/autoexpand.feature
+++ b/tests/browser/features/autoexpand.feature
@@ -36,7 +36,7 @@
 Given I am on the diff page
 When I click on the auto expand button
 And I wait for the setting to be saved
-And I have closed the help dialog at the start
+And I have dismissed the help dialog
 And The help dialog is hidden
 And I click on the auto expand button
 And I wait for the setting to be saved
diff --git a/tests/browser/features/help.feature 
b/tests/browser/features/help.feature
index ba5a0f5..69ca1a7 100644
--- a/tests/browser/features/help.feature
+++ b/tests/browser/features/help.feature
@@ -6,25 +6,29 @@
 And I have reset my preferences
 And RevisionSlider is enabled as a beta feature
 And I am on the diff page
-And I click on the expand button
 
-  Scenario: RevisionSlider tutorial is present on first load only
-Given The RevisionSlider has loaded
+  Scenario: RevisionSlider tutorial is present on first load
+When I click on the expand button
+And I wait until the RevisionSlider has loaded
 Then The help dialog should be visible
-When I have closed the help dialog at the start
+
+  Scenario: RevisionSlider tutorial is not present after it was dismissed once
+When I click on the expand button
+And I wait until the RevisionSlider has loaded
+And I have dismissed the help dialog
 And I refresh the page
 And I click on the expand button
-And The RevisionSlider has loaded
+And I wait until the RevisionSlider has loaded
 Then The help dialog should not be present
 
   Scenario: RevisionSlider tutorial sequence works
-Given The RevisionSlider has loaded
-Then The help dialog should be visible
-When I have moved to the next step
+When I click on the expand button
+And I wait until the RevisionSlider has loaded
+And I have moved to the next step
 And I have moved to the next step
 And I have moved to the next step
 And I have closed the help dialog at the end
 And I refresh the page
 And I click on the expand button
-And The RevisionSlider has loaded
+And I wait until the RevisionSlider has loaded
 Then The help dialog should not be present
\ No newline at end of file
diff --git a/tests/browser/features/history.feature 
b/tests/browser/features/history.feature
index 5c4e48f..d8a5dc2 100644
--- a/tests/browser/features/history.feature
+++ b/tests/browser/features/history.feature
@@ -8,7 +8,7 @@
 And I am on the diff page
 And I click on the expand button
 And The RevisionSlider has loaded
-And I have closed the help dialog at the start
+And I have dismissed the help dialog
 And The help dialog is hidden
 
   Scenario: RevisionSlider history can be accessed using browser back and 
forward buttons after clicking on a revision
diff --git a/tests/browser/features/pointers.feature 
b/tests/browser/features/pointers.feature
index 913ca0c..e09b377 100644
--- a/tests/browser/features/pointers.feature
+++ b/tests/browser/features/pointers.feature
@@ -8,7 +8,7 @@
 And I am on the diff page
 And I click on the expand button
 And The RevisionSlider has loaded
-And I have closed the help dialog at the start
+And I have dismissed the help dialog
 And The help dialog is hidden
 
   Scenario: RevisionSlider pointers move then revision bars are clicked
diff --git a/tests/browser/features/support/step_definitions/help.rb 
b/tests/browser/features/support/step_definitions/help.rb
index 8e7d318..e551ca9 100644
--- a/tests/browser/features/support/step_definitions/help.rb
+++ b/tests/browser/features/support/step_definitions/help.rb
@@ -1,16 +1,20 @@
-Given(/^I have closed the help dialog at the start$/) do
-  on(DiffPage).revisionslider_help_close_start_element.when_visible.click
-  end
+When(/^I have dismissed the help dialog$/) do
+  step 'I have closed the help dialog at the start'
+end
 
-Given(/^I have closed the help

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Refactor expand browsertests

2016-10-07 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Refactor expand browsertests
..

Refactor expand browsertests

- Applied the Given-When-Then rule to scenarios

Bug: T146276
Change-Id: I08aabda113d6ad9f1bbf06161484143549b13a7c
---
M tests/browser/features/expand.feature
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/92/314692/1

diff --git a/tests/browser/features/expand.feature 
b/tests/browser/features/expand.feature
index c04185c..8110665 100644
--- a/tests/browser/features/expand.feature
+++ b/tests/browser/features/expand.feature
@@ -13,16 +13,13 @@
 
   Scenario: RevisionSlider loads after expanding
 Given I am on the diff page
-And I click on the expand button
+When I click on the expand button
 Then RevisionSlider wrapper should be visible
 And The RevisionSlider has loaded
 
   Scenario: RevisionSlider hides after collapsing
 Given I am on the diff page
-And I click on the expand button
-Then RevisionSlider wrapper should be visible
+When I click on the expand button
 And The RevisionSlider has loaded
-And I have closed the help dialog at the start
-And The help dialog is hidden
-Given I click on the expand button
+And I click on the expand button
 Then RevisionSlider wrapper should be hidden

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08aabda113d6ad9f1bbf06161484143549b13a7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Avoid duplicate "printable version" link

2016-09-29 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Avoid duplicate "printable version" link
..

Avoid duplicate "printable version" link

When the Collection extension is installed it is moving the
"printable version" link to its own section. We should not
create another link in that case.

Bug: T146894
Change-Id: If9cd3620a7da5e01064817da511209cb3cd67daa
---
M ElectronPdfService.hooks.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/02/313402/1

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index e3507b1..295df1c 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -39,6 +39,10 @@
$specialPageTitle = SpecialPage::getTitleFor( 'ElectronPdf' );
 
if ( array_key_exists( 'print', $navUrls ) ) {
+   if ( $navUrls['print'] === false ) {
+   return true;
+   }
+
$navUrls['print'] = [
'text' => $skin->msg( 'printableversion' 
)->text(),
'href' => $specialPageTitle->getLocalURL(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If9cd3620a7da5e01064817da511209cb3cd67daa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Use "page" instead of "article" for parameter and settings

2016-09-29 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use "page" instead of "article" for parameter and settings
..

Use "page" instead of "article" for parameter and settings

Change-Id: I8b543883937a2cce3496e0feae13e5591a78f5b5
---
M ElectronPdfService.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
M specials/SpecialElectronPdf.php
5 files changed, 27 insertions(+), 27 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/98/313398/1

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index 3ccb442..e3507b1 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -22,7 +22,7 @@
'text' => $skin->msg( 
'electronPdfService-sidebar-portlet-print-text' )->escaped(),
'id' => 'electron-print_pdf',
'href' => $specialPageTitle->getLocalURL(
-   [ 'articletitle' => 
$title->getPrefixedText() ]
+   [ 'page' => $title->getPrefixedText() ]
)
];
}
@@ -42,7 +42,7 @@
$navUrls['print'] = [
'text' => $skin->msg( 'printableversion' 
)->text(),
'href' => $specialPageTitle->getLocalURL(
-   [ 'articletitle' => 
$title->getPrefixedText() ]
+   [ 'page' => $title->getPrefixedText() ]
)
];
}
diff --git a/extension.json b/extension.json
index 74a83b9..409bdc5 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,7 @@
"serviceUrl":"https://pdf-electron.wmflabs.org";,
"format":"pdf",
"key":"secret",
-   "articleUrl":""
+   "pageUrl":""
}
},
"ExtensionMessagesFiles": {
diff --git a/i18n/en.json b/i18n/en.json
index 3b6e556..f3662e3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,8 +8,8 @@
"electronPdfService-desc": "Adds browser based PDF rendering support 
through Electron PDF service",
"electronPdfService-sidebar-portlet-heading": "Print",
"electronPdfService-sidebar-portlet-print-text": "Print PDF",
-   "electronPdfService-invalid-article-title": "Invalid page",
-   "electronPdfService-invalid-article-text": "The specified page is not 
valid.",
-   "electronPdfService-article-notfound-title": "Page not found by 
service",
-   "electronPdfService-article-notfound-text": "The service was not able 
to resolve the specified link."
+   "electronPdfService-invalid-page-title": "Invalid page",
+   "electronPdfService-invalid-page-text": "The specified page is not 
valid.",
+   "electronPdfService-page-notfound-title": "Page not found by service",
+   "electronPdfService-page-notfound-text": "The service was not able to 
resolve the specified link."
 }
\ No newline at end of file
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c06a0d3..df4d997 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -8,8 +8,8 @@
"electronPdfService-desc": "{{desc|name=ElectronPdfService|url=}}",
"electronPdfService-sidebar-portlet-heading": "Title of the portlet in 
which the link is shown.",
"electronPdfService-sidebar-portlet-print-text": "Text of 
print-pdf-link in sidebar.",
-   "electronPdfService-invalid-article-title": "Used as title for the 
error message when specified page was not a valid article.",
-   "electronPdfService-invalid-article-text": "Used as error message when 
specified page was not a valid article.",
-   "electronPdfService-article-notfound-title": "Used as title for the 
error message when Electron service was not able to resolve the given URL to 
the article.",
-   "electronPdfService-article-notfound-text": "Used as error message when 
Electron service was not able to resolve the given URL to the article."
+   "electronPdfService-invalid-page-title": "Used as title for the error 
message when specified page was not a valid article.",
+   "electronPdfService-invalid-page-text": "Used as error message when 
specified page was not a valid article.",
+   "electronPdfService-page-notfound-title": "Used as title for the error 
message when Electron service was not able to resolve the given URL to the 
article.",
+   "electronPdfService-page-notfound-text": "Used as error message when 
Electron service was not able to resolve the given URL to the article."
 }
\ No newline at end of file
diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index ae

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Always urlencode url parameter

2016-09-29 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Always urlencode url parameter
..

Always urlencode url parameter

Change-Id: I2d1069294775d809576d75b711ca724804ce80b7
---
M specials/SpecialElectronPdf.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/95/313395/1

diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index ae0cd95..17a7260 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -75,7 +75,7 @@
$electronPdfService["serviceUrl"] . '/' .
$electronPdfService["format"] .
'?accessKey=' . $electronPdfService["key"] .
-   '&url=' . $articleUrl;
+   '&url=' . urlencode( $articleUrl );
 
return $serviceUrl;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d1069294775d809576d75b711ca724804ce80b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Use Electron service for printable version

2016-09-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use Electron service for printable version
..

Use Electron service for printable version

This is replacing the link behind "printable version" with a link
to the PDF renedered by Electron service.
This is not yet working together with Collection extension since
this extension has another special handling for the
"printable version" link.

Bug: T146894
Change-Id: Ifbf9bc5af1cc95789fe545f473b8a71d8d5cca32
---
M ElectronPdfService.hooks.php
M extension.json
M i18n/en.json
M specials/SpecialElectronPdf.php
4 files changed, 29 insertions(+), 14 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/12/313212/1

diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
index bd45f34..e5ab240 100644
--- a/ElectronPdfService.hooks.php
+++ b/ElectronPdfService.hooks.php
@@ -25,18 +25,26 @@
[ 'articletitle' => 
$title->getPrefixedText() ]
)
];
-   } else {
-   $bar[ 'electronPdfService-sidebar-portlet-heading' ] = [
-   [
-   'text' => $skin->msg( 
'electronPdfService-sidebar-portlet-print-text' )->escaped(),
-   'id' => 'electron-print_pdf',
-   'href' => 
$specialPageTitle->getLocalURL(
-   [ 'articletitle' => 
$title->getPrefixedText() ]
-   )
-   ]
-   ];
}
 
return true;
}
+
+   public static function onBuildNavUrls( Skin $skin, &$navUrls ) {
+   $title = $skin->getTitle();
+   if ( is_null( $title ) || !$title->exists() ) {
+   return false;
+   }
+
+   $specialPageTitle = SpecialPage::getTitleFor( 'ElectronPdf' );
+
+   $navUrls['print'] = [
+   'text' => $skin->msg( 'printableversion' )->text(),
+   'href' => $specialPageTitle->getLocalURL(
+   [ 'articletitle' => $title->getPrefixedText() ]
+   )
+   ];
+
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 458bbcd..74a83b9 100644
--- a/extension.json
+++ b/extension.json
@@ -27,6 +27,9 @@
"Hooks": {
  "SidebarBeforeOutput": [
"ElectronPdfServiceHooks::onSidebarBeforeOutput"
+ ],
+ "SkinTemplateBuildNavUrlsNav_urlsAfterPermalink": [
+   "ElectronPdfServiceHooks::onBuildNavUrls"
  ]
},
"MessagesDirs": {
diff --git a/i18n/en.json b/i18n/en.json
index 932866e..3b6e556 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,11 +5,11 @@
]
},
"electronPdfService": "ElectronPdfService",
-   "electronPdfService-desc": "This is an extension for adding browser 
based PDF rendering support through Electron PDF service",
+   "electronPdfService-desc": "Adds browser based PDF rendering support 
through Electron PDF service",
"electronPdfService-sidebar-portlet-heading": "Print",
"electronPdfService-sidebar-portlet-print-text": "Print PDF",
-   "electronPdfService-invalid-article-title": "Invalid article",
-   "electronPdfService-invalid-article-text": "The specified page is not a 
valid article.",
-   "electronPdfService-article-notfound-title": "Article not found by 
service",
+   "electronPdfService-invalid-article-title": "Invalid page",
+   "electronPdfService-invalid-article-text": "The specified page is not 
valid.",
+   "electronPdfService-article-notfound-title": "Page not found by 
service",
"electronPdfService-article-notfound-text": "The service was not able 
to resolve the specified link."
 }
\ No newline at end of file
diff --git a/specials/SpecialElectronPdf.php b/specials/SpecialElectronPdf.php
index ae0cd95..187d976 100644
--- a/specials/SpecialElectronPdf.php
+++ b/specials/SpecialElectronPdf.php
@@ -90,4 +90,8 @@
fpassthru( $this->tempFile );
$this->getOutput()->disable();
}
+
+   protected function getGroupName() {
+   return 'pagetools';
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbf9bc5af1cc95789fe545f473b8a71d8d5cca32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

__

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Add fixed padding for scrollbar

2016-09-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add fixed padding for scrollbar
..

Add fixed padding for scrollbar

This is not very nice but the simplest I was able to come up with.

Bug: T144267
Change-Id: I959c8e6e7aa053f372455b1ec4ed5768a02d8b5d
---
M modules/ext.RevisionSlider.css
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/03/313203/1

diff --git a/modules/ext.RevisionSlider.css b/modules/ext.RevisionSlider.css
index 431d24c..16bae44 100644
--- a/modules/ext.RevisionSlider.css
+++ b/modules/ext.RevisionSlider.css
@@ -122,6 +122,10 @@
word-wrap: break-word;
 }
 
+.mw-revslider-revision-tooltip .oo-ui-popupWidget-body {
+   padding-right: 19px;
+}
+
 .mw-revslider-revision-tooltip .mw-revslider-change-positive {
color: #006400;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I959c8e6e7aa053f372455b1ec4ed5768a02d8b5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] labs...grrrit[master]: Add 2ColConflict and ElectronPdfService extensions

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add 2ColConflict and ElectronPdfService extensions
..

Add 2ColConflict and ElectronPdfService extensions

Should be reported to #wikimedia-de-tech channel

Change-Id: Ic44a726e0c09a27c4e4bb2ad7004b469bf484198
---
M config.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/tools/grrrit 
refs/changes/14/311414/1

diff --git a/config.yaml b/config.yaml
index 8e78dee..995ef8a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -169,6 +169,8 @@
 "#wikimedia-de-tech":
 analytics/wmde/.*:
 mediawiki/extensions/Cognate:
+mediawiki/extensions/2ColConflict:
+mediawiki/extensions/ElectronPdfService:
 mediawiki/extensions/RevisionSlider:
 "#wikimedia-multimedia":
 mediawiki/extensions/CommonsMetadata.*:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic44a726e0c09a27c4e4bb2ad7004b469bf484198
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/grrrit
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add ElectronPdfService extension to integration

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add ElectronPdfService extension to integration
..

Add ElectronPdfService extension to integration

Bug: T142201
Change-Id: Ic15bb921844c3171a7736400b14d228d1910d667
---
M zuul/layout.yaml
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/12/311412/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 57722c9..a1362b0 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3230,6 +3230,15 @@
 check:
   - jsonlint
 
+  - name: mediawiki/extensions/ElectronPdfService
+template:
+  - name: composer-test
+  - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
+
   - name: mediawiki/extensions/EmailCapture
 template:
   - name: extension-unittests-generic

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic15bb921844c3171a7736400b14d228d1910d667
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Create boilerplate extension for Electron PDF Service

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Create boilerplate extension for Electron PDF Service
..

Create boilerplate extension for Electron PDF Service

Bug: T142201
Change-Id: I0f0c9a02dfbbd5c2189d01f3de7fffc14be0c0b0
---
A .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A ElectronPdfService.hooks.php
A ElectronPdfService.php
A Gruntfile.js
A README.md
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A modules/ext.ElectronPdfService.css
A modules/ext.ElectronPdfService.init.js
A modules/ext.ElectronPdfService.js
A package.json
A phpcs.xml
17 files changed, 210 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService 
refs/changes/11/311411/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..51d4694
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.*.swp
+*~
+/.project
+/.idea
+/composer.lock
+/vendor
+/node_modules
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..04baa68
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,4 @@
+{
+   "preset": "wikimedia",
+   "excludeFiles": [ "node_modules/**", "vendor/**" ]
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..82eaa05
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules/**
+vendor/**
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..d43c482
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,20 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "es3": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Environment
+   "browser": true,
+
+   "globals": {
+   "mw": false,
+   "$": false
+   }
+}
diff --git a/ElectronPdfService.hooks.php b/ElectronPdfService.hooks.php
new file mode 100644
index 000..5b5e015
--- /dev/null
+++ b/ElectronPdfService.hooks.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for more details.'
+   );
+   return true;
+} else {
+   die( 'This version of the ElectronPdfService extension requires 
MediaWiki 1.25+' );
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..36b41e8
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,35 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '*.js',
+   'modules/**/*.js'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/README.md b/README.md
new file mode 100644
index 000..b526c4c
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+This is an extension for adding browser based PDF rendering support through 
Electron PDF service
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..98d41d9
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "fix": "phpcbf",
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ]
+   }
+}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..f0b675b
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,42 @@
+{
+   "name": "ElectronPdfService",
+   "version": "0.0.1",
+   "author": [
+   "WMDE"
+   ],
+   "url": "https://phabricator.wikimedia.org/T142201";,
+   "descriptionmsg": "electronPdfService-desc",
+   "license-name": "GPL-2.0+",
+   "type": "other",
+   "manifest_version": 1,
+   "AutoloadClasses": {
+   "TwoColConflictHooks": "ElectronPdfService.hooks.php"
+   },
+   "Hooks": {
+   "BeforeP

[MediaWiki-commits] [Gerrit] integration/config[master]: Add 2ColConflict extension to integration

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add 2ColConflict extension to integration
..

Add 2ColConflict extension to integration

Bug: T145411
Change-Id: I6c7b1c5ff6af747cdd46b3323278b48db9133cf8
---
M zuul/layout.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/08/311408/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 57722c9..da66083 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2474,6 +2474,14 @@
 
  MediaWiki extensions ##
 
+  - name: mediawiki/extensions/2ColConflict
+template:
+  - name: composer-test
+  - name: extension-unittests-generic
+  - name: npm
+check:
+  - jsonlint
+  - jshint
 
   - name: mediawiki/extensions/AbuseFilter
 template:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c7b1c5ff6af747cdd46b3323278b48db9133cf8
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...2ColConflict[master]: Create boilerplate extension for side-by-side edit merge screen

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Create boilerplate extension for side-by-side edit merge screen
..

Create boilerplate extension for side-by-side edit merge screen

Bug: T145411
Change-Id: I48d73cac96d469f5b82b5a7df8bd171cfe7252b8
---
A .gitignore
A .jscsrc
A .jshintignore
A .jshintrc
A Gruntfile.js
A README.md
A TwoColConflict.hooks.php
A TwoColConflict.php
A composer.json
A extension.json
A i18n/en.json
A i18n/qqq.json
A modules/ext.TwoColConflict.css
A modules/ext.TwoColConflict.init.js
A modules/ext.TwoColConflict.js
A package.json
A phpcs.xml
17 files changed, 210 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/2ColConflict 
refs/changes/04/311404/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..51d4694
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.*.swp
+*~
+/.project
+/.idea
+/composer.lock
+/vendor
+/node_modules
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 000..04baa68
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,4 @@
+{
+   "preset": "wikimedia",
+   "excludeFiles": [ "node_modules/**", "vendor/**" ]
+}
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..82eaa05
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules/**
+vendor/**
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..d43c482
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,20 @@
+{
+   // Enforcing
+   "bitwise": true,
+   "eqeqeq": true,
+   "es3": true,
+   "latedef": true,
+   "noarg": true,
+   "nonew": true,
+   "undef": true,
+   "unused": true,
+   "strict": false,
+
+   // Environment
+   "browser": true,
+
+   "globals": {
+   "mw": false,
+   "$": false
+   }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..36b41e8
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,35 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+   grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+   grunt.loadNpmTasks( 'grunt-jsonlint' );
+   grunt.loadNpmTasks( 'grunt-banana-checker' );
+   grunt.loadNpmTasks( 'grunt-jscs' );
+
+   grunt.initConfig( {
+   jshint: {
+   options: {
+   jshintrc: true
+   },
+   all: [
+   '*.js',
+   'modules/**/*.js'
+   ]
+   },
+   jscs: {
+   src: '<%= jshint.all %>'
+   },
+   banana: {
+   all: 'i18n/'
+   },
+   jsonlint: {
+   all: [
+   '**/*.json',
+   '!node_modules/**',
+   '!vendor/**'
+   ]
+   }
+   } );
+
+   grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] 
);
+   grunt.registerTask( 'default', 'test' );
+};
diff --git a/README.md b/README.md
new file mode 100644
index 000..33610e2
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+This extension provides a side-by-side edit merge screen for edit conflict 
resolution
diff --git a/TwoColConflict.hooks.php b/TwoColConflict.hooks.php
new file mode 100644
index 000..feac863
--- /dev/null
+++ b/TwoColConflict.hooks.php
@@ -0,0 +1,13 @@
+https://www.mediawiki.org/wiki/Extension_registration for more details.'
+   );
+   return true;
+} else {
+   die( 'This version of the 2ColConflict extension requires MediaWiki 
1.25+' );
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..98d41d9
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+   "require-dev": {
+   "jakub-onderka/php-parallel-lint": "0.9.2",
+   "mediawiki/mediawiki-codesniffer": "0.7.2"
+   },
+   "scripts": {
+   "fix": "phpcbf",
+   "test": [
+   "parallel-lint . --exclude vendor",
+   "phpcs -p -s"
+   ]
+   }
+}
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..ae7deb3
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,42 @@
+{
+   "name": "2ColConflict",
+   "version": "0.0.1",
+   "author": [
+   "WMDE"
+   ],
+   "url": "https://phabricator.wikimedia.org/T143823";,
+   "descriptionmsg": "twoColConflict-desc",
+   "license-name": "GPL-2.0+",
+   "type": "other",
+   "manifest_version": 1,
+   "AutoloadClasses": {
+   "TwoColConflictHooks": "TwoColConflict.hooks.php"
+   },
+   "Hooks": {
+   "BeforePageDisplay": [
+   "TwoColConf

[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer[master]: Remove redundant cast to snak

2016-09-19 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Remove redundant cast to snak
..


Remove redundant cast to snak

Change-Id: Ic6b277e7b614c2757338f66c0cf2ef76e5ac9c0b
---
M analyzer/src/main/java/org/wikidata/analyzer/Processor/BadDateProcessor.java
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, approved
  WMDE-leszek: Looks good to me, but someone else must approve



diff --git 
a/analyzer/src/main/java/org/wikidata/analyzer/Processor/BadDateProcessor.java 
b/analyzer/src/main/java/org/wikidata/analyzer/Processor/BadDateProcessor.java
index e0110e1..d7f24b4 100644
--- 
a/analyzer/src/main/java/org/wikidata/analyzer/Processor/BadDateProcessor.java
+++ 
b/analyzer/src/main/java/org/wikidata/analyzer/Processor/BadDateProcessor.java
@@ -67,7 +67,7 @@
 Statement statement = statements.next();
 Snak snak = statement.getClaim().getMainSnak();
 if (snak instanceof ValueSnak) {
-Value value = ((ValueSnak) snak).getValue();
+Value value = snak.getValue();
 if (value instanceof TimeValue) {
 TimeValue timeValue = (TimeValue) value;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic6b277e7b614c2757338f66c0cf2ef76e5ac9c0b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/toolkit-analyzer
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-leszek 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix empty references removal

2016-09-16 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Fix empty references removal
..


Fix empty references removal

Change-Id: I4d4c88f07b4ae06118c7c67e56711a63b7ea15e4
---
M view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
M view/resources/wikibase/view/ViewFactory.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.referenceview.tests.js
M view/tests/qunit/wikibase/view/ViewFactory.tests.js
4 files changed, 22 insertions(+), 7 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js 
b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
index d407806..a6e6f2d 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.referenceview.js
@@ -17,6 +17,7 @@
  * @param {Object} options
  * @param {wikibase.datamodel.Reference|null} options.value
  * @param {Function} options.getListItemAdapter
+ * @param {Function} options.removeCallback
  */
 /**
  * @event afterstartediting
@@ -72,16 +73,22 @@
 * @throws {Error} if a required option is not specified properly.
 */
_create: function() {
-   if ( !this.options.getListItemAdapter ) {
+   if ( !this.options.getListItemAdapter || 
!this.options.removeCallback ) {
throw new Error( 'Required option not specified 
properly' );
}
 
PARENT.prototype._create.call( this );
 
+   var self = this;
var listview;
this.$listview.listview( {
listItemAdapter: this.options.getListItemAdapter( 
function( snaklistview ) {
listview.removeItem( snaklistview.element );
+   if ( listview.items().length === 0 ) {
+   self.options.removeCallback();
+   } else {
+   self._trigger( 'change' );
+   }
} ),
value: this.options.value ? 
this.options.value.getSnaks().getGroupedSnakLists() : []
} );
diff --git a/view/resources/wikibase/view/ViewFactory.js 
b/view/resources/wikibase/view/ViewFactory.js
index 568e1c8..5cc13c1 100644
--- a/view/resources/wikibase/view/ViewFactory.js
+++ b/view/resources/wikibase/view/ViewFactory.js
@@ -475,7 +475,11 @@
 
SELF.prototype.getReferenceView = function( startEditingCallback, 
removeCallback, value, $dom ) {
var structureEditorFactory = this._structureEditorFactory;
-   var view = this._getView(
+   var view;
+   var doRemove = function() {
+   return removeCallback( view );
+   };
+   view = this._getView(
'referenceview',
$dom,
{
@@ -484,9 +488,10 @@
getListItemAdapter: 
this.getListItemAdapterForSnakListView.bind( this, startEditingCallback ),
getReferenceRemover: function( $dom ) {
return 
structureEditorFactory.getRemover( function() {
-   return 
startEditingCallback().then( function() { return removeCallback( view ); } );
+   return 
startEditingCallback().then( doRemove );
}, $dom );
-   }
+   },
+   removeCallback: doRemove
}
);
return view;
diff --git 
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.referenceview.tests.js 
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.referenceview.tests.js
index db8c673..b385def 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.referenceview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.referenceview.tests.js
@@ -45,7 +45,8 @@
},
getListItemAdapter: function() {
return listItemAdapter;
-   }
+   },
+   removeCallback: function() {}
}, options );
 
return $( '' )
diff --git a/view/tests/qunit/wikibase/view/ViewFactory.tests.js 
b/view/tests/qunit/wikibase/view/ViewFactory.tests.js
index fc4b148..e7f4b14 100644
--- a/view/tests/qunit/wikibase/view/ViewFactory.tests.js
+++ b/view/tests/qunit/wikibase/view/ViewFactory.tests.js
@@ -377,9 +377,11 @@
sinon.assert.calledWith(

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Adjust pin button tooltip

2016-09-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Adjust pin button tooltip
..

Adjust pin button tooltip

Bug: T145068
Change-Id: Ic675324fd4286123794647151afa12a5166f9cfe
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/98/310298/1

diff --git a/i18n/en.json b/i18n/en.json
index 6d41c9e..50e600e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -20,7 +20,7 @@
 "revisionslider-loading-failed": "The revision slider failed to load.",
 "revisionslider-toggle-title-expand": "Open revision slider",
 "revisionslider-toggle-title-collapse": "Collapse revision slider",
-"revisionslider-turn-on-auto-expand-title": "Automatically expand revision 
slider",
+"revisionslider-turn-on-auto-expand-title": "Always expand the revision 
slider",
 "revisionslider-turn-off-auto-expand-title": "Do not expand revision 
slider automatically",
 "revisionslider-arrow-tooltip-newer": "See newer revisions",
 "revisionslider-arrow-tooltip-older": "See older revisions",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic675324fd4286123794647151afa12a5166f9cfe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...RevisionSlider[master]: Expand Revision Slider when user sctivates pin button

2016-09-13 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Expand Revision Slider when user sctivates pin button
..

Expand Revision Slider when user sctivates pin button

Bug: T145068
Change-Id: I26bd6d3cbd2e0da6e3d537431a45ef8193906c40
---
M modules/ext.RevisionSlider.init.js
M tests/browser/features/autoexpand.feature
2 files changed, 14 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider 
refs/changes/97/310297/1

diff --git a/modules/ext.RevisionSlider.init.js 
b/modules/ext.RevisionSlider.init.js
index 371fb0d..f89776d 100644
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -8,6 +8,14 @@
toggleButton = OO.ui.ButtonWidget.static.infuse( $( 
'.mw-revslider-toggle-button' ) ),
/* jshint +W024 */
/* eslint-enable dot-notation */
+   expandAndIntitialize = function() {
+   $( '.mw-revslider-slider-wrapper' ).toggle(true);
+   expanded = true;
+   if ( !initialized ) {
+   initialize();
+   }
+   },
+
initialize = function () {
var startTime = mw.now(),
api = new mw.libs.revisionSlider.Api( 
mw.util.wikiScript( 'api' ) );
@@ -82,6 +90,7 @@
( new mw.Api() ).saveOption( 
'userjs-revslider-autoexpand', autoExpand ? '1' : '0' );
if ( autoExpand ) {
autoExpandButton.setTitle( mw.message( 
'revisionslider-turn-off-auto-expand-title' ).text() );
+   expandAndIntitialize();
mw.track( 
'counter.MediaWiki.RevisionSlider.event.autoexpand.on' );
} else {
autoExpandButton.setTitle( mw.message( 
'revisionslider-turn-on-auto-expand-title' ).text() );
@@ -94,24 +103,21 @@
}
 
if ( autoExpand ) {
-   initialize();
+   expandAndIntitialize();
}
 
toggleButton.connect( this, {
click: function () {
expanded = !expanded;
-   $( '.mw-revslider-slider-wrapper' ).toggle();
if ( expanded ) {
+   expandAndIntitialize();
toggleButton.setIcon( 'collapse' ).setTitle( 
mw.message( 'revisionslider-toggle-title-collapse' ).text() );
mw.track( 
'counter.MediaWiki.RevisionSlider.event.expand' );
} else {
+   $( '.mw-revslider-slider-wrapper' 
).toggle(false);
toggleButton.setIcon( 'expand' ).setTitle( 
mw.message( 'revisionslider-toggle-title-expand' ).text() );
mw.track( 
'counter.MediaWiki.RevisionSlider.event.collapse' );
}
-   if ( initialized ) {
-   return;
-   }
-   initialize();
}
} );
 }( mediaWiki, jQuery ) );
diff --git a/tests/browser/features/autoexpand.feature 
b/tests/browser/features/autoexpand.feature
index 96b7b63..b5932af 100644
--- a/tests/browser/features/autoexpand.feature
+++ b/tests/browser/features/autoexpand.feature
@@ -18,6 +18,8 @@
 And I click on the auto expand button
 And I wait for the setting to be saved
 Then The auto expand button should be on
+And RevisionSlider wrapper should be visible
+And The RevisionSlider has loaded
 Given I refresh the page
 And The auto expand button is visible
 Then The auto expand button should be on

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26bd6d3cbd2e0da6e3d537431a45ef8193906c40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use firefox for integration tests

2016-09-05 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Use firefox for integration tests
..

Use firefox for integration tests

Change-Id: Iaefca08c6b1fd157b05bea7efdeb5c66c818c4d0
---
M tests/browser/environments.yml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index c42232c..50e0d21 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -47,7 +47,7 @@
 integration:
   item_namespace: 'Item:'
   language_code: en
-  browser: chrome
+  browser: firefox
   user_factory: true
   # mediawiki_url: JENKINS WILL SET THIS
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaefca08c6b1fd157b05bea7efdeb5c66c818c4d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove job selenium-Wikidata

2016-09-01 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Remove job selenium-Wikidata
..

Remove job selenium-Wikidata

Bug: T144487
Change-Id: Ifb129e45a91d8dba264ac51ce14ec501bab2b5cd
---
M jjb/selenium.yaml
M zuul/layout.yaml
2 files changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/40/307940/1

diff --git a/jjb/selenium.yaml b/jjb/selenium.yaml
index 8584ed0..39c9d7c 100644
--- a/jjb/selenium.yaml
+++ b/jjb/selenium.yaml
@@ -127,14 +127,6 @@
  - 'selenium-{name}'
 
 - project:
-name: Wikidata
-recipients: qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de 
# @Tobi_WMDE_SW #wikidata
-repository: wikidata/browsertests
-
-jobs:
- - 'selenium-{name}'
-
-- project:
 name: WikiLove
 recipients: qa-ale...@lists.wikimedia.org sbis...@wikimedia.org # @SBisson
 repository: mediawiki/extensions/WikiLove
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 824dc3c..7b04878 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -8470,7 +8470,3 @@
   - name: wikidata/build-resources
 template:
   - name: npm
-
-  - name: wikidata/browsertests
-template:
-  - name: rake

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb129e45a91d8dba264ac51ce14ec501bab2b5cd
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Attempt to make reference test more stable

2016-09-01 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Attempt to make reference test more stable
..


Attempt to make reference test more stable

Bug: T144190
Change-Id: I2fc64e5a251d1520d9cc372caa468717fc99059b
---
M tests/browser/features/step_definitions/reference_steps.rb
M tests/browser/features/support/modules/reference_module.rb
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/features/step_definitions/reference_steps.rb 
b/tests/browser/features/step_definitions/reference_steps.rb
index 06df540..f5c5da2 100644
--- a/tests/browser/features/step_definitions/reference_steps.rb
+++ b/tests/browser/features/step_definitions/reference_steps.rb
@@ -24,7 +24,10 @@
 
 When /^I add the following reference snaks:$/ do |table|
   step 'I click the statement edit button'
-  on(ItemPage).add_reference_snaks(table.raw, @properties)
+  on(ItemPage) do |page|
+page.ajax_wait
+page.add_reference_snaks(table.raw, @properties)
+  end
   step 'I click the statement save button'
 end
 
diff --git a/tests/browser/features/support/modules/reference_module.rb 
b/tests/browser/features/support/modules/reference_module.rb
index 8a1d39a..532c45a 100644
--- a/tests/browser/features/support/modules/reference_module.rb
+++ b/tests/browser/features/support/modules/reference_module.rb
@@ -59,6 +59,7 @@
   end
   property_handle = snak[0]
   value = snak[1]
+  ajax_wait
   snak_entity_selector_input(index).when_visible.clear
   snak_entity_selector_input(index).send_keys 
properties[property_handle]['label']
   ajax_wait

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fc64e5a251d1520d9cc372caa468717fc99059b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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] mediawiki...Wikibase[master]: Attempt to make reference test more stable

2016-08-31 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Attempt to make reference test more stable
..

Attempt to make reference test more stable

Bug: T144190
Change-Id: I2fc64e5a251d1520d9cc372caa468717fc99059b
---
M tests/browser/features/step_definitions/reference_steps.rb
M tests/browser/features/support/modules/reference_module.rb
2 files changed, 5 insertions(+), 1 deletion(-)


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

diff --git a/tests/browser/features/step_definitions/reference_steps.rb 
b/tests/browser/features/step_definitions/reference_steps.rb
index 06df540..f5c5da2 100644
--- a/tests/browser/features/step_definitions/reference_steps.rb
+++ b/tests/browser/features/step_definitions/reference_steps.rb
@@ -24,7 +24,10 @@
 
 When /^I add the following reference snaks:$/ do |table|
   step 'I click the statement edit button'
-  on(ItemPage).add_reference_snaks(table.raw, @properties)
+  on(ItemPage) do |page|
+page.ajax_wait
+page.add_reference_snaks(table.raw, @properties)
+  end
   step 'I click the statement save button'
 end
 
diff --git a/tests/browser/features/support/modules/reference_module.rb 
b/tests/browser/features/support/modules/reference_module.rb
index 8a1d39a..532c45a 100644
--- a/tests/browser/features/support/modules/reference_module.rb
+++ b/tests/browser/features/support/modules/reference_module.rb
@@ -59,6 +59,7 @@
   end
   property_handle = snak[0]
   value = snak[1]
+  ajax_wait
   snak_entity_selector_input(index).when_visible.clear
   snak_entity_selector_input(index).send_keys 
properties[property_handle]['label']
   ajax_wait

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fc64e5a251d1520d9cc372caa468717fc99059b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [DNM] Revert "Remove browsertests that need to create proper...

2016-08-31 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [DNM] Revert "Remove browsertests that need to create 
properties from integration"
..

[DNM] Revert "Remove browsertests that need to create properties from 
integration"

This reverts commit a94fe6c634780cd203ea79287b61966bacfbfdae.

This should only be merged once bug T144247 is resolved.

Change-Id: I3097bba3d9135232672df2d6ea69a908838353af
---
M tests/browser/features/reference.feature
M tests/browser/features/statements_item.feature
M tests/browser/features/statements_rank.feature
M tests/browser/features/statements_time.feature
4 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/tests/browser/features/reference.feature 
b/tests/browser/features/reference.feature
index 4ec7064..776124b 100644
--- a/tests/browser/features/reference.feature
+++ b/tests/browser/features/reference.feature
@@ -119,7 +119,7 @@
 | click the statement save button |
 | press the RETURN key in the snak value input field |
 
-  @modify_entity
+  @integration @modify_entity
   Scenario: Add reference with multiple snaks
 Given I have the following properties with datatype:
 | stringprop1 | string |
diff --git a/tests/browser/features/statements_item.feature 
b/tests/browser/features/statements_item.feature
index c555411..8e2f65f 100644
--- a/tests/browser/features/statements_item.feature
+++ b/tests/browser/features/statements_item.feature
@@ -13,7 +13,7 @@
   And The copyright warning has been dismissed
   And Anonymous edit warnings are disabled
 
-  @modify_entity
+  @integration @modify_entity
   Scenario Outline: Adding a statement of type item
 Given I have the following properties with datatype:
   | itemprop | wikibase-item |
diff --git a/tests/browser/features/statements_rank.feature 
b/tests/browser/features/statements_rank.feature
index df1e908..8612fbf 100644
--- a/tests/browser/features/statements_rank.feature
+++ b/tests/browser/features/statements_rank.feature
@@ -60,7 +60,7 @@
   And Statement edit button for claim 1 in group 1 should be there
   And Claim value input element should not be there
 
-  @modify_entity
+  @integration @modify_entity
   Scenario: Change the rank, save and reload
 When I edit claim 1 in group 1
   And I click the rank selector of claim 1 in group 1
diff --git a/tests/browser/features/statements_time.feature 
b/tests/browser/features/statements_time.feature
index 52e5f8c..59547a8 100644
--- a/tests/browser/features/statements_time.feature
+++ b/tests/browser/features/statements_time.feature
@@ -74,7 +74,7 @@
 | 1 | 100 million years CE | Gregorian | hundred million years |
 | 10 BCE | 1 billion years BCE | Julian | billion years |
 
-  @modify_entity
+  @integration @modify_entity
   Scenario Outline: Adding a statement of type time
 Given I am logged in to the repo
   And I am on an item page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3097bba3d9135232672df2d6ea69a908838353af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove browsertests that need to create properties from inte...

2016-08-30 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Remove browsertests that need to create properties from 
integration
..

Remove browsertests that need to create properties from integration

Change-Id: Ie68577828ef376e4a4bde31e9d274d5eec86a4bf
---
M tests/browser/features/reference.feature
M tests/browser/features/statements_item.feature
M tests/browser/features/statements_rank.feature
M tests/browser/features/statements_time.feature
4 files changed, 4 insertions(+), 4 deletions(-)


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

diff --git a/tests/browser/features/reference.feature 
b/tests/browser/features/reference.feature
index 776124b..4ec7064 100644
--- a/tests/browser/features/reference.feature
+++ b/tests/browser/features/reference.feature
@@ -119,7 +119,7 @@
 | click the statement save button |
 | press the RETURN key in the snak value input field |
 
-  @integration @modify_entity
+  @modify_entity
   Scenario: Add reference with multiple snaks
 Given I have the following properties with datatype:
 | stringprop1 | string |
diff --git a/tests/browser/features/statements_item.feature 
b/tests/browser/features/statements_item.feature
index 8e2f65f..c555411 100644
--- a/tests/browser/features/statements_item.feature
+++ b/tests/browser/features/statements_item.feature
@@ -13,7 +13,7 @@
   And The copyright warning has been dismissed
   And Anonymous edit warnings are disabled
 
-  @integration @modify_entity
+  @modify_entity
   Scenario Outline: Adding a statement of type item
 Given I have the following properties with datatype:
   | itemprop | wikibase-item |
diff --git a/tests/browser/features/statements_rank.feature 
b/tests/browser/features/statements_rank.feature
index 8612fbf..df1e908 100644
--- a/tests/browser/features/statements_rank.feature
+++ b/tests/browser/features/statements_rank.feature
@@ -60,7 +60,7 @@
   And Statement edit button for claim 1 in group 1 should be there
   And Claim value input element should not be there
 
-  @integration @modify_entity
+  @modify_entity
   Scenario: Change the rank, save and reload
 When I edit claim 1 in group 1
   And I click the rank selector of claim 1 in group 1
diff --git a/tests/browser/features/statements_time.feature 
b/tests/browser/features/statements_time.feature
index 59547a8..52e5f8c 100644
--- a/tests/browser/features/statements_time.feature
+++ b/tests/browser/features/statements_time.feature
@@ -74,7 +74,7 @@
 | 1 | 100 million years CE | Gregorian | hundred million years |
 | 10 BCE | 1 billion years BCE | Julian | billion years |
 
-  @integration @modify_entity
+  @modify_entity
   Scenario Outline: Adding a statement of type time
 Given I am logged in to the repo
   And I am on an item page

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68577828ef376e4a4bde31e9d274d5eec86a4bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Using user factory for loggin in

2016-08-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Using user factory for loggin in
..


Using user factory for loggin in

Change-Id: Ie1bd00edf74e7c7c2115a986bf1bcf4f62dfea09
---
M tests/browser/environments.yml
M tests/browser/features/step_definitions/entity_steps.rb
M tests/browser/features/step_definitions/statement_steps.rb
M tests/browser/features/support/pages/property_page.rb
4 files changed, 26 insertions(+), 11 deletions(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index 3b28ccd..561afd1 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -33,6 +33,7 @@
   browser: firefox
   mediawiki_url: https://wikidata.beta.wmflabs.org/wiki/
   mediawiki_user: Selenium_user
+  user_factory: true
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
 test:
@@ -40,6 +41,7 @@
   browser: firefox
   mediawiki_url: https://test.wikidata.org/wiki/
   mediawiki_user: Selenium_user
+  user_factory: true
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
 integration:
diff --git a/tests/browser/features/step_definitions/entity_steps.rb 
b/tests/browser/features/step_definitions/entity_steps.rb
index aca9451..80ebf6a 100644
--- a/tests/browser/features/step_definitions/entity_steps.rb
+++ b/tests/browser/features/step_definitions/entity_steps.rb
@@ -7,7 +7,9 @@
 # basic steps for entities
 
 Given(/^I am logged in to the repo$/) do
-  visit(RepoLoginPage).login_with(ENV['MEDIAWIKI_USER'], 
ENV['MEDIAWIKI_PASSWORD'])
+  as_user(:b) do
+visit(RepoLoginPage).login_with(user(:b), password(:b))
+  end
 end
 
 Given(/^I am not logged in to the repo$/) do
@@ -73,7 +75,14 @@
 end
 
 Given(/^I have the following properties with datatype:$/) do |props|
-  @properties = visit(PropertyPage).create_properties(props)
+  property_data = on(PropertyPage).create_property_data(props)
+  wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
+
+  as_user(:b) do
+wb_api.log_in(user(:b), password(:b))
+  end
+
+  @properties = on(PropertyPage).create_properties(property_data, wb_api)
 end
 
 Given(/^I have the following items:$/) do |handles|
@@ -99,7 +108,11 @@
 
 Given(/^The following sitelinks do not exist:$/) do |sitelinks|
   wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-  wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
+
+  as_user(:b) do
+wb_api.log_in(user(:b), password(:b))
+  end
+
   sitelinks.raw.each do |sitelink|
 if wb_api.sitelink_exists?(sitelink[0], sitelink[1])
   wb_api.remove_sitelink({ site_id: sitelink[0], title: sitelink[1] }, 
sitelink[0])
diff --git a/tests/browser/features/step_definitions/statement_steps.rb 
b/tests/browser/features/step_definitions/statement_steps.rb
index 92a8fde..5000fe2 100644
--- a/tests/browser/features/step_definitions/statement_steps.rb
+++ b/tests/browser/features/step_definitions/statement_steps.rb
@@ -8,7 +8,11 @@
 
 When(/^I have statements with the following properties and values:$/) do 
|statements|
   wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-  wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
+
+  as_user(:b) do
+wb_api.log_in(user(:b), password(:b))
+  end
+
   statements.raw.each do |statement|
 property_handle = statement[0]
 value = on(ItemPage).get_string_snak_value(statement[1])
diff --git a/tests/browser/features/support/pages/property_page.rb 
b/tests/browser/features/support/pages/property_page.rb
index 2621dad..ebdb166 100644
--- a/tests/browser/features/support/pages/property_page.rb
+++ b/tests/browser/features/support/pages/property_page.rb
@@ -30,11 +30,8 @@
 property_data
   end
 
-  def create_property(data)
-wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
+  def create_property(data, wb_api)
 resp = wb_api.create_property(data)
-
 id = resp['entity']['id']
 
 if resp['entity']['labels'].length > 0 && resp['entity']['labels']['en']
@@ -54,11 +51,10 @@
 { 'id' => id, 'url' => url, 'label' => label_en, 'description' => 
description_en }
   end
 
-  def create_properties(props)
-property_data = create_property_data(props)
+  def create_properties(property_data, wb_api)
 properties = {}
 property_data.each do |handle, data|
-  property = create_property(data)
+  property = create_property(data, wb_api)
   properties[handle] = property
 end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1bd00edf74e7c7c2115a986bf1bcf4f62dfea09
Gerrit-PatchSet: 20
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritsc

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Update browser tests from most recent wikidata/browsertests

2016-08-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Update browser tests from most recent wikidata/browsertests
..


Update browser tests from most recent wikidata/browsertests

Change-Id: I95b109403643af63c9ec3c79dfb86e6ce2a6797a
---
M tests/browser/ci.yml
M tests/browser/environments.yml
M tests/browser/features/aliases.feature
M tests/browser/features/description.feature
M tests/browser/features/edit_tab.feature
M tests/browser/features/empty_label_and_description.feature
M tests/browser/features/header.feature
M tests/browser/features/label.feature
M tests/browser/features/non_existing_item.feature
M tests/browser/features/reference.feature
M tests/browser/features/sitelinks.feature
M tests/browser/features/sitelinks_badge.feature
M tests/browser/features/special_set_label.feature
M tests/browser/features/statement.feature
M tests/browser/features/statements_geo.feature
M tests/browser/features/statements_item.feature
M tests/browser/features/statements_monolingual.feature
M tests/browser/features/statements_quantity.feature
M tests/browser/features/statements_rank.feature
M tests/browser/features/statements_snaktype.feature
M tests/browser/features/statements_string.feature
M tests/browser/features/statements_time.feature
M tests/browser/features/statements_url.feature
M tests/browser/features/step_definitions/badges_steps.rb
M tests/browser/features/support/modules/entity_module.rb
25 files changed, 47 insertions(+), 97 deletions(-)

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



diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml
index 8c9865e..0902f17 100644
--- a/tests/browser/ci.yml
+++ b/tests/browser/ci.yml
@@ -3,6 +3,7 @@
 
 MEDIAWIKI_ENVIRONMENT:
   - beta
+  - test
 
 PLATFORM:
   - Linux
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index 9b6279a..3b28ccd 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -31,7 +31,7 @@
 beta:
   language_code: en
   browser: firefox
-  mediawiki_url: http://wikidata.beta.wmflabs.org/wiki/
+  mediawiki_url: https://wikidata.beta.wmflabs.org/wiki/
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
diff --git a/tests/browser/features/aliases.feature 
b/tests/browser/features/aliases.feature
index 9d05308..8a5f965 100644
--- a/tests/browser/features/aliases.feature
+++ b/tests/browser/features/aliases.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item aliases tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit aliases
 
   Background:
diff --git a/tests/browser/features/description.feature 
b/tests/browser/features/description.feature
index 7a92bd1..3f1893f 100644
--- a/tests/browser/features/description.feature
+++ b/tests/browser/features/description.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item description tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit description
 
   Background:
diff --git a/tests/browser/features/edit_tab.feature 
b/tests/browser/features/edit_tab.feature
index 0af982a..8c5ef3c 100644
--- a/tests/browser/features/edit_tab.feature
+++ b/tests/browser/features/edit_tab.feature
@@ -4,7 +4,7 @@
 #
 # feature the functionality of the edit tab function
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit tab
 
 Scenario: Edit tab
diff --git a/tests/browser/features/empty_label_and_description.feature 
b/tests/browser/features/empty_label_and_description.feature
index 99df8d6..2b700a0 100644
--- a/tests/browser/features/empty_label_and_description.feature
+++ b/tests/browser/features/empty_label_and_description.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item description tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Empty label and description behaviour
 
   Background:
diff --git a/tests/browser/features/header.feature 
b/tests/browser/features/header.feature
index 7f8a9ca..54e850e 100644
--- a/tests/browser/features/header.feature
+++ b/tests/browser/features/header.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item header tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: [WIP] Add certain tests to integration

2016-07-29 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [WIP] Add certain tests to integration
..

[WIP] Add certain tests to integration

Change-Id: I7c2c05d34400dfd87d697c1ab11361408f4cd4bd
---
M tests/browser/features/aliases.feature
M tests/browser/features/description.feature
M tests/browser/features/header.feature
M tests/browser/features/label.feature
M tests/browser/features/reference.feature
M tests/browser/features/sitelinks.feature
M tests/browser/features/special_set_label.feature
M tests/browser/features/statements_item.feature
M tests/browser/features/statements_rank.feature
9 files changed, 10 insertions(+), 10 deletions(-)


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

diff --git a/tests/browser/features/aliases.feature 
b/tests/browser/features/aliases.feature
index 9d05308..1cf0a6e 100644
--- a/tests/browser/features/aliases.feature
+++ b/tests/browser/features/aliases.feature
@@ -126,7 +126,7 @@
   And Header save button should not be there
   And Header cancel button should be there
 
-  @modify_entity @save_aliases
+  @integration @modify_entity @save_aliases
   Scenario: Edit multiple aliases
 When I click the header edit button
   And I enter "alias1", "alias2" as new aliases
diff --git a/tests/browser/features/description.feature 
b/tests/browser/features/description.feature
index 7a92bd1..f4e4b20 100644
--- a/tests/browser/features/description.feature
+++ b/tests/browser/features/description.feature
@@ -47,8 +47,8 @@
  | click the header save button |
  | press the RETURN key in the description input field |
 
-  @save_description @modify_entity
-  Scenario Outline: Save description
+  @integration @save_description @modify_entity
+  Scenario Outline: Save description and reload
 When I click the header edit button
   And I enter "MODIFIED DESCRIPTION" as description
   And I 
diff --git a/tests/browser/features/header.feature 
b/tests/browser/features/header.feature
index 7f8a9ca..bebe072 100644
--- a/tests/browser/features/header.feature
+++ b/tests/browser/features/header.feature
@@ -65,7 +65,7 @@
 | click the header cancel button |
 | press the ESC key in the label input field |
 
-  @modify_entity @save_description @save_aliases @save_label
+  @integration @modify_entity @save_description @save_aliases @save_label
   Scenario Outline: Save label, description and aliases
 When I click the header edit button
   And I enter random string as label
diff --git a/tests/browser/features/label.feature 
b/tests/browser/features/label.feature
index 8230c22..4196f2a 100644
--- a/tests/browser/features/label.feature
+++ b/tests/browser/features/label.feature
@@ -35,7 +35,7 @@
   | click the header cancel button |
   | press the ESC key in the label input field |
 
-  @modify_entity @save_label @smoke
+  @integration @modify_entity @save_label @smoke
   Scenario Outline: Save label
 When I click the header edit button
   And I enter "MODIFIED LABEL" as label
diff --git a/tests/browser/features/reference.feature 
b/tests/browser/features/reference.feature
index a67e562..4da4b13 100644
--- a/tests/browser/features/reference.feature
+++ b/tests/browser/features/reference.feature
@@ -118,7 +118,7 @@
 | click the statement save button |
 | press the RETURN key in the snak value input field |
 
-  @modify_entity
+  @integration @modify_entity
   Scenario: Add reference with multiple snaks
 Given I have the following properties with datatype:
 | stringprop1 | string |
diff --git a/tests/browser/features/sitelinks.feature 
b/tests/browser/features/sitelinks.feature
index 4a91301..bc6d50b 100644
--- a/tests/browser/features/sitelinks.feature
+++ b/tests/browser/features/sitelinks.feature
@@ -21,7 +21,7 @@
   And Sitelink counter should be there
   And There should be 0 sitelinks in the list
 
-  @ui_only
+  @integration @ui_only
   Scenario: Click edit button
 When I click the sitelink edit button
 Then Sitelink edit button should not be there
diff --git a/tests/browser/features/special_set_label.feature 
b/tests/browser/features/special_set_label.feature
index fb8ef08..b9e2cbc 100644
--- a/tests/browser/features/special_set_label.feature
+++ b/tests/browser/features/special_set_label.feature
@@ -39,7 +39,7 @@
   And I am on the page of item item1
 Then Something should be displayed as label having the ID of item1
 
-  @smoke
+  @integration @smoke
   Scenario: Edit an existing label
 Given I have the following items:
 | item1 |
diff --git a/tests/browser/features/statements_item.feature 
b/tests/browser/features/statements_item.feature
index cb6e413..4dcff92 100644
--- a/tests/browser/features/statements_item.feature
+++ b/tests/browser/features/statements_item.feature
@@ -13,7 +13,7 @@
   An

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Fix off-by-one error in badge tests

2016-07-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Fix off-by-one error in badge tests
..

Fix off-by-one error in badge tests

The tests should select the 1. and 2. badge from the badges list but was
using indexes 1 and 2 for accessing the badges array, so the test was
actually selecting the 2. and 3. badge from the list.

Change-Id: I6d458a7764402dc304197c26455ec483ddfabaac
---
M tests/browser/features/step_definitions/badges_steps.rb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/98/301598/1

diff --git a/tests/browser/features/step_definitions/badges_steps.rb 
b/tests/browser/features/step_definitions/badges_steps.rb
index 964bdc2..12facd5 100644
--- a/tests/browser/features/step_definitions/badges_steps.rb
+++ b/tests/browser/features/step_definitions/badges_steps.rb
@@ -8,11 +8,11 @@
 end
 
 When(/^I click the (\d). badge selector id item$/) do |num|
-  
on(ItemPage).badge_selector_list[@available_badges[num.to_i]].selector_id_link_element.when_visible.click
+  
on(ItemPage).badge_selector_list[@available_badges[num.to_i-1]].selector_id_link_element.when_visible.click
 end
 
 Then(/^The (\d+)\. badge id should be attached to the sitelink$/) do |num|
-  
expect(on(ItemPage).badge_list[@available_badges[num.to_i]].badge_element.when_visible).to
 be_visible
+  
expect(on(ItemPage).badge_list[@available_badges[num.to_i-1]].badge_element.when_visible).to
 be_visible
 end
 
 Then(/^Sitelink badge selector should be there$/) do

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d458a7764402dc304197c26455ec483ddfabaac
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: [DNM] Making reference browsertests more robust

2016-07-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [DNM] Making reference browsertests more robust
..

[DNM] Making reference browsertests more robust

Change-Id: Ib664f318e1bfc50936e0f3131658691b99c48368
---
M tests/browser/features/reference.feature
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/95/301595/1

diff --git a/tests/browser/features/reference.feature 
b/tests/browser/features/reference.feature
index a67e562..b87cea3 100644
--- a/tests/browser/features/reference.feature
+++ b/tests/browser/features/reference.feature
@@ -47,10 +47,11 @@
   And Snak entity selector input element should be there
   And Snak value input element should not be there
 
-  @ui_only
+  @integration @ui_only
   Scenario Outline: Cancel reference
 When I click the statement edit button
   And I click the reference add button
+  And I close the entity selector popup if present
   And I 
   And I click the statement edit button
 Then Reference add button should be there

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib664f318e1bfc50936e0f3131658691b99c48368
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add delete_item feature to integration

2016-07-28 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Add delete_item feature to integration
..

Add delete_item feature to integration

Change-Id: Ic3a36f7dd02bfa34bf2be6593098e83ea165de14
---
M tests/browser/features/delete_item.feature
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/tests/browser/features/delete_item.feature 
b/tests/browser/features/delete_item.feature
index 90379e1..de7b32f 100644
--- a/tests/browser/features/delete_item.feature
+++ b/tests/browser/features/delete_item.feature
@@ -4,7 +4,7 @@
 #
 # feature the delete of an item
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@integration @chrome @firefox @internet_explorer_10 @internet_explorer_11 
@local_config @wikidata.beta.wmflabs.org
 Feature: Delete item
 
 Scenario: Delete item

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3a36f7dd02bfa34bf2be6593098e83ea165de14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Run browsertests on test.wikidata.org

2016-07-27 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Run browsertests on test.wikidata.org
..

Run browsertests on test.wikidata.org

Change-Id: Ib53c9a39446fb00d366b9fb30bd1a04b5266fac6
---
M tests/browser/features/aliases.feature
M tests/browser/features/delete_item.feature
M tests/browser/features/description.feature
M tests/browser/features/edit_tab.feature
M tests/browser/features/empty_label_and_description.feature
M tests/browser/features/header.feature
M tests/browser/features/label.feature
M tests/browser/features/non_existing_item.feature
M tests/browser/features/reference.feature
M tests/browser/features/sitelinks.feature
M tests/browser/features/sitelinks_badge.feature
M tests/browser/features/special_set_label.feature
M tests/browser/features/statement.feature
M tests/browser/features/statements_geo.feature
M tests/browser/features/statements_item.feature
M tests/browser/features/statements_monolingual.feature
M tests/browser/features/statements_quantity.feature
M tests/browser/features/statements_rank.feature
M tests/browser/features/statements_snaktype.feature
M tests/browser/features/statements_string.feature
M tests/browser/features/statements_time.feature
M tests/browser/features/statements_url.feature
22 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/78/301378/1

diff --git a/tests/browser/features/aliases.feature 
b/tests/browser/features/aliases.feature
index 9d05308..8a5f965 100644
--- a/tests/browser/features/aliases.feature
+++ b/tests/browser/features/aliases.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item aliases tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit aliases
 
   Background:
diff --git a/tests/browser/features/delete_item.feature 
b/tests/browser/features/delete_item.feature
index 90379e1..bbcaea4 100644
--- a/tests/browser/features/delete_item.feature
+++ b/tests/browser/features/delete_item.feature
@@ -4,7 +4,7 @@
 #
 # feature the delete of an item
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Delete item
 
 Scenario: Delete item
diff --git a/tests/browser/features/description.feature 
b/tests/browser/features/description.feature
index 7a92bd1..3f1893f 100644
--- a/tests/browser/features/description.feature
+++ b/tests/browser/features/description.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item description tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit description
 
   Background:
diff --git a/tests/browser/features/edit_tab.feature 
b/tests/browser/features/edit_tab.feature
index 0af982a..8c5ef3c 100644
--- a/tests/browser/features/edit_tab.feature
+++ b/tests/browser/features/edit_tab.feature
@@ -4,7 +4,7 @@
 #
 # feature the functionality of the edit tab function
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Edit tab
 
 Scenario: Edit tab
diff --git a/tests/browser/features/empty_label_and_description.feature 
b/tests/browser/features/empty_label_and_description.feature
index 99df8d6..2b700a0 100644
--- a/tests/browser/features/empty_label_and_description.feature
+++ b/tests/browser/features/empty_label_and_description.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item description tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Empty label and description behaviour
 
   Background:
diff --git a/tests/browser/features/header.feature 
b/tests/browser/features/header.feature
index 7f8a9ca..54e850e 100644
--- a/tests/browser/features/header.feature
+++ b/tests/browser/features/header.feature
@@ -5,7 +5,7 @@
 #
 # feature definition for item header tests
 
-@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@wikidata.beta.wmflabs.org
+@chrome @firefox @internet_explorer_10 @internet_explorer_11 @local_config 
@test.wikidata.org @wikidata.beta.wmflabs.org
 Feature: Use header
 
   Background:
diff --git a/tests/browser/features/label.featur

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Do not fail tests when ajax_requests are stuck

2016-07-27 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Do not fail tests when ajax_requests are stuck
..

Do not fail tests when ajax_requests are stuck

Changing the timeout in ajax_wait to a "soft" timeout that does not let
the test fail if there is an ajax_request stuck.

Change-Id: Ia0411955afb70386dc31855fc1d753ac2c235ff1
---
M tests/browser/features/support/modules/entity_module.rb
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/76/301376/1

diff --git a/tests/browser/features/support/modules/entity_module.rb 
b/tests/browser/features/support/modules/entity_module.rb
index 6553c80..7d28ebb 100644
--- a/tests/browser/features/support/modules/entity_module.rb
+++ b/tests/browser/features/support/modules/entity_module.rb
@@ -112,8 +112,13 @@
   end
 
   def ajax_wait
-Timeout.timeout(5) do
-  sleep(1.0 / 3) while execute_script('return jQuery.active') != 0
+sleep_period = 0.25
+timeout_seconds = 2
+timeout_loops = (timeout_seconds / sleep_period).to_i
+
+while (execute_script('return jQuery.active') != 0 && timeout_loops > 0) do
+  sleep(sleep_period)
+  timeout_loops = timeout_loops - 1
 end
 sleep 1
 true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0411955afb70386dc31855fc1d753ac2c235ff1
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Load modules relative to file

2016-07-26 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Load modules relative to file
..

Load modules relative to file

This should work regardless from which directory the tests get called

Change-Id: I3052e78271dd93e53648501fd1e41aaf888f8fb4
---
M tests/browser/environments.yml
M tests/browser/features/support/env.rb
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/79/301079/1

diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index 9b6279a..2f1902b 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -38,7 +38,7 @@
 test:
   language_code: en
   browser: firefox
-  mediawiki_url: https://test.wikidata.org/wiki/
+  mediawiki_url: http://test.wikidata.org/wiki/
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index fd30239..269f002 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -34,9 +34,9 @@
 ENV['PROPERTY_ID_PREFIX'] = lenv.lookup(:property_id_prefix, default: -> { 'P' 
})
 ENV['LANGUAGE_CODE'] = lenv.lookup(:language_code, default: -> { 'en' })
 
-require_all 'tests/browser/features/support/modules'
-require_all 'tests/browser/features/support/pages'
-require_all 'tests/browser/features/support/utils'
+require_all File.dirname(__FILE__) + '/modules'
+require_all File.dirname(__FILE__) + '/pages'
+require_all File.dirname(__FILE__) + '/utils'
 
 PageObject.default_element_wait = 10 # increased to avoid fails on saucelabs
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3052e78271dd93e53648501fd1e41aaf888f8fb4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: [DNM] Run sitelink tests on test.wikidata.org

2016-07-25 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [DNM] Run sitelink tests on test.wikidata.org
..

[DNM] Run sitelink tests on test.wikidata.org

Change-Id: Id3f683c8b48f30579e95f55e7ae4b2e69a7f70f9
---
M tests/browser/features/label.feature
M tests/browser/features/sitelinks.feature
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/88/300888/1

diff --git a/tests/browser/features/label.feature 
b/tests/browser/features/label.feature
index fb82382..8230c22 100644
--- a/tests/browser/features/label.feature
+++ b/tests/browser/features/label.feature
@@ -35,7 +35,7 @@
   | click the header cancel button |
   | press the ESC key in the label input field |
 
-  @modify_entity @save_label @smoke @test.wikidata.org
+  @modify_entity @save_label @smoke
   Scenario Outline: Save label
 When I click the header edit button
   And I enter "MODIFIED LABEL" as label
diff --git a/tests/browser/features/sitelinks.feature 
b/tests/browser/features/sitelinks.feature
index 4a91301..eeca681 100644
--- a/tests/browser/features/sitelinks.feature
+++ b/tests/browser/features/sitelinks.feature
@@ -108,7 +108,7 @@
   | click the sitelink cancel button |
   | press the ESC key in the pagename input field |
 
-  @modify_entity @save_sitelink @smoke
+  @modify_entity @save_sitelink @smoke @test.wikidata.org
   Scenario Outline: Save sitelink
 Given The following sitelinks do not exist:
   | enwiki | Asia |

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3f683c8b48f30579e95f55e7ae4b2e69a7f70f9
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Avoid logging in when not necessary

2016-07-25 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Avoid logging in when not necessary
..

Avoid logging in when not necessary

Change-Id: Iaa673a7051fe5c97b5cf42f92ad9bdcc69067cd3
---
M tests/browser/features/step_definitions/entity_steps.rb
M tests/browser/features/support/pages/item_page.rb
2 files changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/85/300885/1

diff --git a/tests/browser/features/step_definitions/entity_steps.rb 
b/tests/browser/features/step_definitions/entity_steps.rb
index aca9451..b03fbce 100644
--- a/tests/browser/features/step_definitions/entity_steps.rb
+++ b/tests/browser/features/step_definitions/entity_steps.rb
@@ -99,7 +99,6 @@
 
 Given(/^The following sitelinks do not exist:$/) do |sitelinks|
   wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-  wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
   sitelinks.raw.each do |sitelink|
 if wb_api.sitelink_exists?(sitelink[0], sitelink[1])
   wb_api.remove_sitelink({ site_id: sitelink[0], title: sitelink[1] }, 
sitelink[0])
diff --git a/tests/browser/features/support/pages/item_page.rb 
b/tests/browser/features/support/pages/item_page.rb
index 528735d..4dc63e2 100644
--- a/tests/browser/features/support/pages/item_page.rb
+++ b/tests/browser/features/support/pages/item_page.rb
@@ -26,7 +26,6 @@
 
   def create_item(data)
 wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
 resp = wb_api.create_item(data)
 
 id = resp['entity']['id']

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa673a7051fe5c97b5cf42f92ad9bdcc69067cd3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] wikidata/browsertests[master]: Remove unused method from entity_module

2016-07-25 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Remove unused method from entity_module
..

Remove unused method from entity_module

Change-Id: I80a306736bdbbb6c42e461ee85688362b0a9ea81
---
M tests/browser/features/support/modules/entity_module.rb
1 file changed, 0 insertions(+), 57 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/browsertests 
refs/changes/76/300876/1

diff --git a/tests/browser/features/support/modules/entity_module.rb 
b/tests/browser/features/support/modules/entity_module.rb
index c2f71b5..6553c80 100644
--- a/tests/browser/features/support/modules/entity_module.rb
+++ b/tests/browser/features/support/modules/entity_module.rb
@@ -142,61 +142,4 @@
 cookie = "$.cookie( 'wikibase-no-anonymouseditwarning', '1', { 'expires': 
null, 'path': '/' } );"
 execute_script(cookie)
   end
-
-  # this method was moved from wikibase_api_module.rb since we are now using 
the mediawiki_api/wikidata gem for doing API requests
-  # this method is really ugly and should be refactored
-  def create_entity_and_properties(serialization)
-wb_api = MediawikiApi::Wikidata::WikidataClient.new URL.repo_api
-wb_api.log_in(ENV['MEDIAWIKI_USER'], ENV['MEDIAWIKI_PASSWORD'])
-
-serialization['properties'].each do |old_id, prop|
-  if prop['description'] && prop['description']['en']['value']
-search = prop['description']['en']['value']
-  else
-search = prop['labels']['en']['value']
-  end
-  resp = wb_api.search_entities(search, 'en', 'property')
-  resp['search'].reject! do |found_prop|
-found_prop['label'] != prop['labels']['en']['value']
-  end
-  if resp['search'][0]
-id = resp['search'][0]['id']
-  else
-saved_prop = wb_api.create_property(prop)
-id = saved_prop['id']
-  end
-
-  serialization['entity']['claims'].each do |claim|
-if claim['mainsnak']['property'] == old_id
-  claim['mainsnak']['property'] = id
-end
-if claim['qualifiers']
-  claim['qualifiers'].each do |qualifier|
-if qualifier['property'] == old_id
-  qualifier['property'] = id
-end
-  end
-end
-if claim['qualifiers-order']
-  claim['qualifiers-order'].map! do |p_id|
-p_id == old_id ? id : p_id
-  end
-end
-if claim['references']
-  claim['references'].each do |reference|
-reference['snaks'].each do |snak|
-  if snak['property'] == old_id
-snak['property'] = id
-  end
-end
-reference['snaks-order'].map! do |p_id|
-  p_id == old_id ? id : p_id
-end
-  end
-end
-  end
-end
-
-wb_api.create_item(serialization['entity'])
-  end
 end

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a306736bdbbb6c42e461ee85688362b0a9ea81
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/browsertests
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] Migration of browsertests* Jenkins jobs to selenium* jobs - change (mediawiki...Wikibase)

2016-05-25 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has submitted this change and it was merged.

Change subject: Migration of browsertests* Jenkins jobs to selenium* jobs
..


Migration of browsertests* Jenkins jobs to selenium* jobs

selenium* jobs are a new way of running Ruby based Selenium tests. The
jobs are triggered daily.

- Gemfile now specifies version of gems
- added Rake gem to Gemfile
- mediawiki_selenium gem updated to 1.7.0
- added selenium target from mediawiki_selenium 1.7.0 to Rakefile
- replaced WB_REPO_PASSWORD environment variable with MEDIAWIKI_PASSWORD
- fixed env.rb so it works with selenium Rake target

Bug: T128190
Change-Id: Ibb0e33e31099636c42facebaa5ae4a35ed580010
---
M Gemfile
M Gemfile.lock
M Rakefile
M tests/browser/environments.yml
M tests/browser/features/support/env.rb
5 files changed, 20 insertions(+), 14 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/Gemfile b/Gemfile
index 27b5a13..2f651b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,10 @@
 
 source 'https://rubygems.org'
 
-gem 'activesupport'
+gem 'activesupport', '~> 4.2', '>= 4.2.6'
 gem 'mediawiki_api-wikidata', '~> 0.2.0'
-gem 'mediawiki_selenium', '~> 1.6.5'
-gem 'parallel_tests'
-gem 'require_all'
-gem 'rubocop', require: false
+gem 'mediawiki_selenium', '~> 1.7'
+gem 'parallel_tests', '~> 2.5'
+gem 'rake', '~> 11.1', '>= 11.1.2'
+gem 'require_all', '~> 1.3', '>= 1.3.3'
+gem 'rubocop', '~> 0.40.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 94ec75f..13e0100 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,7 +43,7 @@
   faraday-cookie_jar (~> 0.0, >= 0.0.6)
 mediawiki_api-wikidata (0.2.0)
   mediawiki_api (~> 0.5.0)
-mediawiki_selenium (1.6.5)
+mediawiki_selenium (1.7.0)
   cucumber (~> 1.3, >= 1.3.20)
   headless (~> 2.0, >= 2.1.0)
   json (~> 1.8, >= 1.8.1)
@@ -73,6 +73,7 @@
   ast (~> 2.2)
 powerpack (0.1.1)
 rainbow (2.1.0)
+rake (11.1.2)
 require_all (1.3.3)
 rest-client (1.8.0)
   http-cookie (>= 1.0.2, < 2.0)
@@ -111,12 +112,13 @@
   ruby
 
 DEPENDENCIES
-  activesupport
+  activesupport (~> 4.2, >= 4.2.6)
   mediawiki_api-wikidata (~> 0.2.0)
-  mediawiki_selenium (~> 1.6.5)
-  parallel_tests
-  require_all
-  rubocop
+  mediawiki_selenium (~> 1.7)
+  parallel_tests (~> 2.5)
+  rake (~> 11.1, >= 11.1.2)
+  require_all (~> 1.3, >= 1.3.3)
+  rubocop (~> 0.40.0)
 
 BUNDLED WITH
1.12.3
diff --git a/Rakefile b/Rakefile
index 6eef121..2877bf6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,6 +8,9 @@
   task.options = ['-c', '.rubocop.yml']
 end
 
+require 'mediawiki_selenium/rake_task'
+MediawikiSelenium::RakeTask.new
+
 task default: [:test]
 
 desc 'Run all build/tests commands (CI entry point)'
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index db32c74..a9c3df4 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -14,14 +14,14 @@
 #   export MEDIAWIKI_USER=Selenium_user2
 #   bundle exec cucumber
 #
-mw-vagrant-host:
+mw-vagrant-host: &default
   language_code: en
   browser: firefox
   mediawiki_url: http://127.0.0.1:8080/wiki/
   mediawiki_user: Selenium_user
   mediawiki_password: vagrant
 
-mw-vagrant-guest: &default
+mw-vagrant-guest:
   language_code: en
   browser: firefox
   mediawiki_url: http://127.0.0.1/wiki/
diff --git a/tests/browser/features/support/env.rb 
b/tests/browser/features/support/env.rb
index 4a42f8f..059bb2b 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -41,7 +41,7 @@
 # TODO: remove once everything is migrated
 Before('@repo_login') do
   abort('WB_REPO_USERNAME environment variable is not defined! Please export a 
value for that variable before proceeding.') unless ENV['WB_REPO_USERNAME']
-  abort('WB_REPO_PASSWORD environment variable is not defined! Please export a 
value for that variable before proceeding.') unless ENV['WB_REPO_PASSWORD']
+  abort('MEDIAWIKI_PASSWORD environment variable is not defined! Please export 
a value for that variable before proceeding.') unless ENV['MEDIAWIKI_PASSWORD']
 end
 
 PageObject.default_element_wait = 10 # increased to avoid fails on saucelabs

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb0e33e31099636c42facebaa5ae4a35ed580010
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Adrian Heine 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
Media

[MediaWiki-commits] [Gerrit] [WIP] Add label.feature - change (mediawiki...Wikibase)

2016-05-23 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: [WIP] Add label.feature
..

[WIP] Add label.feature

Change-Id: I53351d9fc7219d095e2aa44fe4f31c18bbea103e
---
M tests/browser/environments.yml
A tests/browser/features/label.feature
M tests/browser/features/non_existing_item.feature
A tests/browser/features/step_definitions/aliases_steps.rb
A tests/browser/features/step_definitions/authority_control_gadget_steps.rb
A tests/browser/features/step_definitions/badges_steps.rb
A tests/browser/features/step_definitions/delete_item_steps.rb
A tests/browser/features/step_definitions/description_steps.rb
A tests/browser/features/step_definitions/edit_tab_steps.rb
A tests/browser/features/step_definitions/entity_selector_steps.rb
A tests/browser/features/step_definitions/entity_steps.rb
A tests/browser/features/step_definitions/header_steps.rb
A tests/browser/features/step_definitions/label_steps.rb
A tests/browser/features/step_definitions/property_steps.rb
A tests/browser/features/step_definitions/rank_selector_steps.rb
A tests/browser/features/step_definitions/reference_steps.rb
A tests/browser/features/step_definitions/sitelinks_steps.rb
A tests/browser/features/step_definitions/snaktype_selector_steps.rb
A tests/browser/features/step_definitions/special_modify_entity_steps.rb
A tests/browser/features/step_definitions/special_modify_term_steps.rb
A tests/browser/features/step_definitions/special_set_label_steps.rb
A tests/browser/features/step_definitions/statement_steps.rb
M tests/browser/features/support/env.rb
A tests/browser/features/support/modules/alias_module.rb
A tests/browser/features/support/modules/authority_control_gadget_module.rb
A tests/browser/features/support/modules/badge_selector_module.rb
A tests/browser/features/support/modules/entity_module.rb
A tests/browser/features/support/modules/entity_selector_module.rb
A tests/browser/features/support/modules/qualifiers_module.rb
A tests/browser/features/support/modules/rank_selector_module.rb
A tests/browser/features/support/modules/reference_module.rb
A tests/browser/features/support/modules/sitelink_module.rb
A tests/browser/features/support/modules/snaktype_selector_module.rb
A tests/browser/features/support/modules/statement_module.rb
A tests/browser/features/support/modules/uls_module.rb
A tests/browser/features/support/modules/url_module.rb
A tests/browser/features/support/pages/item_page.rb
A tests/browser/features/support/utils/utils.rb
38 files changed, 2,315 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/46/289846/3

diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index db32c74..262fe38 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -32,7 +32,7 @@
   language_code: en
   browser: firefox
   mediawiki_url: http://wikidata.beta.wmflabs.org/wiki/
-  mediawiki_user: Selenium_user
+  mediawiki_user: WikidataTester
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
 test:
diff --git a/tests/browser/features/label.feature 
b/tests/browser/features/label.feature
new file mode 100644
index 000..276f8b8
--- /dev/null
+++ b/tests/browser/features/label.feature
@@ -0,0 +1,85 @@
+# Wikidata UI tests
+#
+# Author:: Tobias Gritschacher (tobias.gritschac...@wikimedia.de)
+# License:: GNU GPL v2+
+#
+# feature definition for item label tests
+
+@chrome @firefox @integration @internet_explorer_10 @internet_explorer_11 
@local_config @wikidata.beta.wmflabs.org
+Feature: Edit label
+
+  Background:
+Given I am on an item page
+  And The copyright warning has been dismissed
+  And Anonymous edit warnings are disabled
+
+  @ui_only
+  Scenario: Modify the label
+When I click the header edit button
+  And I enter "MODIFIED LABEL" as label
+Then Header save button should be there
+  And Header cancel button should be there
+  And Header edit button should not be there
+
+  @ui_only
+  Scenario Outline: Cancel label
+When I click the header edit button
+  And I enter "MODIFIED LABEL" as label
+  And I 
+Then Original label should be displayed
+  And Header edit button should be there
+  And Header cancel button should not be there
+
+Examples:
+  | cancel |
+  | click the header cancel button |
+  | press the ESC key in the label input field |
+
+  @modify_entity @save_label @smoke
+  Scenario Outline: Save label
+When I click the header edit button
+  And I enter "MODIFIED LABEL" as label
+  And I 
+Then Header edit button should be there
+  And "MODIFIED LABEL" should be displayed as label
+
+Examples:
+  | save |
+  | click the header save button |
+  | press the RETURN key in the label input field |
+
+  @modify_entity @save_label
+  Scenario Outline: Save label and reload
+

[MediaWiki-commits] [Gerrit] Remove Adrian from list of notified persons (per request) - change (integration/config)

2015-04-21 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Remove Adrian from list of notified persons (per request)
..

Remove Adrian from list of notified persons (per request)

Adrian asked to be removed since he will not be working much for Wikimedia
in the next months. We'll re-add him later again.

Change-Id: I4701da9f5dfc16ad306db4aa5e8811b43b3ee26a
---
M jjb/browsertests.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/205561/1

diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index 2a68801..0ae3e30 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -39,7 +39,7 @@
 qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de 
christoph.fisc...@wikimedia.de
 
  - Wikidata-devs: &emails-Wikidata-devs
-adrian.l...@wikimedia.de katie.filb...@wikimedia.de 
qa-ale...@lists.wikimedia.org tobias.gritschac...@wikimedia.de 
christoph.fisc...@wikimedia.de
+katie.filb...@wikimedia.de qa-ale...@lists.wikimedia.org 
tobias.gritschac...@wikimedia.de christoph.fisc...@wikimedia.de
 
 # CentralAuth
 - project:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4701da9f5dfc16ad306db4aa5e8811b43b3ee26a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

[MediaWiki-commits] [Gerrit] Include ValueView version 0.14.0 - change (mediawiki...Wikibase)

2015-03-12 Thread Tobias Gritschacher (Code Review)

Tobias Gritschacher has uploaded a new change for review.

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

Change subject: Include ValueView version 0.14.0
..

Include ValueView version 0.14.0

Change-Id: Ide22e5ee8015cfd6795273748f9e2cba26eb03c8
---
M composer.json
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/composer.json b/composer.json
index 296bf2e..43825bb 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
"data-values/data-types": "~0.4.0",
"data-values/serialization": "~1.0",
"data-values/javascript": "~0.6.0",
-   "data-values/value-view": "~0.13.0",
+   "data-values/value-view": "~0.14.0",
 
"wikibase/data-model": "~2.5",
"wikibase/data-model-javascript": "~1.0",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide22e5ee8015cfd6795273748f9e2cba26eb03c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher 

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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1484 matches

Mail list logo