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

Change subject: New Wikidata Build - 22/02/2014 10:00
......................................................................


New Wikidata Build - 22/02/2014 10:00

Change-Id: I45a752b5947ef315dae32f2f8b281aadb2f4e781
---
M composer.lock
M 
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/wikibase.js
M 
extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
M extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
M extensions/Wikibase/repo/includes/view/TermBoxView.php
M extensions/Wikibase/repo/resources/Resources.php
M extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
M extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
M extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
M 
extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
M extensions/Wikibase/tests/browser/features/support/env.rb
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
16 files changed, 132 insertions(+), 76 deletions(-)

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



diff --git a/composer.lock b/composer.lock
index e5d146c..227ad5e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -850,12 +850,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "67527c788112d3700d0d11a9a7b9cc7c1716024b"
+                "reference": "d6fd3692c2f03bc5435390846df923638432b006"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67527c788112d3700d0d11a9a7b9cc7c1716024b";,
-                "reference": "67527c788112d3700d0d11a9a7b9cc7c1716024b",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d6fd3692c2f03bc5435390846df923638432b006";,
+                "reference": "d6fd3692c2f03bc5435390846df923638432b006",
                 "shasum": ""
             },
             "require": {
@@ -914,7 +914,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2014-02-20 21:07:52"
+            "time": "2014-02-21 23:04:40"
         }
     ],
     "packages-dev": [
diff --git 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index be8c318..a8b6201 100644
--- 
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ 
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -96,7 +96,7 @@
                                //       between toolbars should be managed via 
the toolbar controller.
                                var originToolbars = null;
                                if ( options ) {
-                                       if ( typeof options.exclusive === 
'boolean' && !options.exclusive ) {
+                                       if ( options.exclusive === false ) {
                                                originToolbars = findToolbars( 
$( origin ) );
                                        } else if ( typeof options.exclusive 
=== 'string' ) {
                                                originToolbars = $( origin 
).find( options.exclusive );
@@ -142,21 +142,32 @@
                        ] );
                } )
                .on( 'referenceviewafterstartediting', function( event ) {
-                       $( wb ).trigger(
-                               'startItemPageEditMode',
-                               [ event.target, { exclusive: false, 
wbCopyrightWarningGravity: 'sw' } ]
-                       );
+                       $( wb ).trigger( 'startItemPageEditMode', [
+                               event.target,
+                               {
+                                       exclusive: false,
+                                       wbCopyrightWarningGravity: 'sw'
+                               }
+                       ] );
                } )
                .on( 'snakviewstopediting', function( event, dropValue ) {
                        // snak view got already removed from the DOM on 
"snakviewafterstopediting"
                        if ( dropValue ) {
-                               $( wb ).trigger( 'stopItemPageEditMode', 
[event.target] );
+                               // Return true on dropValue === false as well 
as dropValue === undefined
+                               $( wb ).trigger( 'stopItemPageEditMode', [
+                                       event.target,
+                                       { save: dropValue !== true }
+                               ] );
                        }
                } )
                .on( 'statementviewafterstopediting claimlistviewafterremove '
                                + 'referenceviewafterstopediting 
statementviewafterremove',
-                       function( event ) {
-                               $( wb ).trigger( 'stopItemPageEditMode', 
[event.target] );
+                       function( event, dropValue ) {
+                               // Return true on dropValue === false as well 
as dropValue === undefined
+                               $( wb ).trigger( 'stopItemPageEditMode', [
+                                       event.target,
+                                       { save: dropValue !== true }
+                               ] );
                        }
                );
        }
diff --git a/extensions/Wikibase/lib/resources/wikibase.js 
b/extensions/Wikibase/lib/resources/wikibase.js
index 2a9db29..aca13a4 100644
--- a/extensions/Wikibase/lib/resources/wikibase.js
+++ b/extensions/Wikibase/lib/resources/wikibase.js
@@ -16,33 +16,38 @@
  *       bubble through the DOM anyhow, so everyone can listen to those on any 
