ActionItem1204: made role kind always be defined

Moises Machado · Antonio Terceiro
1 parent ae454ce9
Showing 2 changed files with 14 additions and 1 deletions Show diff stats
test/functional/role_controller_test.rb
vendor/plugins/access_control/lib/role.rb
@@ -82,4 +82,12 @@ class RoleControllerTest &lt; Test::Unit::TestCase
       assert_not_nil assigns(:role)
     end
   end
+
+  should 'not crash when editing role with no permissions' do
+    role = Role.create!(:name => 'test_role', :environment => Environment.default)
+
+    assert_nothing_raised do
+      get :edit, :id => role.id
+    end
+  end
 end
@@ -32,7 +32,12 @@ class Role &lt; ActiveRecord::Base
   end
  
   def kind
-    perms.keys.detect{|k| perms[k].keys.include?(permissions[0]) }
+    env_perms = perms['Environment'].keys
+    if permissions.any?{ |perm| env_perms.include?(perm) }
+      'Environment'
+    else
+      'Profile'
+    end
   end
  
   def name
...	...	@@ -82,4 +82,12 @@ class RoleControllerTest < Test::Unit::TestCase
82	82	assert_not_nil assigns(:role)
83	83	end
84	84	end
	85	+
	86	+ should 'not crash when editing role with no permissions' do
	87	+ role = Role.create!(:name => 'test_role', :environment => Environment.default)
	88	+
	89	+ assert_nothing_raised do
	90	+ get :edit, :id => role.id
	91	+ end
	92	+ end
85	93	end
...	...
...	...	@@ -32,7 +32,12 @@ class Role < ActiveRecord::Base
32	32	end
33	33
34	34	def kind
35		- perms.keys.detect{\|k\| perms[k].keys.include?(permissions[0]) }
	35	+ env_perms = perms['Environment'].keys
	36	+ if permissions.any?{ \|perm\| env_perms.include?(perm) }
	37	+ 'Environment'
	38	+ else
	39	+ 'Profile'
	40	+ end
36	41	end
37	42
38	43	def name
...	...