Engine: Fixing authorization model tests, refs Katello#3585

app/models/katello/authorization/organization.rb

@@ -84,7 +84,7 @@ def no_tag_verbs
 
     def authorized_items(verbs, resource = :organizations)
       if !::User.allowed_all_tags?(verbs, resource)
-        where("organizations.id in (#{::User.allowed_tags_sql(verbs, resource)})")
+        where("#{Organization.table_name}.id in (#{::User.allowed_tags_sql(verbs, resource)})")
       end
     end
   end

app/models/katello/authorization/system.rb

@@ -25,11 +25,11 @@ def readable(org)
       if org.systems_readable?
         where(:environment_id => org.environment_ids) #list all systems in an org
       else #just list for environments the user can access
-        where_clause = "systems.environment_id in (#{KTEnvironment.systems_readable(org).select(:id).to_sql})"
+        where_clause = "#{System.table_name}.environment_id in (#{KTEnvironment.systems_readable(org).select(:id).to_sql})"
         where_clause += " or "
-        where_clause += "system_system_groups.system_group_id in (#{SystemGroup.systems_readable(org).select(:id).to_sql})"
-        joins("left outer join system_system_groups on systems.id =
-                                    system_system_groups.system_id").where(where_clause)
+        where_clause += "#{SystemSystemGroup.table_name}.system_group_id in (#{SystemGroup.systems_readable(org).select(:id).to_sql})"
+        joins("left outer join #{SystemSystemGroup.table_name} on #{System.table_name}.id =
+                                    #{SystemSystemGroup.table_name}.system_id").where(where_clause)
       end
     end
 

app/models/katello/authorization/system_group.rb

@@ -80,7 +80,7 @@ def items(org, verbs)
       if ::User.allowed_all_tags?(verbs, resource, org)
         where(:organization_id => org)
       else
-        where("system_groups.id in (#{::User.allowed_tags_sql(verbs, resource, org)})")
+        where("#{SystemGroup.table_name}.id in (#{::User.allowed_tags_sql(verbs, resource, org)})")
       end
     end
   end

app/models/katello/content_view_definition_base.rb

@@ -12,7 +12,7 @@
 
 module Katello
 class ContentViewDefinitionBase < ActiveRecord::Base
-  belongs_to :organization, :inverse_of => :content_view_definitions
+  belongs_to :organization, :inverse_of => :content_view_definitions, :class_name => "Katello::Organization"
   has_many :content_view_definition_products, :foreign_key => "content_view_definition_id", :dependent => :destroy
   has_many :products, :through => :content_view_definition_products, :after_remove => :remove_product
   has_many :content_view_definition_repositories, :foreign_key => "content_view_definition_id", :dependent => :destroy

lib/katello/tasks/test.rake

@@ -12,6 +12,7 @@ namespace :test do
       t.libs << ["test", "#{Katello::Engine.root}/test", "spec", "#{Katello::Engine.root}/spec"]
       t.test_files = [
         "#{Katello::Engine.root}/test/glue/pulp/*_test.rb",
+        "#{Katello::Engine.root}/test/models/authorization/*_test.rb",
         "#{Katello::Engine.root}/test/models/repository_test.rb",
         "#{Katello::Engine.root}/test/models/system_test.rb",
         "#{Katello::Engine.root}/test/models/activation_key_test.rb",

test/fixtures/models/katello_roles.yml

@@ -11,8 +11,8 @@ admin_own_role:
   created_at: <%= Time.now %>
   updated_at: <%= Time.now %>
 
-no_perms_own_role:
-  name:   no_perms_own_role
+restricted_own_role:
+  name:   restricted_own_role
   type:   Katello::UserOwnRole
   created_at: <%= Time.now %>
   updated_at: <%= Time.now %>

test/fixtures/models/katello_roles_users.yml

@@ -7,8 +7,8 @@ admin_own_role_admin:
   user_id:  <%= ActiveRecord::Fixtures.identify(:admin) %>
 
 no_perms_user_own_role:
-  role_id:  <%= ActiveRecord::Fixtures.identify(:no_perms_own_role) %>
-  user_id:  <%= ActiveRecord::Fixtures.identify(:no_perms_user) %>
+  role_id:  <%= ActiveRecord::Fixtures.identify(:restricted_own_role) %>
+  user_id:  <%= ActiveRecord::Fixtures.identify(:restricted) %>
 
 hidden_own_role:
   role_id:  <%= ActiveRecord::Fixtures.identify(:hidden_own_role) %>

test/models/authorization/activation_key_authorization_test.rb

@@ -10,8 +10,9 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class ActivationKeyAuthorizationAdminTest < AuthorizationTestBase
 
   def setup
@@ -37,7 +38,7 @@ class ActivationKeyAuthorizationNoPermsTest  < AuthorizationTestBase
 
   def setup
     super
-    User.current = User.find(users('no_perms_user'))
+    User.current = User.find(users(:restricted))
   end
 
   def test_readable
@@ -53,3 +54,4 @@ def test_manageable?
   end
 
 end
+end

test/models/authorization/content_view_authorization_test.rb

@@ -10,31 +10,25 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require 'minitest_helper'
+require 'katello_test_helper'
 require 'support/auth_support'
 
+module Katello
 module ContentViewAuthBase
   def self.included(base)
     base.class_eval do
-      fixtures :all
       include AuthorizationSupportMethods
     end
     base.extend ClassMethods
   end
 
   def setup
     @admin       = User.find(users(:admin))
-    @no_perms    = User.find(users(:no_perms_user))
-    @org         = Organization.find(organizations(:acme_corporation))
+    @no_perms    = User.find(users(:restricted))
+    @org         = Organization.find(katello_organizations(:acme_corporation))
     @view        = FactoryGirl.build(:content_view, :organization => @org)
   end
 
-  def teardown
-    ContentView.delete_all
-    User.delete_all
-    Organization.delete_all
-  end
-
   module ClassMethods
     def before_suite
       services  = ['Candlepin', 'Pulp', 'ElasticSearch', 'Foreman']
@@ -44,7 +38,7 @@ def before_suite
   end
 end
 
-class ContentViewAuthorizationAdminTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewAuthorizationAdminTest < ActiveSupport::TestCase
   include ContentViewAuthBase
 
   def setup
@@ -71,7 +65,7 @@ def test_subscribe
 
 end
 
-class ContentViewAuthorizationNoAuthTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewAuthorizationNoAuthTest < ActiveSupport::TestCase
   include ContentViewAuthBase
 
   def setup
@@ -94,7 +88,7 @@ def test_subscribable?
   end
 end
 
-class ContentViewAuthorizationSinglePermTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewAuthorizationSinglePermTest < ActiveSupport::TestCase
   include ContentViewAuthBase
 
   def setup
@@ -117,3 +111,4 @@ def test_readable
     refute_empty ContentView.readable(@org)
   end
 end
+end

test/models/authorization/content_view_definition_authorization_test.rb

@@ -10,21 +10,19 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require 'minitest_helper'
+require 'katello_test_helper'
 require 'support/auth_support'
 
+module Katello
 module ContentViewDefinitionAuthBase
   def self.included(base)
-    base.class_eval do
-      fixtures :all
-    end
     base.extend ClassMethods
   end
 
   def setup
     @admin       = User.find(users(:admin))
-    @no_perms    = User.find(users(:no_perms_user))
-    @org         = Organization.find(organizations(:acme_corporation))
+    @no_perms    = User.find(users(:restricted))
+    @org         = Organization.find(katello_organizations(:acme_corporation))
     @cvd         = FactoryGirl.create(:content_view_definition, :organization => @org)
   end
 
@@ -41,7 +39,7 @@ def before_suite
   end
 end
 
-class ContentViewDefinitionAuthorizationAdminTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewDefinitionAuthorizationAdminTest < ActiveSupport::TestCase
   include ContentViewDefinitionAuthBase
 
   def setup
@@ -77,7 +75,7 @@ def test_no_user
 
 end
 
-class ContentViewDefinitionAuthorizationNoPermTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewDefinitionAuthorizationNoPermTest < ActiveSupport::TestCase
   include ContentViewDefinitionAuthBase
 
   def setup
@@ -106,7 +104,7 @@ def test_deletable
   end
 end
 
-class ContentViewDefinitionAuthorizationReadonlyTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewDefinitionAuthorizationReadonlyTest < ActiveSupport::TestCase
   include ContentViewDefinitionAuthBase, AuthorizationSupportMethods
 
   def setup
@@ -136,7 +134,7 @@ def test_deletable
 end
 
 # random permission
-class ContentViewDefinitionAuthorizationTest < MiniTest::Rails::ActiveSupport::TestCase
+class ContentViewDefinitionAuthorizationTest < ActiveSupport::TestCase
   include ContentViewDefinitionAuthBase, AuthorizationSupportMethods
 
   def setup
@@ -154,3 +152,4 @@ def test_publishable
   end
 
 end
+end

test/models/authorization/content_view_version_authorization_test.rb

@@ -10,8 +10,9 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class ContentViewVersionAuthorizationAdminTest < AuthorizationTestBase
   def setup
     super
@@ -26,10 +27,11 @@ def test_readable
 class ContentViewVersionAuthorizationNonAuthUserTest < AuthorizationTestBase
   def setup
     super
-    User.current = User.find(users(:no_perms_user))
+    User.current = User.find(users(:restricted))
   end
 
   def test_readable
     assert_empty ContentViewVersion.readable(@acme_corporation)
   end
 end
+end

test/models/authorization/environment_authorization_test.rb

@@ -10,8 +10,9 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class EnvironmentAuthorizationAdminTest < AuthorizationTestBase
 
   def setup
@@ -95,7 +96,7 @@ class EnvironmentAuthorizationNoPermsTest < AuthorizationTestBase
 
   def setup
     super
-    User.current = User.find(users('no_perms_user'))
+    User.current = User.find(users('restricted'))
     @env = @dev
     @org = @acme_corporation
   end
@@ -170,3 +171,4 @@ def test_systems_registerable?
   end
 
 end
+end

test/models/authorization/gpg_key_authorization_test.rb

@@ -10,14 +10,15 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class GpgKeyAuthorizationAdminTest < AuthorizationTestBase
 
   def setup
     super
     User.current = User.find(users('admin'))
-    @key = GpgKey.find(gpg_keys('fedora_gpg_key'))
+    @key = GpgKey.find(katello_gpg_keys('fedora_gpg_key'))
   end
 
   def test_readable
@@ -49,8 +50,8 @@ class GpgKeyAuthorizationNoPermsTest < AuthorizationTestBase
 
   def setup
     super
-    User.current = User.find(users('no_perms_user'))
-    @key = GpgKey.find(gpg_keys('fedora_gpg_key'))
+    User.current = User.find(users('restricted'))
+    @key = GpgKey.find(katello_gpg_keys('fedora_gpg_key'))
   end
 
   def test_readable
@@ -78,3 +79,4 @@ def test_key_manageable?
   end
 
 end
+end

test/models/authorization/organization_authorization_test.rb

@@ -10,8 +10,9 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class OrganizationAuthorizationAdminTest < AuthorizationTestBase
 
   def setup
@@ -82,7 +83,7 @@ class OrganizationAuthorizationNoPermsTest < AuthorizationTestBase
 
   def setup
     super
-    User.current = User.find(users('no_perms_user'))
+    User.current = User.find(users('restricted'))
     @org = @acme_corporation
   end
 
@@ -143,3 +144,4 @@ def test_redhat_manageable?
   end
 
 end
+end

test/models/authorization/product_authorization_test.rb

@@ -10,8 +10,9 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-require './test/models/authorization/authorization_base'
+require 'models/authorization/authorization_base'
 
+module Katello
 class ProductAuthorizationAdminTest < AuthorizationTestBase
 
   def setup
@@ -58,7 +59,7 @@ def test_editable?
   end
 
   def test_deletable?
-    product = Product.find(products(:empty_product))
+    product = Product.find(katello_products(:empty_product))
     assert product.deletable?
   end
 
@@ -72,7 +73,7 @@ class ProductAuthorizationNoPermsTest < AuthorizationTestBase
 
   def setup
     super
-    User.current = User.find(users('no_perms_user'))
+    User.current = User.find(users('restricted'))
     @prod = @fedora
     @org = @acme_corporation
   end
@@ -122,3 +123,4 @@ def test_creatable?
   end
 
 end
+end