98 Commits

Author	SHA1	Message	Date
Victor Piousbox	2bb36b5e04	things are broken with nconf	2016-04-15 16:46:50 +00:00
Victor Piousbox	261a5a66b1	working on promisifying amazonPayments	2016-04-15 16:46:50 +00:00
Blade Barringer	887aa478ec	chore: merge in develop	2016-04-15 10:11:54 -05:00
Matteo Pagliazzi	70fd869934	Merge branch 'api-v3' into api-v3-adapt-v2	2016-04-08 12:03:50 +02:00
Victor Piousbox	14b0ec8b03	shared-code-webhooks	2016-04-04 16:31:48 +00:00
Matteo Pagliazzi	58c20c2a64	v2 port: enable integration tests, port register route	2016-04-04 17:16:57 +02:00
Matteo Pagliazzi	3db06c6537	Merge branch 'develop' into api-v3	2016-03-15 19:23:23 +01:00
Matteo Pagliazzi	490c6a9ae1	wip(shared): port sleep op	2016-03-15 16:33:44 +01:00
Blade Barringer	17d2efb822	refactor: Organize protractor setup	2016-03-13 16:41:57 -05:00
Matteo Pagliazzi	8e3284a4e3	wip(shared): adapt to v3	2016-03-13 22:26:32 +01:00
Blade Barringer	0b65292e4b	test: Update protractor to v3 and use mocha	2016-03-13 09:51:01 -05:00
Blade Barringer	4cd0428f0a	Merge branch 'develop' into api-v3	2016-03-04 12:16:22 -06:00
Blade Barringer	511b003ec5	Merge pull request #6811 from crookedneighbor/upgrade_babel ... chore: upgrade babel to v6	2016-03-04 08:36:08 -06:00
Blade Barringer	7f4beb747f	Merge branch 'develop' into api-v3	2016-03-03 21:24:54 -06:00
Blade Barringer	b61cfefc30	fix: fix issue where build would fail but exit as if oy passed	2016-03-03 21:05:06 -06:00
Blade Barringer	0406142e0e	chore: upgrade babel to v6	2016-03-02 21:36:27 -06:00
Matteo Pagliazzi	8920b05f9e	Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3	2016-03-02 12:59:51 +01:00
Blade Barringer	c96ddaeebe	refactor: Remove unused common script src files	2016-03-01 08:49:25 -06:00
Matteo Pagliazzi	0c700cc36d	Merge branch 'develop' into api-v3	2016-02-29 16:39:31 +01:00
Matt Harrington	46e13fecad	TEST_DB_URI env override	2016-02-25 00:08:24 +00:00
Matteo Pagliazzi	edaf3ef4db	fix typo: 1028->1024 bytes	2016-02-12 19:50:50 +01:00
Matteo Pagliazzi	599510aa78	higher maxBuffer for integration tests	2016-02-12 19:49:53 +01:00
Matteo Pagliazzi	0084a0d057	move tests to gulp tasks	2016-01-29 19:09:19 +01:00
Matteo Pagliazzi	e345fa76f5	failing unit test	2016-01-29 12:07:46 +01:00
Blade Barringer	32a2b3121e	Merge branch 'develop' into api-v3	2016-01-18 18:04:07 -06:00
Kristian Tashkov	5b740b1a11	Fix setting of environment variables in gulp test tasks in Windows ... See this stackoverflow link for why this is necessary http://stackoverflow.com/questions/27084392/code-coverage-for-mocha-in-windows-7/27193866#27193866	2016-01-18 16:55:15 -06:00
Blade Barringer	64c4f0f94a	Merge branch 'develop' into api-v3	2016-01-18 11:24:34 -06:00
Blade Barringer	79f2dc6b1a	tests: Update gulp task to use npm scripts	2016-01-18 11:10:22 -06:00
Matteo Pagliazzi	cc7bd1b5ac	disable server_side (api v2) tests for api v3	2015-12-16 11:17:56 +01:00
Matteo Pagliazzi	a46fa873a9	disable common tests for api v3	2015-12-16 11:16:30 +01:00
Blade Barringer	8196c65627	fix(api tests): Let api test script pass the correct api version for helper. ... (cherry picked from commit 2fa2e0f483)	2015-11-23 08:48:24 -06:00
Blade Barringer	1166601510	Merge branch 'develop' into api-v3	2015-11-21 09:37:34 -06:00
Blade Barringer	9a76e7a62c	chore(gulp): Add convience task for starting up a test server.	2015-11-21 09:33:29 -06:00
Blade Barringer	a64085828b	Correct path to api-v3 integration files in gulp test task.	2015-11-18 13:01:06 -06:00
Blade Barringer	e6a5d08150	Merge branch 'develop' into api-v3	2015-11-16 17:34:30 -06:00
Blade Barringer	8f9224c2ae	Adjust error handling for test task.	2015-11-16 12:23:09 -06:00
Blade Barringer	086e1da0e1	Merge branch 'develop' into api-v3	2015-11-16 12:04:42 -06:00
Blade Barringer	7a865b5c2a	Correct test output agregator	2015-11-16 12:04:09 -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	351172d178	Correct common test command to compile with babel.	2015-11-14 21:52:59 -06:00
Matteo Pagliazzi	8864508482	rewrite server.js in es6	2015-11-11 11:58:15 +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
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