From 69ca0d2bec6e958e310d54b926f99ca0bb11ba1f Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Sun, 21 Feb 2016 19:19:43 -0300 Subject: [PATCH] rails5: fix remaining person tests --- app/models/person.rb | 2 +- config/initializers/action_tracker.rb | 2 ++ config/initializers/dependencies.rb | 2 +- test/unit/person_test.rb | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 4fd568d..d9efec0 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -19,7 +19,7 @@ class Person < Profile joins << :user if User.attribute_names.include? field conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ') - distinct.select('profiles.*').joins(joins).where([conditions]) + distinct.select('profiles.*').joins(joins).where(conditions) } scope :not_members_of, -> resources { diff --git a/config/initializers/action_tracker.rb b/config/initializers/action_tracker.rb index 6e25292..daa0ce7 100644 --- a/config/initializers/action_tracker.rb +++ b/config/initializers/action_tracker.rb @@ -1,5 +1,7 @@ require 'noosfero/i18n' require 'action_tracker_config' +require 'notify_activity_to_profiles_job' +require 'activities_counter_cache_job' # ActionTracker plugin stuff diff --git a/config/initializers/dependencies.rb b/config/initializers/dependencies.rb index dbb2102..e8bb61f 100644 --- a/config/initializers/dependencies.rb +++ b/config/initializers/dependencies.rb @@ -25,6 +25,6 @@ require 'set_profile_region_from_city_state' require 'authenticated_system' require 'needs_profile' require 'white_list_filter' -require 'notify_activity_to_profiles_job' require 'profile_suggestions_job' +require 'scope_tool' diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb index 440a8f6..b57c656 100644 --- a/test/unit/person_test.rb +++ b/test/unit/person_test.rb @@ -1005,7 +1005,7 @@ class PersonTest < ActiveSupport::TestCase should 'track only one action when a person joins a community' do ActionTracker::Record.delete_all - p = create_user('test_user').person + p = (User.current=create_user('test_user')).person c = fast_create(Community, :name => "Foo") c.add_member(p) assert_equal ["Foo"], ActionTracker::Record.where(verb: 'join_community').last.get_resource_name @@ -1283,7 +1283,7 @@ class PersonTest < ActiveSupport::TestCase profile = fast_create(Profile) profile.add_admin(admin) - assert admin.has_permission?('anything', profile), 'Admin does not have every permission!' + assert admin.has_permission?('manage_environment_users', profile), 'Admin does not have every permission!' end should 'grant every permission over profile for environment admin' do @@ -1292,7 +1292,7 @@ class PersonTest < ActiveSupport::TestCase environment = profile.environment environment.add_admin(admin) - assert admin.has_permission?('anything', profile), 'Environment admin does not have every permission!' + assert admin.has_permission?('manage_environment_users', profile), 'Environment admin does not have every permission!' end should 'allow plugins to extend person\'s permission access' do -- libgit2 0.21.2