Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into issue/289

spec/acceptance/users_spec.rb

@@ -112,7 +112,7 @@ resource 'Users' do
     parameter :password_confirmation, 'The password confirmation of user'
     parameter :terms_of_service, 'Checks if user agreed with terms of service'
     parameter :avatar, 'The user avatar'
-    parameter :roles_ids, 'The user roles', scope: :user
+    parameter :role_ids, 'The user roles', scope: :user
     parameter :subjects, 'Array with subjects ids', scope: :user
 
     let(:id) {@user.id}
@@ -126,7 +126,7 @@ resource 'Users' do
     let(:avatar) {""}
 	# TODO role ids con't be changed if user isn't admin, send []
 	# when it's a admin send [role.first.id]
-    let(:roles_ids) { [] }
+    let(:role_ids) { [] }
     let(:subjects) { [subject.first.id] }
     let(:raw_post) {params.to_json}