Commit Graph

5 Commits

Author SHA1 Message Date
Robert Richter
d4eb1adc07 Merge branch 'master' into clean-style
Conflicts:
	test/controllers/magic_controller_test.rb
2015-03-29 19:25:32 -05:00
Robert Richter
9aaa44d137 Test MagicController 2015-03-29 19:14:03 -05:00
Robert Richter
5a98b93dd1 Clean style of test classes 2015-03-27 23:44:15 -05:00
Robert Richter
00e793bf1e Refactor style using the Rubocop auto-correct 2015-03-25 22:42:45 -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