level of a pages DOM.
  *
  * @event startItemPageEditMode: Triggered when any edit mode on the item page 
is started
- *        (1) {jQuery.Event}
+ *        (1) {jQuery.Event} event
  *        (2) {wb.ui.PropertyEditTool.EditableValue|jQuery} origin Object 
which triggered the event.
  *            If the origin of the event is one of the new (jQuery.wikibase) 
widgets, then this will
  *            be the widget's DOM node.
+ *        (3) {Object} options An object with any of the following properties:
+ *            {boolean|string} exclusive Whether action shall influence 
sub-toolbars of origin.
+ *            {string} wbCopyrightWarningGravity Direction, defaults to "nw".
  *
  * @event newItemCreated: Triggered after an item has been created and the 
necessary API request has
  *        returned.
- *        (1) {jQuery.Event}
+ *        (1) {jQuery.Event} event
  *        (2) {Object} item The new item returned by the API request. | FIXME: 
this should be an
  *            'Item' object!
  *
  * @event stopItemPageEditMode: Triggered when any edit mode on the item page 
is stopped.
- *        (1) {jQuery.Event}
+ *        (1) {jQuery.Event} event
  *        (2) {wb.ui.PropertyEditTool.EditableValue|jQuery} origin Object 
which triggered the event.
  *            If the origin of the event is one of the new (jQuery.wikibase) 
widgets, then this will
  *            be the widget's DOM node.
- *        (3) {Boolean} wasPending Whether value was a previously not 
existent/new value that has
- *            just been added
+ *        (3) {Object} options An object with any of the following properties:
+ *            {boolean} save Whether the change got saved or canceled and 
dropped. Defaults to true.
+ *            {boolean} wasPending Whether value was a previously not 
existent/new value that has
+ *            just been added. Defaults to false.
  *
  * @event restrictEntityPageActions: Triggered when editing is not allowed for 
the user.
  *        (see TODO/FIXME in wikibase.ui.entityViewInit - handle edit 
restrictions)
- *        (1) {jQuery.Event}
+ *        (1) {jQuery.Event} event
  *
  * @event blockEntityPageActions: Triggered when editing is not allowed for 
the user because he is
  *        blocked from the page.
  *        (see TODO/FIXME in wikibase.ui.entityViewInit - handle edit 
restrictions)
- *        (1) {jQuery.Event}
+ *        (1) {jQuery.Event} event
  */
 this.wikibase = this.wb = new ( function Wb( mw, $ ) {
        'use strict';
diff --git 
a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
 
b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
index d66981f..ae621bf 100644
--- 
a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
+++ 
b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.js
@@ -242,7 +242,7 @@
                $( this._toolbar.$editGroup )
                .on( 'toolbareditgroupedit', function( event, callback ) {
                        // The default event would trigger toolbar edit mode as 
well, but startEditing()
-                       // requires that the mode has been changed already in 
order to detect wheter to trigger
+                       // requires that the mode has been changed already in 
order to detect whether to trigger
                        // a startItemPageEditMode event. This refers to 
initially having one or more empty
                        // values whose edit modes are started instantly when 
loading the page.
                        // (see this.startEditing())
@@ -340,7 +340,9 @@
 
                var degrade = $.proxy( function() {
                        if( !this.preserveEmptyForm ) {
-                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this, this.isPending() ] );
+                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this,
+                                       { wasPending: this.isPending() }
+                               ] );
                                // remove value totally
                                this.destroy();
                                this._subject.empty().remove();
@@ -441,7 +443,7 @@
                 * are started instantly when loading the page
                 */
                if ( !this._toolbar.isDisabled() ) {
-                       $( wb ).triggerHandler( 'startItemPageEditMode', this );
+                       $( wb ).triggerHandler( 'startItemPageEditMode', [ this 
] );
                }
 
                return promise;
@@ -470,7 +472,9 @@
                                promise = this.remove(); // not yet existing 
value, no state to go back to -> do not trigger 'afterStopEditing' here!
                        } else { // cancel...
                                this._resetToolbar( promise.promisor.apiAction 
);
-                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this, this.isPending() ] );
+                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this,
+                                       { save: save, wasPending: 
this.isPending() }
+                               ] );
                                return promise;
                        }
                } else {
@@ -493,7 +497,9 @@
                                        this._resetToolbar( 
promise.promisor.apiAction );
                                }
 
