From 57f5e6bf200bc1bf7df108cbfc2bb1846aea4242 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Thu, 8 Jan 2015 20:33:47 +0000 Subject: [PATCH] tests: Move npm-test to repo root This is way overdue as it isn't experimental anymore. Keeping it in a non-standard subdirectory makes it harder to discover for people. And makes it harder to run from Jenkins since this is already being ran on every commit. Related to 70f3919. Change-Id: Iaf5cf65616f82640145fbb6395c36129428602ca --- tests/frontend/Gruntfile.js => Gruntfile.js | 10 ++-------- tests/frontend/package.json => package.json | 0 2 files changed, 2 insertions(+), 8 deletions(-) rename tests/frontend/Gruntfile.js => Gruntfile.js (94%) rename tests/frontend/package.json => package.json (100%) diff --git a/tests/frontend/Gruntfile.js b/Gruntfile.js similarity index 94% rename from tests/frontend/Gruntfile.js rename to Gruntfile.js index fd89e56bfe..9cf89d0827 100644 --- a/tests/frontend/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,3 @@ -/*! - * Grunt file - */ - /*jshint node:true */ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-contrib-jshint' ); @@ -11,13 +7,11 @@ module.exports = function ( grunt ) { grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.loadNpmTasks( 'grunt-karma' ); - grunt.file.setBase( __dirname + '/../..' ); - var wgServer = process.env.MW_SERVER, wgScriptPath = process.env.MW_SCRIPT_PATH; grunt.initConfig( { - pkg: grunt.file.readJSON( __dirname + '/package.json' ), + pkg: grunt.file.readJSON( 'package.json' ), jshint: { options: { jshintrc: true @@ -49,7 +43,7 @@ module.exports = function ( grunt ) { all: [ '.jscsrc', '{languages,maintenance,resources}/**/*.json', - 'tests/frontend/package.json' + 'package.json' ] }, banana: { diff --git a/tests/frontend/package.json b/package.json similarity index 100% rename from tests/frontend/package.json rename to package.json -- 2.20.1