10 commits

Author	SHA1	Message	Date
Scott Erickson	bb38c58903	Properly fix duplicate course instances ... * Add script to merge existing course instances * Have client only send one course instance creation * Have server return existing course instance if one for the given classroom/course exists * Remove bandaid code from ClassroomView	2016-02-08 12:48:29 -08:00
Scott Erickson	51408a94de	Update jasmine for server tests to 2.4.1, fix server focus tests ... Before if you focused tests, they would bypass the setup "tests" and break. Now the server setup logic is in a beforeEach.	2016-01-19 16:34:48 -08:00
Matt Lott	d2921f66cb	Add approved teacher trials to mail news group	2016-01-17 07:39:30 -08:00
Nick Winter	67f7ce1e0d	Add Brazil coupon test. Generalize prices in subscription test a bit more. Handle brazil_basic_subscription product in one more place.	2016-01-12 12:25:13 -08:00
Matt Lott	d74b61fd96	Update approved trial request server test	2016-01-07 16:14:33 -08:00
Scott Erickson	8ddf36ce3c	Reenable prepaid test "bunch of people trying to redeem at once"	2015-12-18 10:45:36 -08:00
Scott Erickson	def3e9a009	Improve travis success rate ... https://travis-ci.org/codecombat/codecombat/builds/96076589 Failures: 1) Recalculate Achievements remove earned achievements Message: Expected 1 to be 0. Stack: Error: Expected 1 to be 0. ... Apparently EarnedAchievement creation from previous tests bleeds into this test case. Adding a timeout to minimize the race condition problem here.	2015-12-18 10:40:37 -08:00
Scott Erickson	a28e7bde2c	Update tests for db products, some cleanup	2015-12-16 16:39:44 -08:00
Scott Erickson	7c516c4d9f	Move product information to the db	2015-12-14 11:10:50 -08:00
Scott Erickson	23e3821e24	Switch from jasmine-node to jasmine, run server tests on a single process ... This collapses the difference between master and single-process-server-tests, to remove some larger fixtures files that were in that feature branch.	2015-12-09 14:27:10 -08:00