-                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this, wasPending ] );
+                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this,
+                                       { wasPending: wasPending }
+                               ] );
                        }, this )
                );
 
@@ -632,7 +638,9 @@
                                 * re-enable all actions when removing fails 
since it is just using edit mode for
                                 * disabling all actions while the remove 
action is being processed
                                 */
-                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ self, self.isPending() ] );
+                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ self,
+                                       { save: false, wasPending: 
self.isPending() }
+                               ] );
                        }
 
                        var editGroup = self._toolbar.$editGroup.data( 
'toolbareditgroup' ),
@@ -949,12 +957,12 @@
                 */
                if ( disableSave && disableCancel && this.preserveEmptyForm ) {
                        if ( this._propagateInterfaceEvents || this.isNew() ) {
-                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this, false ] );
+                               $( wb ).triggerHandler( 'stopItemPageEditMode', 
[ this, { wasPending: false } ] );
                        }
                        this._propagateInterfaceEvents = true;
                } else if ( this.isNew() ) {
                        if ( this._propagateInterfaceEvents ) {
-                               $( wb ).triggerHandler( 
'startItemPageEditMode', this );
+                               $( wb ).triggerHandler( 
'startItemPageEditMode', [ this ] );
                                this._propagateInterfaceEvents = false;
                        }
                }
diff --git a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js 
b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
index 8df9117..03a23b2 100644
--- a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
+++ b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.js
@@ -108,9 +108,11 @@
                        }
                )
                // re-enabling all actions then stopping an edit mode
