Fix linting path for test files and make a pass

Change-Id: Iee023c901d6e87c6d23ce78a57c16c73d90e3efb
This commit is contained in:
Ed Sanders 2016-07-01 11:24:30 +01:00
parent 237c181c69
commit cdd4a6bd83
3 changed files with 16 additions and 17 deletions

View file

@ -13,7 +13,7 @@ module.exports = function ( grunt ) {
}, },
all: [ all: [
'*.js', '*.js',
'tests/*.js', 'tests/**/*.js',
'modules/**/*.js' 'modules/**/*.js'
] ]
}, },

View file

@ -5,22 +5,21 @@
QUnit.test( 'Initialize HelpDialog', function ( assert ) { QUnit.test( 'Initialize HelpDialog', function ( assert ) {
var helpDialog = new HelpDialog(), var helpDialog = new HelpDialog(),
windowManager = new OO.ui.WindowManager(), windowManager = new OO.ui.WindowManager();
dialogue = new HelpDialog();
function getSlideTextHtml( slide ) {
return slide.$element.find( '.mw-help-dialog-text' ).html();
}
$( 'body' ).append( windowManager.$element ); $( 'body' ).append( windowManager.$element );
windowManager.addWindows( [ helpDialog ] ); windowManager.addWindows( [ helpDialog ] );
assert.equal( helpDialog.slides.length, 4 ); assert.equal( helpDialog.slides.length, 4 );
assert.equal( helpDialog.slidePointer, 0 ); assert.equal( helpDialog.slidePointer, 0 );
assert.equal( getSlideTextHtml( helpDialog.slides[0] ), mw.message( 'revisionslider-help-dialog-slide1' ).parse() ); assert.equal( getSlideTextHtml( helpDialog.slides[ 0 ] ), mw.message( 'revisionslider-help-dialog-slide1' ).parse() );
assert.equal( getSlideTextHtml( helpDialog.slides[1] ), mw.message( 'revisionslider-help-dialog-slide2' ).parse() ); assert.equal( getSlideTextHtml( helpDialog.slides[ 1 ] ), mw.message( 'revisionslider-help-dialog-slide2' ).parse() );
assert.equal( getSlideTextHtml( helpDialog.slides[2] ), mw.message( 'revisionslider-help-dialog-slide3' ).parse() ); assert.equal( getSlideTextHtml( helpDialog.slides[ 2 ] ), mw.message( 'revisionslider-help-dialog-slide3' ).parse() );
assert.equal( getSlideTextHtml( helpDialog.slides[3] ), mw.message( 'revisionslider-help-dialog-slide4' ).parse() ); assert.equal( getSlideTextHtml( helpDialog.slides[ 3 ] ), mw.message( 'revisionslider-help-dialog-slide4' ).parse() );
} ); } );
function getSlideTextHtml( slide ) {
return slide.$element.find( '.mw-help-dialog-text' ).html();
}
} )( mediaWiki ); } )( mediaWiki );

View file

@ -18,12 +18,12 @@
$revisionDivs = $resultHtml.find( '.mw-revision' ); $revisionDivs = $resultHtml.find( '.mw-revision' );
assert.equal( $revisionWrapperDivs.length, 3 ); assert.equal( $revisionWrapperDivs.length, 3 );
assert.equal( $( $revisionDivs[0] ).attr( 'data-revid' ), 1 ); assert.equal( $( $revisionDivs[ 0 ] ).attr( 'data-revid' ), 1 );
assert.equal( $( $revisionDivs[2] ).attr( 'data-revid' ), 37 ); assert.equal( $( $revisionDivs[ 2 ] ).attr( 'data-revid' ), 37 );
assert.equal( $( $revisionDivs[1] ).css( 'width' ), '11px' ); assert.equal( $( $revisionDivs[ 1 ] ).css( 'width' ), '11px' );
assert.equal( $( $revisionDivs[1] ).css( 'height' ), '70px' ); // max relative size assert.equal( $( $revisionDivs[ 1 ] ).css( 'height' ), '70px' ); // max relative size
assert.ok( $( $revisionDivs[1] ).hasClass( 'mw-revision-up' ) ); assert.ok( $( $revisionDivs[ 1 ] ).hasClass( 'mw-revision-up' ) );
assert.ok( $( $revisionDivs[2] ).hasClass( 'mw-revision-down' ) ); assert.ok( $( $revisionDivs[ 2 ] ).hasClass( 'mw-revision-down' ) );
} ); } );
QUnit.test( 'tool tip is composed correctly', function ( assert ) { QUnit.test( 'tool tip is composed correctly', function ( assert ) {