Download as
Browse Code »

Commit 69ca0d2bec6e958e310d54b926f99ca0bb11ba1f

Authored by Braulio Bhavamitra
1 parent 23deaf4e
Exists in rails5

rails5: fix remaining person tests

Showing 4 changed files with 7 additions and 5 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @69ca0d2
... ... @@ -19,7 +19,7 @@ class Person < Profile
19 19 joins << :user if User.attribute_names.include? field
20 20  
21 21 conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
22   - distinct.select('profiles.*').joins(joins).where([conditions])
  22 + distinct.select('profiles.*').joins(joins).where(conditions)
23 23 }
24 24  
25 25 scope :not_members_of, -> resources {
... ...
config/initializers/action_tracker.rb
  Diff comments   View file @69ca0d2
1 1 require 'noosfero/i18n'
2 2 require 'action_tracker_config'
  3 +require 'notify_activity_to_profiles_job'
  4 +require 'activities_counter_cache_job'
3 5  
4 6 # ActionTracker plugin stuff
5 7  
... ...
config/initializers/dependencies.rb
  Diff comments   View file @69ca0d2
... ... @@ -25,6 +25,6 @@ require &#39;set_profile_region_from_city_state&#39;
25 25 require 'authenticated_system'
26 26 require 'needs_profile'
27 27 require 'white_list_filter'
28   -require 'notify_activity_to_profiles_job'
29 28 require 'profile_suggestions_job'
  29 +require 'scope_tool'
30 30  
... ...
test/unit/person_test.rb
  Diff comments   View file @69ca0d2
... ... @@ -1005,7 +1005,7 @@ class PersonTest &lt; ActiveSupport::TestCase
1005 1005  
1006 1006 should 'track only one action when a person joins a community' do
1007 1007 ActionTracker::Record.delete_all
1008   - p = create_user('test_user').person
  1008 + p = (User.current=create_user('test_user')).person
1009 1009 c = fast_create(Community, :name => "Foo")
1010 1010 c.add_member(p)
1011 1011 assert_equal ["Foo"], ActionTracker::Record.where(verb: 'join_community').last.get_resource_name
... ... @@ -1283,7 +1283,7 @@ class PersonTest &lt; ActiveSupport::TestCase
1283 1283 profile = fast_create(Profile)
1284 1284 profile.add_admin(admin)
1285 1285  
1286   - assert admin.has_permission?('anything', profile), 'Admin does not have every permission!'
  1286 + assert admin.has_permission?('manage_environment_users', profile), 'Admin does not have every permission!'
1287 1287 end
1288 1288  
1289 1289 should 'grant every permission over profile for environment admin' do
... ... @@ -1292,7 +1292,7 @@ class PersonTest &lt; ActiveSupport::TestCase
1292 1292 environment = profile.environment
1293 1293 environment.add_admin(admin)
1294 1294  
1295   - assert admin.has_permission?('anything', profile), 'Environment admin does not have every permission!'
  1295 + assert admin.has_permission?('manage_environment_users', profile), 'Environment admin does not have every permission!'
1296 1296 end
1297 1297  
1298 1298 should 'allow plugins to extend person\'s permission access' do
... ...