foreman_scc_manager 1.8.2 → 1.8.7

data/test/fixtures/models/scc_extendings.yml

@@ -0,0 +1,6 @@
+# create a couple of products as scc_extensions
+<% 1.upto(10) do |i| %>
+p_extending_<%= i %>:
+  scc_product_id: 4
+  scc_extension_id: <%= 4 + i %>
+<% end %>

data/test/fixtures/models/scc_products.yml

@@ -7,8 +7,9 @@ one:
   version: 1
   arch: x86_128
   friendly_name: number one
-  description: lorem ipsum dolor sit amet
+  description: "<p> lorem ipsum dolor sit amet </p>"
   product_type: base
+  subscription_valid: nil
 
 two:
   scc_account_id: test_account1
@@ -17,5 +18,32 @@ two:
   version: 2
   arch: x86_128
   friendly_name: number two
-  description: lorem ipsum dolor sit amet
+  description: "<p> lorem ipsum dolor sit amet </p><p> lorem lorem lorem </p>"
   product_type: extras
+  subscription_valid: true
+
+three:
+  scc_account_id: test_account1
+  scc_id: 333
+  name: three
+  version: 3
+  arch: x86_128
+  friendly_name: number three
+  description: lorem ipsum dolor sit amet
+  product_type: base
+  subscription_valid: nil
+
+# create a couple of products as scc_extensions
+<% 1.upto(10) do |i| %>
+p_extension_<%= i %>:
+  scc_account_id: test_account1
+  scc_id: <%= i %>
+  name: p_ext_<%= i%> 
+  version: 3
+  arch: x86_128
+  friendly_name: number <%= i%> 
+  description: lorem ipsum dolor sit amet
+  product_type: extension
+  subscription_valid: nil
+<% end %>
+

data/test/fixtures/models/scc_repositories.yml

@@ -0,0 +1,29 @@
+# repositories for testing the empty repository filtering
+<% 1.upto(8) do |i| %>
+repo_<%= i %>:
+  id: <%= i %>
+  scc_account_id: 1
+  scc_id: <%= 63 + i %>
+  name: SLE10-Debuginfo-Updates_<%= i %>
+  distro_target: sles_<%= i %>
+  description: SLE10-Debuginfo-Updates for sles-10-ppc_<%= i %>
+  url: https://updates.suse.com/repo/example_<%= i %>
+  token: token_<%= i %>
+  autorefresh: true
+  installer_updates: false
+<% end %>
+
+repo_9:
+  id: 9
+  scc_account_id: 1
+  scc_id: 63
+  name: SLE10-Debuginfo-Updates_9
+  distro_target: sles_9
+  description: SLE10-Debuginfo-Updates for sles-10-ppc_9
+  url: https://updates.suse.com/repo/example_9
+  token: token_9
+  autorefresh: true
+  installer_updates: false
+
+
+

data/test/models/scc_account_test.rb

@@ -71,4 +71,74 @@ class SccAccountSearchTest < ActiveSupport::TestCase
   end
 end
 