-               .on( 'stopItemPageEditMode', function( event, origin ) {
-                       self.enable();
-               } )
+               .on( 'stopItemPageEditMode',
+                       function( event, origin ) {
+                               self.enable();
+                       }
+               )
                /**
                 * highlight whole PropertyEditTool context if there may no 
additionally EditableValues be
                 * added (in that case, PropertyEditTool is a container for a 
fixed set of EditableValues
@@ -124,12 +126,11 @@
                        }
                )
                .on( 'stopItemPageEditMode',
-                       function( event, origin, wasPending ) {
+                       function( event, origin, options ) {
                                subject.removeClass( self.UI_CLASS + 
'-ineditmode wb-edit' );
                                if(
                                        self.getOption( 'allowsMultipleValues' )
-                                       && wasPending !== undefined
-                                       && wasPending
+                                       && options && options.wasPending
                                        && self.hasValue( origin )
                                ) {
                                        // Focus "add" button after adding a 
value to a multi-value property to
diff --git a/extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php 
b/extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
index b1e67cd..87432fa 100644
--- a/extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php
@@ -65,9 +65,6 @@
                $this->assertEquals( $moveData['user'], $params['user'] );
        }
 
-       /**
-        * @group WikibaseRepoTest
-        */
        public function testGetSummary() {
                if ( !defined( 'WB_VERSION' ) ) {
                        $this->markTestSkipped( 'Wikibase\Summary is only 
available on repo' );
diff --git a/extensions/Wikibase/repo/includes/view/TermBoxView.php 
b/extensions/Wikibase/repo/includes/view/TermBoxView.php
index 19f307e..1f13260 100644
--- a/extensions/Wikibase/repo/includes/view/TermBoxView.php
+++ b/extensions/Wikibase/repo/includes/view/TermBoxView.php
@@ -94,7 +94,7 @@
                                
$this->sectionEditLinkGenerator->getHtmlForEditSection( $editDescriptionLink, 
$this->msg( 'wikibase-edit' ), 'span', $editable ),
                                $label !== false ? '' : 'wb-value-empty',
                                $description !== false ? '' : 'wb-value-empty',
-                               $title->getLocalURL() . '?setlang=' . $language
+                               $title->getLocalURL( array( 'setlang' => 
$language ) )
                        );
                }
 
diff --git a/extensions/Wikibase/repo/resources/Resources.php 
b/extensions/Wikibase/repo/resources/Resources.php
index 2c50082..d67d170 100644
--- a/extensions/Wikibase/repo/resources/Resources.php
+++ b/extensions/Wikibase/repo/resources/Resources.php
@@ -37,6 +37,7 @@
                                'wikibase.ui.scrapeFormattedValues',
                        ),
                        'messages' => array(
+                               'pagetitle',
                                'wikibase-statements',
                                'wikibase-copyrighttooltip-acknowledge',
                                'wikibase-anonymouseditwarning',
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js 
b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
index 5133e09..3ffbb4f 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entityViewInit.js
@@ -34,22 +34,23 @@
                // add an edit tool for the main label. This will be integrated 
into the heading nicely:
                if ( $( '.wb-firstHeading' ).length ) { // Special pages do not 
have a custom wb heading
                        var labelEditTool = new wb.ui.LabelEditTool( $( 
'.wb-firstHeading' )[0] ),
-                               editableLabel = labelEditTool.getValues( true 
)[0]; // [0] will always be set
+                               editableLabel = labelEditTool.getValues( true 
)[0], // [0] will always be set
+                               fn = function( event, origin ) {
+                                       // Limit the global 
stopItemPageEditMode event to that element
+                                       if ( event.type !== 
'stopItemPageEditMode' || origin === editableLabel ) {
+                                               var title = 
editableLabel.isEmpty()
+                                                       ? mw.config.get( 
'wgTitle' )
+                                                       : 
editableLabel.getValue()[0];
 
-                       // make sure we update the 'title' tag of the page when 
label changes
-                       editableLabel.on( 'afterStopEditing', function() {
-                               var value;
+                                               // update 'title' tag
+                                               $( 'title' ).text( mw.msg( 
'pagetitle', title ) );
+                                       }
+                               };
 
-                               if( editableLabel.isEmpty() ) {
-                                       value = mw.config.get( 'wgTitle' );
-                               } else {
-                                       value = editableLabel.getValue()[0];
-                               }
-                               value += ' - ' + mw.config.get( 'wgSiteName' );
-
-                               // update 'title' tag
-                               $( 'html title' ).text( value );
-                       } );
+                       editableLabel.getSubject().on( 'eachchange', fn );
+                       // Can't use afterStopEditing because it does not fire 
on cancel
+                       // but this is needed to reset the title
+                       $( wb ).on( 'stopItemPageEditMode', fn );
                }
 
                // add an edit tool for all properties in the data view:
@@ -108,8 +109,8 @@
                                value: wb.entity
                        } ).appendTo( $claimsParent );
 
-                       // add 'wb-claim' id to entity page's Claims heading:
-                       $( '.wb-claimlist' )
+                       // This is here to be sure there is never a duplicate id
+                       $( '.wb-claimgrouplistview' )
                                .prev( '.wb-section-heading' )
                                .first()
                                .attr( 'id', 'claims' );
@@ -233,9 +234,7 @@
                                                text: mw.msg( 
'wikibase-copyrighttooltip-acknowledge' )
                                        } ).appendTo( $message );
 
-                               var gravity = ( options && 
options.wbCopyrightWarningGravity )
-                                       ? options.wbCopyrightWarningGravity
-                                       : 'nw';
+                               var gravity = ( options && 
options.wbCopyrightWarningGravity ) || 'nw';
 
                                // Tooltip gets its own anchor since other 
elements might have their own tooltip.
                                // we don't even have to add this new toolbar 
element to the toolbar, we only use it
@@ -277,7 +276,7 @@
                                $messageAnchor.data( 'wbtooltip' ).show();
 
                                // destroy tooltip after edit mode gets closed 
