Commit Graph

435 Commits

Author SHA1 Message Date
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
Andrew Brown
1bd54b3bda Merge pull request #377 from Cantido/readmetordoc
Convert README to rdoc
2014-08-03 18:11:37 -05:00
Robert Richter
0a1225e4e4 Convert README to rdoc 2014-08-03 14:21:45 -05:00
Andrew Brown
693edc0790 Reset anon user flag on successful logins #366 2014-08-03 03:58:22 +00:00
Andrew Brown
dd9bbd1301 Fix dashboard closing tag in html 2014-08-03 01:06:55 +00:00
Andrew Brown
5c81b25383 Fix landing page closing html tags 2014-08-03 01:05:16 +00:00
Andrew Brown
61cb970c97 Don't show anon_notice card on account page #350 2014-08-03 00:54:38 +00:00
Andrew Brown
8530aab1ed Show anon notice as a sidebar card rather than a banner 2014-08-02 19:48:23 -05:00
Andrew Brown
a380e9d2cd fix 500 on universe#new and magic#new in prod 2014-08-02 00:43:48 -05:00
Andrew Brown
47ef47812d Merge pull request #364 from drusepth/fix-bootplus
Bootstrap 3! DEAR GOD IT WORKS
2014-08-02 00:02:52 -05:00
Andrew Brown
e14f980532 Merge branch 'master' into fix-bootplus
Conflicts:
	Gemfile.lock
2014-08-02 04:53:55 +00:00
Andrew Brown
dc2476e636 more prod hotfixes 2014-08-01 04:01:24 +00:00
Andrew Brown
18d49e677b Production hotfixes lel 2014-08-01 01:04:27 +00:00
Andrew Brown
e452065255 Active tab styling on facet lists 2014-07-28 22:51:13 -05:00