krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

disable api v2 and related tests to enable changes to models

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-07 15:51:26 +01:00
parent b7fb9ec805
commit 0834f8eeea
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/dist/sprites/habitrpg-shared.css vendored
View File

File diff suppressed because one or more lines are too long

8
tasks/gulp-tests.js
View File

@@ -368,13 +368,13 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
gulp.task('test', [ gulp.task('test', [
'lint', 'lint',
'test:e2e:safe', //'test:e2e:safe',
'test:common:safe', 'test:common:safe',
// 'test:content:safe', // 'test:content:safe',
'test:server_side:safe', 'test:server_side:safe',
'test:karma:safe', //'test:karma:safe',
'test:api-legacy:safe', //'test:api-legacy:safe',
'test:api-v2:safe', //'test:api-v2:safe',
'test:api-v3:safe', 'test:api-v3:safe',
], () => { ], () => {
let totals = [0,0,0]; let totals = [0,0,0];

2
website/src/server.js
View File

@@ -108,6 +108,7 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
// Mount middlewares for the new app // Mount middlewares for the new app
require('./middlewares/api-v3/index')(newApp); require('./middlewares/api-v3/index')(newApp);
/* OLD APP IS DISABLED UNTIL COMPATIBLE WITH NEW MODELS
//require('./middlewares/apiThrottle')(oldApp); //require('./middlewares/apiThrottle')(oldApp);
oldApp.use(require('./middlewares/domain')(server,mongoose)); oldApp.use(require('./middlewares/domain')(server,mongoose));
if (!isProd && !DISABLE_LOGGING) oldApp.use(require('morgan')("dev")); if (!isProd && !DISABLE_LOGGING) oldApp.use(require('morgan')("dev"));
@@ -168,6 +169,7 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
oldApp.use(express['static'](publicDir)); oldApp.use(express['static'](publicDir));
oldApp.use(require('./middlewares/errorHandler')); oldApp.use(require('./middlewares/errorHandler'));
*/
server.on('request', app); server.on('request', app);
server.listen(app.get("port"), function() { server.listen(app.get("port"), function() {