+class SccAccountUpdateProductsTest < ActiveSupport::TestCase
+  def setup
+    @account = scc_accounts(:one)
+    one = scc_products(:one)
+    @account.scc_products = SccProduct.where(name: 'one')
+    # generate test data, beware that hash names are not equal to SccProduct instance names
+    @product_data = { 'name' => one.name,
+                      'id' => one.scc_id,
+                      'version' => one.version,
+                      'arch' => one.arch,
+                      'repositories' => one.scc_repositories,
+                      'extensions' => one.scc_extensions,
+                      'product_type' => one.product_type,
+                      'description' => '<p> new unpretty description </p>',
+                      'friendly_name' => 'updated name' }
+    @product_array = []
+    @product_array.push @product_data
+
+    @test_product = SccProduct.new
+    @test_product.scc_id = @product_data['id']
+    @test_product.friendly_name = @product_data['friendly_name']
+    @test_product.description = @product_data['description']
+  end
+
+  test 'update scc product' do
+    @account.update_scc_products(@product_array)
+    @updated_product = @account.scc_products.where(friendly_name: 'updated name').first
+    assert_equal @test_product.pretty_name, @updated_product.name
+    assert_equal @test_product.pretty_name, @updated_product.pretty_name
+    assert_equal @test_product.pretty_description, @updated_product.description
+    assert_equal @test_product.pretty_description, @updated_product.pretty_description
+
+    assert @updated_product.subscription_valid
+    @invalid_products = @account.scc_products.where.not(scc_id: scc_products(:one).scc_id)
+    @invalid_products.each do |ip|
+      assert_not ip.subscription_valid
+    end
+  end
+end
+
+class SccAccountUpdateReposTest < ActiveSupport::TestCase
+  def setup
+    @account = scc_accounts(:one)
+    test_repo = scc_repositories(:repo_9)
+    @account.scc_repositories = SccProduct.where(name: 'repo_9')
+    # generate test data
+    @repo_data = { 'name' => test_repo.name,
+                   'id' => test_repo.scc_id,
+                   'distro_target' => test_repo.distro_target,
+                   'url' => test_repo.url,
+                   'enabled' => test_repo.enabled,
+                   'autorefresh' => test_repo.autorefresh,
+                   'installer_updates' => test_repo.installer_updates,
+                   'description' => '<p> new unpretty repo description </p>' }
+    @repo_array = []
+    @repo_array.push @repo_data
+
+    @test_repo = SccRepository.new
+    @test_repo.description = @repo_data['description']
+    @test_repo.name = @repo_data['name']
+  end
+
+  test 'update scc repository' do
+    @account.update_scc_repositories(@repo_array)
+    @updated_repo = @account.scc_repositories.where(name: @test_repo.pretty_name).first
+    assert_equal @test_repo.pretty_name, @updated_repo.name
+    assert_equal @test_repo.pretty_name, @updated_repo.pretty_name
+  end
+end
+
 # FIXME: test cascaded delete

data/test/models/scc_product_test.rb

@@ -3,6 +3,8 @@ require 'test_plugin_helper'
 class SccProductCreateTest < ActiveSupport::TestCase
   def setup
     @product = scc_products(:one)
+    @product_with_ugly_description = scc_products(:two)
+    @product_with_normal_description = scc_products(:three)
   end
 
   test 'create' do
@@ -13,11 +15,26 @@ class SccProductCreateTest < ActiveSupport::TestCase
   test 'uniq_name' do
     assert_equal @product.uniq_name, '111 number one'
   end
+
+  test 'pretty_name' do
+    assert_equal @product.pretty_name, 'number one (id: 111)'
+  end
+
+  test 'pretty_description' do
+    assert_equal @product_with_normal_description.description,
+                 @product_with_normal_description.pretty_description
+    assert_equal @product.pretty_description, 'lorem ipsum dolor sit amet'
+    assert_equal @product_with_ugly_description.pretty_description, 'lorem ipsum dolor sit amet'
+  end
 end
 
 class SccProductSearchTest < ActiveSupport::TestCase
   test 'default ordered by name' do
-    assert_equal SccProduct.all.pluck(:name), ['one', 'two'].sort
+    product_names = ['one', 'two', 'three',
+                     'p_ext_1', 'p_ext_10', 'p_ext_2', 'p_ext_3',
+                     'p_ext_4', 'p_ext_5', 'p_ext_6', 'p_ext_7',
+                     'p_ext_8', 'p_ext_9']
+    assert_equal SccProduct.all.pluck(:name), product_names.sort
   end
 
   test 'search name' do
@@ -30,3 +47,54 @@ class SccProductSearchTest < ActiveSupport::TestCase
     assert_empty empty
   end
 end
