Fixes #29609 - fix initializer for rails 6

Katello · Apr 25, 2020 · d0dad1e · d0dad1e
1 parent d9dc5fe
commit d0dad1e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/config/initializers/runcible.rb b/config/initializers/runcible.rb
diff --git a/lib/katello.rb b/lib/katello.rb
@@ -26,4 +26,8 @@
 module Katello
   require "katello/version"
   require "katello/engine"
+
+  def self.pulp_server
+    Katello::Pulp::Server.config(SETTINGS[:katello][:pulp][:url], User.remote_user)
+  end
 end
diff --git a/lib/katello/engine.rb b/lib/katello/engine.rb
@@ -22,7 +22,7 @@ class Engine < ::Rails::Engine
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/mount_engine.rb"
     end
 
-    initializer 'katello.load_default_settings', :before => :load_config_initializers do
+    initializer 'katello.load_default_settings', :before => 'katello.register_plugin' do
       default_settings = {
         :use_pulp => true,
         :use_cp => true,
@@ -62,7 +62,10 @@ class Engine < ::Rails::Engine
 
       SETTINGS[:katello] = default_settings.deep_merge(SETTINGS[:katello] || {})
 
-      require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__) if (Setting.table_exists? rescue(false))
+      if (Setting.table_exists? rescue(false))
+        require_dependency File.expand_path('../../../app/models/setting/content.rb', __FILE__)
+        Setting::Content.load_defaults
+      end
     end
 
     initializer "katello.apipie" do

diff --git a/lib/katello/plugin.rb b/lib/katello/plugin.rb
@@ -344,9 +344,9 @@
 
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
-
-  add_permissions_to_default_roles 'System admin' => [:create_lifecycle_environments, :create_content_views]
-
+  unless Rails.env.test?
+    add_permissions_to_default_roles 'System admin' => [:create_lifecycle_environments, :create_content_views]
+  end
   role 'Register hosts', [
     :view_hostgroups, :view_activation_keys, :view_hosts,
     :create_hosts, :edit_hosts, :destroy_hosts,