Merge 60569d5ec0 into 98fc1137e1

2017-07-13 18:18:51 +00:00 · 2017-07-13 18:18:51 +00:00 · caa1a26b0a
commit caa1a26b0a
parent 98fc1137e1 60569d5ec0
11 changed files with 332 additions and 507 deletions
--- a/spec/controllers/admin/roles_controller_spec.rb
+++ b/spec/controllers/admin/roles_controller_spec.rb
@ -55,7 +55,7 @@ describe Admin::RolesController do
  end

  describe 'POST #toggle' do
-    before:each do
+    before :each do
      sign_in admin
      post :toggle_user, conference_id: conference.short_title,
                         user: { email: 'user1@osem.io' },