Fix rubocop Rails/TimeZone warnings
Refactor test to use general basic_authorization_header method There's no need for this test to have its own version of the method.
Fix some rubocop todos
Move all settings to settings.yml We leave the STATUS setting alone, since it's required before rails boots. The test-specific settings now live in config/settings/test.yml
Fix new rubocop warnings
Update get/post etc to remove use of deprecated syntax
Use user factories for user_block integration tests.
Replace user_blocks fixture with a factory. Traits are used here to make the tests easier to read, and the different traits can be combined where necessary.
Fix more rubocop style issues
Standardise on double quoted strings
Fix most auto-correctable rubocop issues
Reorganise tests to match modern rails test layout
IntegrationTest is now in ActionDispatch not ActionController
Replace attr_accessible with strong parameters
Turn on mass assignment protection Require any attribute that is going to be mass assigned to be whitelisted, and whitelist those attributes which need it
Merge branch 'master' into openid Conflicts: app/controllers/user_controller.rb app/views/user/terms.html.erb test/fixtures/users.yml
Allow user details to be fetched without agreeing terms
Fixup tests to work after changes to user controller
Fix tests which do logins to handle the cookie test.
Refactored user_role and controller. Now much more DRY.