+
+# These produt extension tests are pre-tests for the class ProductEmptyRepoAvailableTests.
+# They do not test any direct functionality of the plugin.
+class SccProductExtensionsTest < ActiveSupport::TestCase
+  def setup
+    @product_with_extensions = scc_products(:one)
+    @product_with_extensions.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+    @product_with_wrong_extensions = scc_products(:two)
+    @product_with_wrong_extensions.scc_extensions = [scc_products(:three)]
+    @product_without_extensions = scc_products(:three)
+  end
+
+  test 'check product extensions available' do
+    assert_equal @product_with_extensions.scc_extensions.count, 10
+    assert_not_empty @product_with_extensions.scc_extensions
+    assert_empty @product_without_extensions.scc_extensions
+  end
+
+  test 'product extension of correct type' do
+    assert_empty(@product_with_extensions.scc_extensions.reject { |p| p.product_type == 'extension' })
+    assert_not_empty(@product_with_wrong_extensions.scc_extensions.reject { |p| p.product_type == 'extension' })
+  end
+end
+
+class SccProductEmptyRepoAvailableTest < ActiveSupport::TestCase
+  def setup
+    @product_with_repos = scc_products(:one)
+    @product_with_repos.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+    @product_with_repos.scc_repositories = scc_repositories[0..2]
+    @product_with_repos.scc_extensions[1].scc_repositories = scc_repositories[3..4]
+    @product_with_repos.scc_extensions[2].scc_repositories = scc_repositories[5..7]
+  end
+
+  test 'products with empty repositories' do
+    products_with_repos = SccProduct.only_products_with_repos
+    assert_equal SccProduct.all.count { |prod| !prod.scc_repositories.empty? }, 3
+    assert_equal products_with_repos.count, 3
+  end
+end
+
+class SccProductNoRepoTest < ActiveSupport::TestCase
+  def setup
+    @product_with_repos = scc_products(:one)
+    @product_with_repos.scc_extensions = scc_products.select { |p| p.product_type == 'extension' }
+  end
+
+  test 'products without any repositories' do
+    products_with_repos = SccProduct.only_products_with_repos
+    assert_empty products_with_repos
+  end
+end

data/test/support/fixtures_support.rb

@@ -1,8 +1,9 @@
 module ForemanSccManager
   module FixturesSupport
     FIXTURE_CLASSES = {
-      scc_accounts: ForemanSccManager::SccAccount,
-      scc_products: ForemanSccManager::SccProduct
+      scc_accounts: ::SccAccount,
+      scc_products: ::SccProduct,
+      scc_repositories: ::SccRepository
     }.freeze
 
     def self.set_fixture_classes(test_class)

data/test/test_controller_helper.rb

@@ -0,0 +1,15 @@
+# This calls the main test_helper in Foreman-core
+require 'test_helper'
+# require "#{Katello::Engine.root}/test/katello_test_helper"
+
+require 'foreman_tasks/test_helpers'
+
+module SignInHelper
+  def sign_in_as(user)
+    post sign_in_url(username: user.login, password: user.password)
+  end
+end
+
+class ActionDispatch::IntegrationTest
+  include SignInHelper
+end

data/test/test_plugin_helper.rb

@@ -22,6 +22,7 @@ module FixtureTestCase
     Dir.mkdir(self.fixture_path)
     FileUtils.cp(Dir.glob("#{ForemanSccManager::Engine.root}/test/fixtures/models/*"), self.fixture_path)
     FileUtils.cp(Dir.glob("#{ForemanSccManager::Engine.root}/test/fixtures/files/*"), self.fixture_path)
+    FileUtils.cp(Dir.glob("#{ForemanSccManager::Engine.root}/test/fixtures/controllers/*"), self.fixture_path)
     FileUtils.cp(Dir.glob("#{Rails.root}/test/fixtures/*"), self.fixture_path)
     fixtures(:all)
     FIXTURES = load_fixtures(ActiveRecord::Base)
@@ -56,3 +57,11 @@ class ActiveSupport::TestCase
     organization
   end
 end
