Commit Graph

126 Commits

Author SHA1 Message Date
Blade Barringer 49fd6b9f5c Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-15 14:59:57 -06:00
Blade Barringer 00055ad055 Merge branch 'develop' into api-v3 2015-11-15 14:57:41 -06:00
Blade Barringer a127bb8711 Switch to babel-core form babel.
Babel includes the CLI, which we don't need.
2015-11-15 08:59:57 -06:00
Blade Barringer 2e16bade2b Add lint task to test command. 2015-11-15 08:28:16 -06:00
Blade Barringer 5be9b88cc6 Add babel compiler to mocha.opts 2015-11-15 08:24:19 -06:00
Blade Barringer 6f11054994 Add trailing comma 2015-11-15 08:10:54 -06:00
Blade Barringer 351172d178 Correct common test command to compile with babel. 2015-11-14 21:52:59 -06:00
Matteo Pagliazzi 170a25c712 remove v2 utils where possible 2015-11-14 17:43:56 +01:00
Matteo Pagliazzi b315d10c79 migrate utils to v3, uprade nodemailer 2015-11-14 17:43:56 +01:00
Blade Barringer c3b4f03c35 Add linting for common files 2015-11-14 07:49:48 -06:00
Blade Barringer 7ec9687774 Add linting from api-v3 2015-11-14 07:40:05 -06:00
Matteo Pagliazzi 79c20105a1 use new logger where possible 2015-11-13 15:16:00 +01:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Blade Barringer 858bf99930 Move old logging lib v2 directory 2015-11-12 08:18:23 -06:00
Blade Barringer 7559f14f4d Remove coffee from files 2015-11-11 20:40:26 -06:00
Blade Barringer 25ae2e4252 Move browserify task to gulp 2015-11-11 20:32:17 -06:00
Matteo Pagliazzi 8864508482 rewrite server.js in es6 2015-11-11 11:58:15 +01:00
Matteo Pagliazzi 3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01:00
Blade Barringer d6764d4f37 Merge branch 'develop' into api-v3 2015-11-09 12:52:25 -06:00
Blade Barringer 6b7a757459 Run tests in sequence 2015-11-09 12:47:56 -06:00
Matteo Pagliazzi 5b3c460344 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-08 16:14:10 +01:00
Matteo Pagliazzi 4b60698527 migrate user model to new code style and es6 2015-11-08 16:11:55 +01:00
Blade Barringer 58cf34af9d Merge branch 'develop' into api-v3 2015-11-07 21:06:37 -06:00
Blade Barringer 88f8a2a375 Swap out gulp-clean for rimraf 2015-11-07 19:09:51 -06:00
Blade Barringer 320b7e4a93 Merge pull request #6196 from crookedneighbor/add_unit_test_helpers
Add unit test helpers
2015-11-07 09:50:15 -06:00
Matteo Pagliazzi 0834f8eeea disable api v2 and related tests to enable changes to models 2015-11-07 15:51:26 +01:00
Blade Barringer 303b88b6fa Adjust api tests 2015-11-06 21:28:19 -06:00
Blade Barringer 07df642f15 Add gulp tasks for v3 testing 2015-11-04 21:27:19 -06:00
Matteo Pagliazzi bea5fd6e59 add eslint task to tests 2015-11-04 18:58:50 +01:00
Matteo Pagliazzi 3135613be3 tweaks eslint rules, fixes gulp-eslint, adds some comments 2015-11-04 18:50:08 +01:00
Matteo Pagliazzi 235f1977ba finish .eslintrc file and update gulp task 2015-11-04 18:26:38 +01:00
Blade Barringer 6ed3ba36ae Refactor task helper for unit and integration tests. 2015-11-03 21:21:16 -06:00
Blade Barringer 0923077f2f Correct task. 2015-11-03 08:49:10 -06:00
Blade Barringer b71f1f7862 Extract mocha function into taskHelper 2015-11-03 08:41:16 -06:00
Blade Barringer 8c95de0835 Move api tests to v2 namespace 2015-11-03 08:31:20 -06:00
Matteo Pagliazzi ed0e4c6d20 Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
for the upcoming api v3

Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3

move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1

move api-v2 controllers in subdirectory

move unorganized files to /libs

fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app

fix require paths

fix require paths

fix require paths

put api v1 back

Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
Blade Barringer f13641b6a9 Add NODE_ENV to test server startup 2015-10-27 08:00:33 -05:00
Blade Barringer 829b1253fb Revert nodemon change for tests and log errors if they arise 2015-10-25 11:10:10 -05:00
Blade Barringer 7fe2a19bc5 Adjust start server task to use nodemon to recover from syntax errors 2015-10-25 09:54:09 -05:00
Blade Barringer 45afc9f3fb Only start up server in tests if it is not already running. 2015-10-25 09:19:42 -05:00
Blade Barringer e456bdb2ae Revert npm bin command 2015-10-23 17:35:45 -05:00
Blade Barringer 5481178dbe Move e2e tests higher up in test calls 2015-10-23 12:42:47 -05:00
Blade Barringer 6492554cf1 Add error handling for when mongo is not running. 2015-10-23 12:19:51 -05:00
Blade Barringer 3036c6db9e Merge branch 'develop' into new_api_test_infrastructure 2015-10-20 21:18:49 -05:00
Blade Barringer a0e7eef956 Fix legacy tests 2015-10-20 20:17:10 -05:00
Blade Barringer 23398b1a37 Closes #6071 2015-10-20 12:39:04 -05:00
Blade Barringer 1417d643e4 Comment out content test until we know for sure what we're doing with the content files 2015-10-18 10:14:54 -05:00
Blade Barringer 7f6b392511 Add gulp watch task for api tests 2015-10-17 19:17:23 -05:00
Blade Barringer 5d268c58de Adjust api test commands 2015-10-17 18:04:32 -05:00
Blade Barringer 02e9775ba7 Set up new api test structure 2015-10-17 12:37:17 -05:00