Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2015-11-15 14:57:41 -06:00
44 changed files with 4862 additions and 5894 deletions

View File

@@ -18,11 +18,11 @@ let server;
const TEST_DB_URI = `mongodb://localhost/${TEST_DB}`
const API_V2_TEST_COMMAND = 'mocha test/api/v2 --recursive --compilers js:babel/register';
const API_V3_TEST_COMMAND = 'mocha test/api/v3 --recursive --compilers js:babel/register';
const API_V2_TEST_COMMAND = 'mocha test/api/v2 --recursive';
const API_V3_TEST_COMMAND = 'mocha test/api/v3 --recursive';
const LEGACY_API_TEST_COMMAND = 'mocha test/api-legacy';
const COMMON_TEST_COMMAND = 'mocha test/common --compilers coffee:coffee-script';
const CONTENT_TEST_COMMAND = 'mocha test/content --compilers js:babel/register';
const COMMON_TEST_COMMAND = 'mocha test/common';
const CONTENT_TEST_COMMAND = 'mocha test/content';
const CONTENT_OPTIONS = {maxBuffer: 1024 * 500};
const KARMA_TEST_COMMAND = 'karma start';
const SERVER_SIDE_TEST_COMMAND = 'mocha test/server_side';