dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add Special:Randomrootpage (from RandomRootPage extension)"
[lhc/web/wiklou.git]
/
Gruntfile.js
diff --git
a/Gruntfile.js
b/Gruntfile.js
index
e1e5e4a
..
354f048
100644
(file)
--- a/
Gruntfile.js
+++ b/
Gruntfile.js
@@
-12,7
+12,7
@@
module.exports = function ( grunt ) {
wgScriptPath = process.env.MW_SCRIPT_PATH,
karmaProxy = {};
wgScriptPath = process.env.MW_SCRIPT_PATH,
karmaProxy = {};
- karmaProxy[
wgScriptPath
] = wgServer + wgScriptPath;
+ karmaProxy[
wgScriptPath
] = wgServer + wgScriptPath;
grunt.initConfig( {
jshint: {
grunt.initConfig( {
jshint: {
@@
-32,6
+32,9
@@
module.exports = function ( grunt ) {
]
},
banana: {
]
},
banana: {
+ options: {
+ disallowBlankTranslations: false
+ },
core: 'languages/i18n/',
api: 'includes/api/i18n/',
installer: 'includes/installer/i18n/'
core: 'languages/i18n/',
api: 'includes/api/i18n/',
installer: 'includes/installer/i18n/'
@@
-53,8
+56,9
@@
module.exports = function ( grunt ) {
included: true,
served: false
} ],
included: true,
served: false
} ],
+ logLevel: 'DEBUG',
frameworks: [ 'qunit' ],
frameworks: [ 'qunit' ],
- reporters: [ '
dot
s' ],
+ reporters: [ '
progres
s' ],
singleRun: true,
autoWatch: false,
// Some tests in extensions don't yield for more than the default 10s (T89075)
singleRun: true,
autoWatch: false,
// Some tests in extensions don't yield for more than the default 10s (T89075)
@@
-87,14
+91,14
@@
module.exports = function ( grunt ) {
}
if ( !process.env.MW_SCRIPT_PATH ) {
grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' +
}
if ( !process.env.MW_SCRIPT_PATH ) {
grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' +
- 'Set this like $wgScriptPath, e.g. "/w"');
+ 'Set this like $wgScriptPath, e.g. "/w"'
);
}
return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
} );
}
return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
} );
- grunt.registerTask( 'lint', [
'jshint', 'jscs', 'jsonlint', 'banana'
] );
+ grunt.registerTask( 'lint', [
'jshint', 'jscs', 'jsonlint', 'banana'
] );
grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
- grunt.registerTask( 'test', [
'lint'
] );
+ grunt.registerTask( 'test', [
'lint'
] );
grunt.registerTask( 'default', 'test' );
};
grunt.registerTask( 'default', 'test' );
};