again:
-                               $( wb ).one( 'stopItemPageEditMode', function( 
event ) {
+                               $( wb ).one( 'stopItemPageEditMode', function( 
event, origin ) {
                                        if( $messageAnchor.data( 'wbtooltip' ) 
!== undefined ) {
                                                $messageAnchor.data( 
'wbtooltip' ).degrade( true );
                                        }
@@ -285,6 +284,42 @@
                        }
                } );
 
+               // Check if the watch link (star in the Vector skin) needs to 
be updated after an edit
+               $( wb ).on( 'stopItemPageEditMode', function( event, origin, 
options ) {
+                       // If save is undefined it should default to true
+                       var canceled = options && options.save === false;
+                       var updateWatchLink = mw.page && mw.page.watch ? 
mw.page.watch.updateWatchLink : null;
+
+                       // Skip if module isn't loaded or user doesn't have 
"watch by default" enabled anyway
+                       if ( canceled || !updateWatchLink || 
!mw.user.options.get( 'watchdefault' ) ) {
+                               return;
+                       }
+
+                       // All four supported skins are using the same ID, the 
other selectors
+                       // in mediawiki.page.watch.ajax.js are undocumented and 
probably legacy stuff
+                       var $link = $( '#ca-watch a' );
+
+                       // Skip if page is already watched and there is no 
"watch this page" link
+                       // Note: The exposed function fails for empty jQuery 
collections
+                       if ( $link.length ) {
+                               updateWatchLink( $link, 'watch', 'loading' );
+                               var api = new mw.Api();
+                               var pageid = mw.config.get( 'wgArticleId' );
+                               api.get( {
+                                       'action': 'query',
+                                       'prop': 'info',
+                                       'inprop': 'watched',
+                                       'pageids': pageid
+                               } ).done( function( data ) {
+                                       var watched = data.query && 
data.query.pages[pageid] &&
+                                               
data.query.pages[pageid].watched !== undefined;
+                                       updateWatchLink( $link, watched ? 
'unwatch' : 'watch' );
+                               } ).fail( function() {
+                                       updateWatchLink( $link, 'watch' );
+                               } );
+                       }
+               } );
+
                // remove loading spinner after JavaScript has kicked in
                $( '.wb-entity' ).fadeTo( 0, 1 );
                $( '.wb-entity-spinner' ).remove();
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js 
b/extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
index 34073f0..dfd1e04 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.initTermBox.js
@@ -50,7 +50,7 @@
                } );
 
                $( wb )
