Fixes issue checking roles when none are initialized in the class yet.

This commit is contained in:
James McCarthy 2011-04-30 18:12:02 +01:00
parent c7d3a95874
commit 62687070a0
2 changed files with 31 additions and 0 deletions

View file

@ -15,6 +15,7 @@ module RoleModel
attr_accessor(*::RoleModel::INHERITABLE_CLASS_ATTRIBUTES)
end
roles_attribute :roles_mask # set default bitmask attribute
self.valid_roles = []
end
end

View file

@ -332,6 +332,36 @@ describe RoleModel do
end
end
context "query for roles when none defined in model" do
[:has_any_role?, :is_any_of?, :has_role?, :has_all_roles?, :is?, :has_roles?].each do |check_role_assignment_method|
describe "##{check_role_assignment_method}" do
let(:model_class_without_roles) { Class.new }
before(:each) do
model_class_without_roles.instance_eval do
attr_accessor :roles_mask
attr_accessor :custom_roles_mask
include RoleModel
end
end
subject { model_class_without_roles.new }
it "should return false when a role was assigned" do
subject.roles = :foo
subject.send(check_role_assignment_method, :foo).should be_false
end
it "should return false when no role was assigned" do
subject.send(check_role_assignment_method, :foo).should be_false
end
end
end
end
context "ClassMethods" do
subject { model_class }