+
+class ActionController::TestCase
+  def set_session_user(user = :admin, org = :empty_organization)
+    user = user.is_a?(User) ? user : users(user)
+    org = org.is_a?(Organization) ? org : taxonomies(org)
+    { :user => user.id, :expires_at => 5.minutes.from_now, :organization_id => org.id }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.7
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -84,14 +84,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
 description: Foreman plugin to sync SUSE Customer Center products and repositories
@@ -153,6 +153,11 @@ files:
 - db/migrate/20170505063726_add_sync_status_to_scc_account.rb
 - db/migrate/20180321000000_change_sync_status_to_sync_task.rb
 - db/migrate/20190417202427_add_recurring_sync.foreman_scc_manager.rb
+- db/migrate/20200520281300_fix_scc_permissions.rb
+- db/migrate/20201119084201_add_gpg_key_to_scc_account.rb
+- db/migrate/20210205082733_add_subscription_valid_to_scc_products_and_repos.rb
+- db/migrate/20210210104407_add_root_repository_id_to_scc_repository.rb
+- db/migrate/20210224095050_connect_katello_root_repository_to_scc_repository.rb
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -161,13 +166,19 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_scc_manager.mo
+- locale/de/foreman_scc_manager.edit.po
 - locale/de/foreman_scc_manager.po
+- locale/de/foreman_scc_manager.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_scc_manager.mo
+- locale/en/foreman_scc_manager.edit.po
 - locale/en/foreman_scc_manager.po
+- locale/en/foreman_scc_manager.po.time_stamp
 - locale/foreman_scc_manager.pot
 - locale/gemspec.rb
 - test/controllers/api/v2/scc_accounts_test.rb
 - test/controllers/api/v2/scc_products_test.rb
+- test/controllers/scc_accounts_controller_test.rb
+- test/controllers/scc_accounts_controller_test2.rb
 - test/factories/foreman_scc_manager_factories.rb
 - test/features/sync_test.rb
 - test/fixtures/files/data_products_page1.json
@@ -175,10 +186,13 @@ files:
 - test/fixtures/files/data_repositories.json
 - test/fixtures/files/data_subscriptions.json
 - test/fixtures/models/scc_accounts.yml
+- test/fixtures/models/scc_extendings.yml
 - test/fixtures/models/scc_products.yml
+- test/fixtures/models/scc_repositories.yml
 - test/models/scc_account_test.rb
 - test/models/scc_product_test.rb
 - test/support/fixtures_support.rb
+- test/test_controller_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_scc_manager_test.rb
 homepage: https://www.orcharhino.com/
@@ -200,23 +214,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Suse Customer Center plugin for Foreman
 test_files:
+- test/unit/foreman_scc_manager_test.rb
+- test/test_controller_helper.rb
+- test/features/sync_test.rb
+- test/models/scc_product_test.rb
+- test/models/scc_account_test.rb
+- test/factories/foreman_scc_manager_factories.rb
 - test/controllers/api/v2/scc_accounts_test.rb
 - test/controllers/api/v2/scc_products_test.rb
-- test/test_plugin_helper.rb
-- test/features/sync_test.rb
+- test/controllers/scc_accounts_controller_test2.rb
+- test/controllers/scc_accounts_controller_test.rb
 - test/support/fixtures_support.rb
-- test/fixtures/models/scc_products.yml
 - test/fixtures/models/scc_accounts.yml
-- test/fixtures/files/data_subscriptions.json
+- test/fixtures/models/scc_repositories.yml
+- test/fixtures/models/scc_products.yml
+- test/fixtures/models/scc_extendings.yml
+- test/fixtures/files/data_products_page2.json
 - test/fixtures/files/data_products_page1.json
+- test/fixtures/files/data_subscriptions.json
 - test/fixtures/files/data_repositories.json
-- test/fixtures/files/data_products_page2.json
-- test/models/scc_product_test.rb
-- test/models/scc_account_test.rb
-- test/unit/foreman_scc_manager_test.rb
-- test/factories/foreman_scc_manager_factories.rb
+- test/test_plugin_helper.rb