Merge branch 'master' into admin_booths

2017-07-17 18:04:57 +03:00 · 2017-07-17 18:04:57 +03:00 · dfdcd57994
commit dfdcd57994
parent 091ba49a97 86b8eff4c7
7 changed files with 152 additions and 111 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' },