From a6eaac24e3cacf19ffc50add2dd5b05ce7cafb2f Mon Sep 17 00:00:00 2001 From: Neil Kandalgaonkar Date: Mon, 10 Oct 2011 23:29:07 +0000 Subject: [PATCH] ensure tests for mw.Uri work in non-browser environments --- resources/mediawiki/mediawiki.Uri.js | 8 ++++---- tests/jasmine/spec/mediawiki.Uri.spec.js | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/mediawiki/mediawiki.Uri.js b/resources/mediawiki/mediawiki.Uri.js index 192837e39d..16a724aa47 100644 --- a/resources/mediawiki/mediawiki.Uri.js +++ b/resources/mediawiki/mediawiki.Uri.js @@ -275,9 +275,9 @@ return Uri; }; - // inject the current document location, for relative URLs - mw.Uri = mw.UriRelative( document.location.href ); - - + // if we are running in a browser, inject the current document location, for relative URLs + if ( document && document.location && document.location.href ) { + mw.Uri = mw.UriRelative( document.location.href ); + } } )( jQuery, mediaWiki ); diff --git a/tests/jasmine/spec/mediawiki.Uri.spec.js b/tests/jasmine/spec/mediawiki.Uri.spec.js index a21ba673ab..c8df13f64e 100644 --- a/tests/jasmine/spec/mediawiki.Uri.spec.js +++ b/tests/jasmine/spec/mediawiki.Uri.spec.js @@ -1,5 +1,10 @@ ( function() { + // ensure we have a generic URI parser if not running in a browser + if ( !mw.Uri ) { + mw.Uri = mw.UriRelative( 'http://sample.com/' ); + } + describe( "mw.Uri", function() { describe( "should work well in loose and strict mode", function() { -- 2.20.1