Fix role kind resolution

Victor Costa
1 parent b9800000
Showing 3 changed files with 13 additions and 6 deletions Show diff stats
test/fixtures/roles.yml
test/unit/environment_test.rb
vendor/plugins/access_control/lib/role.rb
@@ -55,6 +55,10 @@ profile_admin:
    - view_private_content
    - manage_products
    - send_mail_to_members
+   - edit_appearance
+   - manage_friends
+   - validate_enterprise
+   - publish_content
 profile_member:
   id: 6
   environment_id: 1
@@ -363,6 +363,14 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert_kind_of Role, Environment::Roles.admin(Environment.default.id)
   end
+  should 'create environment and profile default roles' do
+    env = Environment.default
+    assert_equal 'Environment', env.roles.find_by_key('environment_administrator').kind
+    assert_equal 'Profile', env.roles.find_by_key('profile_admin').kind
+    assert_equal 'Profile', env.roles.find_by_key('profile_member').kind
+    assert_equal 'Profile', env.roles.find_by_key('profile_moderator').kind
+  end
+
   should 'be able to add admins easily' do
     env = Environment.default
     user = create_user('testuser').person
@@ -35,12 +35,7 @@ class Role &lt; ActiveRecord::Base
   end
   def kind
-    env_perms = perms['Environment'].keys
-    if permissions.any?{ |perm| env_perms.include?(perm) }
-      'Environment'
-    else
-      'Profile'
-    end
+    key.present? && key.starts_with?('environment_') ? 'Environment' : 'Profile'
   end
   def name
	@@ -363,6 +363,14 @@ class EnvironmentTest < ActiveSupport::TestCase		@@ -363,6 +363,14 @@ class EnvironmentTest < ActiveSupport::TestCase
363	assert_kind_of Role, Environment::Roles.admin(Environment.default.id)	363	assert_kind_of Role, Environment::Roles.admin(Environment.default.id)
364	end	364	end
365		365
		366	+ should 'create environment and profile default roles' do
		367	+ env = Environment.default
		368	+ assert_equal 'Environment', env.roles.find_by_key('environment_administrator').kind
		369	+ assert_equal 'Profile', env.roles.find_by_key('profile_admin').kind
		370	+ assert_equal 'Profile', env.roles.find_by_key('profile_member').kind
		371	+ assert_equal 'Profile', env.roles.find_by_key('profile_moderator').kind
		372	+ end
		373	+
366	should 'be able to add admins easily' do	374	should 'be able to add admins easily' do
367	env = Environment.default	375	env = Environment.default
368	user = create_user('testuser').person	376	user = create_user('testuser').person