rails5: fix article test

Braulio Bhavamitra
1 parent 69ca0d2b
Showing 4 changed files with 12 additions and 9 deletions Show diff stats
app/models/application_record.rb
db/migrate/069_add_enviroment_id_to_role.rb
lib/delayed_attachment_fu.rb
lib/postgresql_attachment_fu.rb
@@ -2,6 +2,8 @@ class ApplicationRecord &lt; ActiveRecord::Base
   self.abstract_class = true
+  extend PostgresqlAttachmentFu::ClassMethods
+
   def self.postgresql?
     ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
   end
@@ -25,7 +27,7 @@ class ApplicationRecord &lt; ActiveRecord::Base
   alias :meta_cache_key :cache_key
   def cache_key
     key = [Noosfero::VERSION, meta_cache_key]
-    key.unshift(ActiveRecord::Base.connection.schema_search_path) if ActiveRecord::Base.postgresql?
+    key.unshift(ActiveRecord::Base.connection.schema_search_path) if ApplicationRecord.postgresql?
     key.join('/')
   end
 class Role < ApplicationRecord
+end
 class RoleWithEnvironment < ApplicationRecord
   self.table_name = 'roles'
   belongs_to :environment
@@ -18,10 +19,10 @@ class AddEnviromentIdToRole &lt; ActiveRecord::Migration
         re = RoleWithEnvironment.new(role.attributes)
         re.environment = env
         re.save
-        RoleAssignment.where(role_id: role.id).select{|ra| ra.resource && (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }.each do |ra|
-          ra.role_id = re.id
-          ra.save
-        end
+        RoleAssignment \
+          .where(role_id: role.id)
+          .select{ |ra| ra.resource && (ra.resource.kind_of?(Profile) ? ra.resource.environment_id : ra.resource.id) == env.id }
+          .each{ |ra| ra.role_id = re.id; ra.save }
       end
     end
     roles.each(&:destroy)
+require 'create_thumbnails_job'
+
 module DelayedAttachmentFu
   module ClassMethods
@@ -2,18 +2,16 @@ module PostgresqlAttachmentFu
   module ClassMethods
     def postgresql_attachment_fu
-      send :include, InstanceMethods
+      include InstanceMethods
     end
   end
   module InstanceMethods
     def full_filename(thumbnail = nil)
       file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix].to_s
-      file_system_path = File.join(file_system_path, ActiveRecord::Base.connection.schema_search_path) if ActiveRecord::Base.postgresql? and Noosfero::MultiTenancy.on?
+      file_system_path = File.join(file_system_path, ActiveRecord::Base.connection.schema_search_path) if ApplicationRecord.postgresql? and Noosfero::MultiTenancy.on?
       Rails.root.join(file_system_path, *partitioned_path(thumbnail_name_for(thumbnail))).to_s
     end
   end
 end
-
-ActiveRecord::Base.send(:extend, PostgresqlAttachmentFu::ClassMethods)
		1	+require 'create_thumbnails_job'
		2	+
1	module DelayedAttachmentFu	3	module DelayedAttachmentFu
2		4
3	module ClassMethods	5	module ClassMethods