Commit Graph

448 Commits

Author SHA1 Message Date
Robert Richter
a505eaaa5d Create Model tables in the database 2015-03-17 21:08:11 -05:00
Robert Richter
cb589702d1 Push around dependencies so I can work on Windows 2015-03-17 20:09:47 -05:00
Robert Richter
9ca8bc62cb Ignore name-validation tests, pending their deletion 2015-03-17 20:08:49 -05:00
Robert Richter
13677e8985 Add caching and multithreading to speed up Travis build 2015-03-16 17:27:22 -05:00
Robert Richter
b5668aa1a9 Revert "Comment out some validations for import"
This reverts commit 90ee3cc136.
2015-03-16 17:19:27 -05:00
Andrew Brown
78305d4166 Temporarily disable S3 map uploading until bucket bug is fixed 2015-03-16 02:59:39 -05:00
Andrew Brown
6602d8bb26 Log out users with the old style of cookies 2015-03-16 02:53:41 -05:00
Andrew Brown
b717fddf54 Fix possible merge conflict from prod 2015-03-16 07:40:27 +00:00
Andrew Brown
7da462c666 Remove gemfiles lib 2015-03-16 07:40:14 +00:00
Andrew Brown
b9dcbc4265 Switch from json to hybrid cookie signing/parsing 2015-03-16 02:43:40 -05:00
Andrew Brown
cea24d8416 Hopefully fix migration json parse 500 2015-03-16 02:40:31 -05:00
Andrew Brown
63084f00fd Merge branch 'master' of https://github.com/drusepth/Indent 2015-03-16 02:26:30 -05:00
Andrew Brown
bbdf921dcb Merge pull request #410 from drusepth/sqlrails4
Merge SQLite + Rails 4 into master!
2015-03-16 02:26:17 -05:00
Andrew Brown
51caaa56cc Add field tests pointed out didn't export 2015-03-16 02:26:00 -05:00
Andrew Brown
3283337406 Tweak migration schema to match current fields 2015-03-16 02:18:32 -05:00
Andrew Brown
90ee3cc136 Comment out some validations for import 2015-03-16 00:50:11 -05:00
Andrew Brown
97dca04ec1 Fix the rest of the broken tests #410 2015-03-14 01:54:42 -05:00
Andrew Brown
c2497d5123 Fix non-anon users sometimes seeing anon banner #366 2015-03-14 01:31:47 -05:00
Andrew Brown
50944c3727 Fix some tests 2015-03-14 01:29:17 -05:00
Andrew Brown
6138dc86c8 Fix design problems #410 2015-03-13 23:59:59 -05:00
Andrew Brown
3fd6d604fe Revert "Revert "Resolve merge with master""
This reverts commit 6f8ae925ba.

Conflicts:
	app/assets/stylesheets/bootplus_overrides.css.less
2015-03-13 22:46:31 -05:00
Andrew Brown
e3e8cbdaf6 Clean up after the merge conflict 2015-03-13 20:43:55 -05:00
Robert Richter
e1fb3dbe87 Set coveralls to merge reports to merge Capybara tests 2015-03-13 20:18:49 -05:00
Robert Richter
5d90ba81b2 Add the remaining Coveralls files 2015-03-13 20:18:49 -05:00
Robert Richter
4945d1ca96 Add Coveralls 2015-03-13 20:18:49 -05:00
Robert Richter
94c0c72a95 Create coveralls config file 2015-03-13 20:18:49 -05:00
Robert Richter
2d71dfd497 Add coveralls gem 2015-03-13 20:18:49 -05:00
Robert Richter
f40f7ceae6 Add PostgreSQL gem to allow Travis pg build to work 2015-03-13 20:18:49 -05:00
Robert Richter
659a7d4516 Set up Travis to use a PostgreSQL database for testing 2015-03-13 20:18:49 -05:00
Robert Richter
6f8ae925ba Revert "Resolve merge with master"
This reverts commit 8524963f1c12d6f4667964acc16680749dec20cf, reversing
changes made to bdb208e18769be9ea95c06d54c72f86d2d6a0209.
2015-03-13 20:18:49 -05:00
Robert Richter
6e30c97a6b Add more integration tests and refactor 2015-03-13 20:15:54 -05:00
Robert Richter
4386d422af Have users fixture store the actual hash that is expected 2015-03-13 20:15:54 -05:00
Robert Richter
12ea8f8b48 Include fix for #378 2015-03-13 20:15:54 -05:00
Robert Richter
9ade889a35 Change Mongo reference to ActiveRecord reference 2015-03-13 20:15:54 -05:00
Robert Richter
29c0e6727f Set up Capybara functional testing, and write our first functional test! 2015-03-13 20:15:54 -05:00
Robert Richter
1cab3282ff Add all the remaining tests and code to get the site functional 2015-03-13 20:15:54 -05:00
Robert Richter
a02ab0e735 Add tests for validations, and the validations as per schema 2015-03-13 20:14:47 -05:00
Robert Richter
2609a882a1 Set eager_load configs as per Rake's recommendation 2015-03-13 20:14:47 -05:00
Robert Richter
b91b53412e Created Languages controller tests, and updated Languages controller to use Rails 4 strong parameters 2015-03-13 20:14:47 -05:00
Robert Richter
e661f692a9 Create equipment controller tests and update Equipment controller to use Rails 4 strong parameters 2015-03-13 20:14:46 -05:00
Robert Richter
c251f50f2b Create tests for models, and add associations to models 2015-03-13 20:14:46 -05:00
Robert Richter
c8d671782b Update README to mention Ruby 2.1.2 2015-03-13 20:14:46 -05:00
Robert Richter
2a0c37ee3d Fix Travis's Ruby version 2015-03-13 20:14:46 -05:00
Robert Richter
dae7a2e227 Remove experimental Ruby 2.1.0 build Gemfile 2015-03-13 20:14:46 -05:00
Robert Richter
ccad5e6d1f Fix Character model and tests 2015-03-13 20:14:06 -05:00
Robert Richter
d0192b47a6 Create Character tests 2015-03-13 20:14:06 -05:00
Andrew Brown
06c6b0ce89 Merge resolution 2015-03-13 20:12:42 -05:00
Andrew Brown
8dca1c72af Use location paths on location#edit, not character paths 2014-10-23 03:33:04 +00:00
Andrew Brown
ca5ed40a1a Add problem reporting, feedback, and feature request links 2014-09-07 03:41:36 +00:00
Andrew Brown
1140037f3d Do not double-hash user passwords #378 2014-08-03 19:44:31 -05:00