Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use.

spec/models/ability_spec.rb

@@ -107,7 +107,8 @@ describe 'User' do
     end
 
     context 'when user has the role organizer' do
-      let(:role) { create(:organizer_role, resource: my_conference) }
+      let!(:my_conference) { create(:full_conference) }
+      let(:role) { Role.find_by(name: 'organizer', resource: my_conference) }
       let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
 
       it{ should_not be_able_to(:destroy, my_conference.program) }
@@ -172,7 +173,8 @@ describe 'User' do
     end
 
     context 'when user has the role cfp' do
-      let(:role) { create(:cfp_role, resource: my_conference) }
+      let!(:my_conference) { create(:full_conference) }
+      let(:role) { Role.find_by(name: 'cfp', resource: my_conference) }
       let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
 
       it{ should_not be_able_to([:create, :new], Conference.new) }
@@ -226,7 +228,8 @@ describe 'User' do
     end
 
     context 'when user has the role info_desk' do
-      let(:role) { create(:info_desk_role, resource: my_conference) }
+      let!(:my_conference) { create(:full_conference) }
+      let(:role) { Role.find_by(name: 'info_desk', resource: my_conference) }
       let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
 
       it{ should_not be_able_to([:create, :new], Conference.new) }
@@ -280,7 +283,8 @@ describe 'User' do
     end
 
     context 'when user has the role volunteers_coordinator' do
-      let(:role) { create(:volunteers_coordinator_role, resource: my_conference) }
+      let!(:my_conference) { create(:full_conference) }
+      let(:role) { Role.find_by(name: 'volunteers_coordinator', resource: my_conference) }
       let(:user) { create(:user, role_ids: [role.id], is_admin: false) }
 
       it{ should_not be_able_to([:create, :new], Conference.new) }

spec/models/conference_spec.rb

@@ -274,7 +274,7 @@ describe Conference do
 
   describe '#get_top_submitter' do
     let!(:conference) { create(:conference) }
-    let!(:organizer_role) { create(:organizer_role, resource: conference) }
+    let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
     let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
     it 'calculates correct hash with top submitters' do
@@ -902,7 +902,7 @@ describe Conference do
 
   describe 'self#event_distribution' do
     let!(:conference) { create(:conference) }
-    let!(:organizer_role) { create(:organizer_role, resource: conference) }
+    let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
     let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
     it 'self#event_distribution calculates correct values with user' do
@@ -1451,7 +1451,7 @@ describe Conference do
 
     # It is necessary to use bang version of let to build roles before user
     let!(:conference) { create(:conference) }
-    let!(:organizer_role) { create(:organizer_role, resource: conference) }
+    let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
     let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
 
     let(:user) { create(:user) }

spec/models/role_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Role do
+  let(:conference) { create(:conference) }
+  let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
+  let!(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
+  let!(:organizer) { create(:user, role_ids: organizer_role.id) }
+
+  it 'get_users' do
+    expect(organizer_role.users).to include organizer
+    expect(organizer_role.users.count).to eq 1
+    expect(cfp_role.users).to eq []
+  end
+end

spec/models/user_spec.rb

@@ -5,8 +5,9 @@ describe User do
   # It is necessary to use bang version of let to build roles before user
   let!(:user_admin) { create(:user) }
   let!(:conference) { create(:conference) }
-  let!(:organizer_role) { create(:organizer_role, resource: conference) }
-  let!(:cfp_role) { create(:cfp_role, resource: conference) }
+  let!(:organizer_role) { Role.find_by(name: 'organizer', resource: conference) }
+  let!(:cfp_role) { Role.find_by(name: 'cfp', resource: conference) }
+  let!(:volunteers_coordinator_role) { Role.find_by(name: 'volunteers_coordinator', resource: conference) }
   let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }
   let!(:user) { create(:user) }
 
@@ -33,20 +34,21 @@ describe User do
   end
 
   describe '#has_role?' do
-    shared_examples '#role?' do |user, role, expected|
-      it "returns #{expected} for #{role}" do
-        user_obj = create(user)
-        expect(user_obj.has_role?(role.downcase, conference)).to be expected
+    describe 'when user has a role' do
+      it 'returns true when the user has the role' do
+        user = create(:user, role_ids: organizer_role.id)
+        expect(user.has_role?('organizer', conference)).to be true
+      end
+
+      it 'returns false when the user does not have the role' do
+        user = create(:user, role_ids: cfp_role.id)
+        expect(user.has_role?('organizer', conference)).to be false
       end
     end
 
-    context 'organizer' do
-      it_behaves_like '#role?', :organizer, 'organizer', true
-      it_behaves_like '#role?', :organizer, 'participant', false
-    end
-
-    context 'participant' do
-      it_behaves_like '#role?', :user, 'adMin', false
+    it 'returns false when the user does not have a role' do
+      user = create(:user, role_ids: [])
+      expect(user.has_role?('organizer', conference)).to be false
     end
   end