-               .on( 'startItemPageEditMode', function( event, origin, options 
) {
+               .on( 'startItemPageEditMode', function( event, origin ) {
                        // disable language terms table's editable value or 
mark it as the active one if it is
                        // the one being edited by the user and therefore the 
origin of the event
                        $.each( termsValueTools, function( i, termValueTool ) {
@@ -64,7 +64,7 @@
                                }
                        } );
                } )
-               .on( 'stopItemPageEditMode', function( event ) {
+               .on( 'stopItemPageEditMode', function( event, origin ) {
                        $( 'table.wb-terms' ).removeClass( 'wb-edit' );
                        $.each( termsValueTools, function( i, termValueTool ) {
                                termValueTool.enable();
@@ -150,4 +150,4 @@
        }
 
 
-} )( jQuery, mediaWiki, wikibase );
\ No newline at end of file
+} )( jQuery, mediaWiki, wikibase );
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php 
b/extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
index f02820f..39d65e4 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/DiffOpValueFormatterTest.php
@@ -8,7 +8,7 @@
  * @covers Wikibase\DiffOpValueFormatter
  *
  * @group Wikibase
- * @group WikibaseLib
+ * @group WikibaseRepo
  * @group WikibaseClaim
  *
  * @licence GNU GPL v2+
diff --git 
a/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
 
b/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
index f6f26ca..4db598f 100644
--- 
a/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
+++ 
b/extensions/Wikibase/repo/tests/phpunit/includes/store/sql/SqlEntityInfoBuilderTest.php
@@ -15,7 +15,7 @@
  * @since 0.4
  *
  * @group Wikibase
- * @group WikibaseLib
+ * @group WikibaseRepo
  * @group WikibaseStore
  * @group WikibasePropertyInfo
  * @group Database
@@ -32,10 +32,6 @@
 
        public function setUp() {
                parent::setUp();
-
-               if ( !defined( 'WB_VERSION' ) ) {
-                       $this->markTestSkipped( "Skipping because 
WikibaseClient doesn't have local wb_terms and wb_property_info tables." );
-               }
 
                $this->tablesUsed[] = 'wb_property_info';
                $this->tablesUsed[] = 'wb_terms';
diff --git a/extensions/Wikibase/tests/browser/features/support/env.rb 
b/extensions/Wikibase/tests/browser/features/support/env.rb
index 7aa538b..c5a24ea 100644
--- a/extensions/Wikibase/tests/browser/features/support/env.rb
+++ b/extensions/Wikibase/tests/browser/features/support/env.rb
@@ -44,6 +44,7 @@
     profile = Selenium::WebDriver::Firefox::Profile.new
     if timeout
       profile["dom.max_script_run_time"] = timeout
+      profile["dom.max_chrome_script_run_time"] = timeout
     end
     profile['intl.accept_languages'] = language
     caps = Selenium::WebDriver::Remote::Capabilities.firefox(:firefox_profile 
=> profile)
@@ -82,6 +83,7 @@
          timeout = ENV["BROWSER_TIMEOUT"].to_i
          client.timeout = timeout
     profile["dom.max_script_run_time"] = timeout
+    profile["dom.max_chrome_script_run_time"] = timeout
        end
 
   if language == "default"
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 7011ea8..3cb90e0 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit23b8f733e595a9fd4cf231da137f85d3::getLoader();
+return ComposerAutoloaderInit6546bdc8539d684d58a0322ff5c9c696::getLoader();
diff --git a/vendor/composer/autoload_real.php 
b/vendor/composer/autoload_real.php
index 59c7fdc..638b6d4 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit23b8f733e595a9fd4cf231da137f85d3
+class ComposerAutoloaderInit6546bdc8539d684d58a0322ff5c9c696
 {
     private static $loader;
 
@@ -19,9 +19,9 @@
             return self::$loader;
         }
 
-        
spl_autoload_register(array('ComposerAutoloaderInit23b8f733e595a9fd4cf231da137f85d3',
 'loadClassLoader'), true, true);
+        
spl_autoload_register(array('ComposerAutoloaderInit6546bdc8539d684d58a0322ff5c9c696',
 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        
spl_autoload_unregister(array('ComposerAutoloaderInit23b8f733e595a9fd4cf231da137f85d3',
 'loadClassLoader'));
+        
spl_autoload_unregister(array('ComposerAutoloaderInit6546bdc8539d684d58a0322ff5c9c696',
 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequire23b8f733e595a9fd4cf231da137f85d3($file);
+            composerRequire6546bdc8539d684d58a0322ff5c9c696($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire23b8f733e595a9fd4cf231da137f85d3($file)
+function composerRequire6546bdc8539d684d58a0322ff5c9c696($file)
 {
     require $file;
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 85b9bdf..0abd810 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -877,12 +877,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "67527c788112d3700d0d11a9a7b9cc7c1716024b"
+            "reference": "d6fd3692c2f03bc5435390846df923638432b006"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/67527c788112d3700d0d11a9a7b9cc7c1716024b";,
-            "reference": "67527c788112d3700d0d11a9a7b9cc7c1716024b",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/d6fd3692c2f03bc5435390846df923638432b006";,
+            "reference": "d6fd3692c2f03bc5435390846df923638432b006",
             "shasum": ""
         },
         "require": {
@@ -901,7 +901,7 @@
             "wikibase/data-model": "0.6.*",
             "wikibase/easyrdf_lite": "*"
         },
-        "time": "2014-02-20 21:07:52",
+        "time": "2014-02-21 23:04:40",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45a752b5947ef315dae32f2f8b281aadb2f4e781
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: wikidata-servi...@wikimedia.de
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to