foreman_scc_manager 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d297d61cfdedf0fb329cba44d7925c052c1c8e80f8f0ec58b1435b90b229fe
-  data.tar.gz: 3b434307e158ce5b45ad3e719a7538895a8bcf8d01c98f449561c8d18d4ba87f
+  metadata.gz: 7a0b1fc3df2a088cefb4344e848995955fb81a5478cf4500268c68f32ccf0bec
+  data.tar.gz: ae3c19f91491ba06228c59f6314e28d5c8525d8936e89c5a82af092a71dd4e85
 SHA512:
-  metadata.gz: b31980bb5ef8302a4015ddc5338a7cbb217e666c271ae03781ba530d3823a8608e8afd9d686f80113280ed9033a033b9988fcf8a7a376e791ed2e4a30d7bf159
-  data.tar.gz: 8ebaf1d499fbe65e28c61177ddfbbc6efdf6d1438dc854493686b3842d41ae8a0d9f3bb6ef66bede4ecb2c5c0c82a40da50221e376d96974e0bca18a684a6eb5
+  metadata.gz: 57f473572bfc7342b44765343b168e94bb55ba479bb17d7a9236703bcb5cb7f2cad615b16d76934790a739037eb5b724e70ff637c17e7d95aaaa6dc993eb3bd2
+  data.tar.gz: 6569d327e0ccb6c251a823ae3af6a3bd1a40d44edc9878fd4b538303ec242a8f594dffd0e8fb951ae371c8b22ae13f16a0120ac78a6f9cb4a5bf2dabd33781fb

data/app/controllers/api/v2/scc_accounts_controller.rb

@@ -18,7 +18,7 @@ module Api
       def index
         scope = resource_scope
         scope = scope.where(:organization => params[:organization_id]) if params[:organization_id].present?
-        @scc_accounts = scope.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+        @scc_accounts = scope.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page], :per_page => params[:per_page])
       end
 
       api :GET, '/scc_accounts/:id/', N_('Show scc_account')
@@ -34,7 +34,8 @@ module Api
           param :password, String, :required => true, :desc => N_('Password of scc_account')
           param :base_url, String, :required => false, :desc => N_('URL of SUSE for scc_account')
           param :interval, ['never', 'daily', 'weekly', 'monthy'], :desc => N_('Interval for syncing scc_account')
-          param :sync_date, String, :desc => N_('Last Sync time of scc_account')
+          param :sync_date, String, :desc => N_('Date and time relative to which the sync interval is run')
+          param :katello_gpg_key_id, :identifier, :required => false, :desc => N_('Associated gpg key of scc_account')
         end
       end
 
@@ -79,9 +80,9 @@ module Api
         end
         respond_to do |format|
           if @scc_account.test_connection
-            format.json { render json: 'Success'.to_json, status: :ok }
+            format.json { render json: { 'success' => true }.to_json, status: :ok }
           else
-            format.json { render json: 'Failed'.to_json, status: :not_found }
+            format.json { render json: { 'success' => false, 'error' => 'Test failed. Check your credentials.' }.to_json, status: :not_found }
           end
         end
       end
@@ -102,7 +103,7 @@ module Api
 
       api :PUT, '/scc_accounts/:id/bulk_subscribe/', N_('Bulk subscription of scc_products for scc_account')
       param :id, :identifier_dottable, :required => true
-      param :scc_subscribe_product_ids, Array
+      param :scc_subscribe_product_ids, Array, :required => true
       def bulk_subscribe
         scc_products_to_subscribe = @scc_account.scc_products.where(:id => params[:scc_subscribe_product_ids])
         respond_to do |format|
@@ -112,7 +113,7 @@ module Api
                                                      scc_products_to_subscribe)
             format.json { render json: subscribe_task.to_json, status: :ok }
           else
-            format.json { render json: 'No Product selected'.to_json, status: :expectation_failed }
+            format.json { render json: { error: 'No Product selected' }, status: :expectation_failed }
           end
         end
       rescue ::Foreman::Exception => e
@@ -132,7 +133,8 @@ module Api
           :base_url,
           :interval,
           :sync_date,
-          :organization_id
+          :organization_id,
+          :katello_gpg_key_id
         )
       end
 

data/app/controllers/scc_accounts_controller.rb

@@ -2,13 +2,14 @@ class SccAccountsController < ApplicationController
   helper_method :scc_filtered_products
   before_action :find_organization
   before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
+  before_action :find_available_gpg_keys, only: %i[new edit]
   include Foreman::Controller::AutoCompleteSearch
 
   # GET /scc_accounts
   def index
-    @scc_accounts = resource_base.search_for(params[:search], order: params[:order])
-                                 .paginate(page: params[:page])
-
+    @scc_accounts = resource_base.where(organization: @organization)
+                                 .search_for(params[:search], order: params[:order])
+                                 .paginate(:page => params[:page], :per_page => params[:per_page])
     # overwrite the product list with filtered products that do not include products with empty repositories
     @scc_accounts.each do |scc_account|
       scc_account.scc_products_with_repos_count = scc_account.scc_products.only_products_with_repos.count
@@ -98,6 +99,11 @@ class SccAccountsController < ApplicationController
 
   private
 
+  def find_available_gpg_keys
+    @scc_account ? org = @scc_account.organization : org = @organization
+    @selectable_gpg_keys = ::Katello::GpgKey.where(organization: org).collect { |p| [p.name, p.id] }.unshift ['None', nil]
+  end
+
   def find_organization
     @organization = Organization.current
     redirect_to '/select_organization?toState=' + request.path unless @organization
@@ -114,7 +120,8 @@ class SccAccountsController < ApplicationController
       :base_url,
       :interval,
       :sync_date,
-      :organization_id
+      :organization_id,
+      :katello_gpg_key_id
     )
   end
 

data/app/lib/actions/scc_manager/subscribe_product.rb

@@ -8,15 +8,16 @@ module Actions
                           .info("Initiating subscription for SccProduct '#{scc_product.friendly_name}'.")
         sequence do
           product_create_action = plan_action(CreateProduct,
-                                              product_name: scc_product.uniq_name,
-                                              product_description: scc_product.description,
-                                              organization_id: scc_product.organization.id)
+                                              :product_name => scc_product.pretty_name,
+                                              :product_description => scc_product.pretty_description,
+                                              :organization_id => scc_product.organization.id,
+                                              :gpg_key => scc_product.scc_account.katello_gpg_key_id)
           scc_product.scc_repositories.each do |repo|
-            uniq_name = scc_product.uniq_name + ' ' + repo.description
             arch = scc_product.arch || 'noarch'
             plan_action(CreateRepository,
                         :product_id => product_create_action.output[:product_id],
-                        :uniq_name => uniq_name,
+                        :uniq_name => repo.uniq_name(scc_product),
+                        :pretty_repo_name => repo.pretty_name,
                         :url => repo.full_url,
                         :arch => arch)
           end
@@ -43,6 +44,7 @@ module Actions
       def create_sub_plans
         product = ::Katello::Product.new
         product.name = input[:product_name]
+        product.gpg_key = ::Katello::GpgKey.find_by(id: input[:gpg_key], organization: input[:organization_id])
         product.description = input[:product_description]
         trigger(::Actions::Katello::Product::Create,
                 product,
@@ -58,12 +60,11 @@ module Actions
 
       def create_sub_plans
         product = ::Katello::Product.find(input[:product_id])
-        uniq_name = input[:uniq_name]
-        label = ::Katello::Util::Model.labelize(uniq_name)
+        label = ::Katello::Util::Model.labelize(input[:uniq_name])
         unprotected = true
         gpg_key = product.gpg_key
         repo_param = { :label => label,
-                       :name => uniq_name,
+                       :name => input[:pretty_repo_name],
                        :url => input[:url],
                        :content_type => 'yum',
                        :unprotected => unprotected,

data/app/models/scc_account.rb

@@ -179,13 +179,14 @@ class SccAccount < ApplicationRecord
     # import repositories
     upstream_repositories.each do |ur|
       cached_repository = scc_repositories.find_or_initialize_by(scc_id: ur['id'])
-      cached_repository.name = ur['name']
       cached_repository.distro_target = ur['distro_target']
       cached_repository.description = ur['description']
       cached_repository.url, cached_repository.token = ur['url'].split('?')
       cached_repository.enabled = ur['enabled']
       cached_repository.autorefresh = ur['autorefresh']
       cached_repository.installer_updates = ur['installer_updates']
+      # should be called after all attributes are set in case of dependencies (currently: description)
+      cached_repository.name = cached_repository.pretty_name
       cached_repository.save!
       upstream_repo_ids << ur['id']
     end
@@ -201,7 +202,6 @@ class SccAccount < ApplicationRecord
     # import products
     upstream_products.each do |up|
       cached_product = scc_products.find_or_initialize_by(scc_id: up['id'])
-      cached_product.name = up['name']
       cached_product.version = up['version']
       cached_product.arch = up['arch']
       cached_product.description = up['description']
@@ -209,6 +209,9 @@ class SccAccount < ApplicationRecord
       cached_product.product_type = up['product_type']
       cached_product.scc_repositories =
         scc_repositories.where(scc_id: up['repositories'].map { |repo| repo['id'] })
+      # name should be set after friendly_name because it depends on friendly_name
+      cached_product.name = cached_product.pretty_name
+      cached_product.description = cached_product.pretty_description
       cached_product.save!
       upstream_product_ids << up['id']
     end

data/app/models/scc_product.rb

@@ -27,12 +27,28 @@ class SccProduct < ApplicationRecord
     "#{scc_id} " + friendly_name
   end
 
+  def pretty_name
+    friendly_name + " (id: #{scc_id})"
+  end
+
+  # Remove HTML tags (currently assumed that there are only paragraph tags)
+  # Remove second HTML paragraph if available
+  def pretty_description
+    new_description = Nokogiri::XML(description).xpath('//p')
+    # No tags to remove
+    if new_description.count == 0
+      description
+    else
+      new_description.first.children.first.text.strip
+    end
+  end
+
   def subscribe
     raise 'Product already subscribed!' if product
 
     new_product = Katello::Product.new
-    new_product.name = uniq_name
-    new_product.description = description
+    new_product.name = pretty_name
+    new_product.description = pretty_description
     ForemanTasks.sync_task(::Actions::Katello::Product::Create, new_product, scc_account.organization)
     new_product.reload
     scc_repositories.each do |repo|

data/app/models/scc_repository.rb

@@ -15,6 +15,10 @@ class SccRepository < ApplicationRecord
     scc_product.uniq_name + ' ' + description
   end
 
+  def pretty_name
+    description
+  end
+
   def token_changed_callback
     User.current ||= User.anonymous_admin
     scc_products.where.not(product: nil).find_each do |sp|

data/app/views/scc_accounts/_form.html.erb

@@ -1,3 +1,4 @@
+<!-- see foreman/app/helper/form_helper.rb -->
 <% javascript 'foreman_scc_manager/scc_accounts'  %>
 
 <%= form_for(@scc_account) do |f| %>
@@ -18,6 +19,11 @@
         <%= field f, :sync_date, label: _('Sync Date') do
           f.datetime_field :sync_date, placeholder: Time.now
         end %>
+       <%= selectable_f f, :katello_gpg_key_id, @selectable_gpg_keys, {}, 
+                        { :include_blank => _("None"), 
+                          :label => _('Use GPG key for SUSE products'), 
+                          :selected => @scc_account.katello_gpg_key_id, 
+                          :help_block => _("Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later.") } %>
         <div class='clearfix'>
           <div class='form-group'>
             <div class='col-md-2'></div>

data/app/views/scc_accounts/show.html.erb

@@ -1,3 +1,5 @@
+<% title (_("Product Selection for Account %s") % @scc_account) %>
+
 <% javascript 'foreman_scc_manager/scc_accounts' %>
 <%= form_for([:bulk_subscribe, @scc_account], method: :put) do |f| %>
   <% def render_list_node(f, scc_product, parent_id = "") %>
@@ -5,11 +7,12 @@
       <span class="scc_product_checkbox" id="<%= "scc_product_span_#{parent_id + "_" + scc_product.id.to_s}" %>" <%= "data-parent=scc_product_span_#{parent_id}" if parent_id != "" %>>
         <% if scc_product.product %>
           <%= check_box_tag("scc_account[scc_unsubscribe_product_ids][]", scc_product.id, true, disabled: true) %>
+          <%= link_to(scc_product.pretty_name, "/products/#{scc_product.product_id}") %>
         <% else %>
           <%= check_box_tag("scc_account[scc_subscribe_product_ids][]", scc_product.id, false) %>
+          <%= scc_product.pretty_name %>
         <% end %>
       </span>
-      <%= scc_product.friendly_name %>
       <% if scc_product.scc_extensions.any? %>
         <ul style='padding-left: 20px;'>
           <% scc_filtered_products(scc_product.scc_extensions, 'extension').each do |scc_extension| %>
@@ -41,3 +44,4 @@
     <%= submit_or_cancel f, false, {disabled: submit_disabled || false} %>
   </div>
 <% end %>
+

data/db/migrate/20201119084201_add_gpg_key_to_scc_account.rb

@@ -0,0 +1,6 @@
+class AddGpgKeyToSccAccount < ActiveRecord::Migration[5.2]
+  def change
+    add_column :scc_accounts, :katello_gpg_key_id, :integer,  null: true
+    add_foreign_key :scc_accounts, :katello_gpg_keys, column: :katello_gpg_key_id, on_delete: :nullify
+  end
+end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '1.8.5'.freeze
+  VERSION = '1.8.6'.freeze
 end

data/locale/foreman_scc_manager.pot

@@ -192,6 +192,14 @@ msgid ""
 " of any imported products."
 msgstr ""
 
+#: ../app/views/scc_accounts/_form.html.erb:22
+msgid "Use GPG key for SUSE products"
+msgstr ""
+
+#: ../app/views/scc_accounts/_form.html.erb:22
+msgid "Use this setting if you want to automatically add a GPG key to your SUSE products upon subscription. You can change this setting in the 'Content' > 'Products' menu, later."
+msgstr ""
+
 #: ../app/views/scc_accounts/_form.html.erb:18
 msgid "Sync Date"
 msgstr ""

data/test/controllers/api/v2/scc_accounts_test.rb

@@ -236,7 +236,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert account
     post :test_connection, params: { :scc_account => { :login => account.login, :password => account.password, :base_url => account.base_url } }
     assert_response :not_found
-    assert_match response.body, '"Failed"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_equal body['success'], false
   end
 
   test 'existing account SCC server connection-test' do
@@ -260,7 +262,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     assert account
     post :test_connection, params: { :id => account.id }
     assert_response :not_found
-    assert_match response.body, '"Failed"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_equal body['success'], false
   end
 
   test 'SCC server sync products' do
@@ -289,7 +293,9 @@ class Api::V2::SccAccountsControllerTest < ActionController::TestCase
     account.scc_products = [product1, product2]
     put :bulk_subscribe, params: { :id => account.id, :scc_subscribe_product_ids => [] }
     assert_response :expectation_failed
-    assert_match response.body, '"No Product selected"'
+    body = ActiveSupport::JSON.decode(@response.body)
+    assert body.key? 'error'
+    assert_match body['error'], 'No Product selected'
   end
 
   test 'should delete scc_account' do

data/test/controllers/scc_accounts_controller_test.rb

@@ -0,0 +1,104 @@
+require 'test_plugin_helper'
+
+class SccAccountsControllerTest < ActionController::TestCase
+  def setup
+    @scc_account = scc_accounts(:one)
+  end
+
+  def stub_custom_request(url, host = 'scc.example.com', auth = 'Basic b25ldXNlcjpvbmVwYXNz')
+    stub_request(:get, url)
+      .with(
+        headers: {
+          'Accept' => 'application/vnd.scc.suse.com.v4+json',
+          'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+          'Authorization' => auth,
+          'Host' => host,
+          'User-Agent' => "rest-client/2.1.0 (linux-gnu x86_64) ruby/#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+        }
+      )
+      .to_return(status: 200, body: '', headers: {})
+  end
+
+  test 'should get new' do
+    get :new, session: set_session_user
+    assert_response :success
+    assert_select 'title', 'Add SUSE Customer Center Account'
+  end
+
+  test 'should get edit' do
+    get :edit, params: { :id => @scc_account.id }, session: set_session_user
+    assert_response :success
+    assert_select 'title', "Edit #{@scc_account.name}"
+  end
+
+  test 'should get index' do
+    get :index, session: set_session_user
+    assert_response :success
+    assert_not_nil assigns(:scc_accounts)
+    body = @response.body
+    assert_not_empty body
+    assert_select 'title', 'SUSE subscriptions'
+  end
+
+  test 'should show scc_account' do
+    get :show, params: { :id => @scc_account.id }, session: set_session_user
+
+    assert_not_nil assigns(:scc_account)
+    assert_response :success
+    assert_select 'title', "Product Selection for Account #{@scc_account.name}"
+  end
+
+  test 'should 404 for unknown scc_account' do
+    get :show, params: { :id => 'does-not-exist' }, session: set_session_user
+
+    assert_response :not_found
+  end
+
+  test 'should create scc_account' do
+    account = scc_accounts(:two)
+    organization = get_organization
+    assert organization
+    assert account
+    assert_difference('SccAccount.count') do
+      post :create, params:
+                        { :scc_account => { :name => account.name, :login => account.login, :password => account.password, :organization_id => organization.id } },
+                    session: set_session_user
+    end
+  end
+
+  test 'should update scc_account' do
+    account = scc_accounts(:two)
+    put :update, params: { id: account.id, :scc_account => { :sync_date => Time.now, :interval => 'weekly' } }, session: set_session_user
+
+    assert_equal 'weekly', assigns(:scc_account).interval
+  end
+
+  test 'SCC server sync products' do
+    stub_custom_request('https://scc.example.com/connect/organizations/products')
+    stub_custom_request('https://scc.example.com/connect/organizations/repositories')
+
+    account = scc_accounts(:one)
+    assert account
+    put :sync, params: { :id => account.id }, session: set_session_user
+    assert_redirected_to '/scc_accounts'
+  end
+
+  test 'SCC server bulk subscribe products' do
+    stub_custom_request('https://scc.example.com/connect/organizations/repositories')
+
+    account = scc_accounts(:one)
+    product1 = scc_products(:one)
+    product2 = scc_products(:two)
+    account.scc_products = [product1, product2]
+    put :bulk_subscribe, params: { :id => account.id, :scc_account => { :scc_subscribe_product_ids => [product1.id, product2.id] } }, session: set_session_user
+
+    assert_redirected_to '/scc_accounts'
+  end
+
+  test 'should delete scc_account' do
+    account = scc_accounts(:two)
+    assert_difference 'SccAccount.count', -1 do
+      delete :destroy, params: { :id => account.id }, session: set_session_user
+    end
+  end
+end

data/test/controllers/scc_accounts_controller_test2.rb

@@ -0,0 +1,51 @@
+require 'test_plugin_helper'
+
+class SccAccountsControllerTest2 < ActionDispatch::IntegrationTest
+  setup do
+    @scc_account = scc_accounts(:one)
+  end
+
+  test 'should get index' do
+    get scc_accounts_url, session: set_session_user
+    # post path, params: { :id => "#{taxonomies(:empty_organization).id}-#{taxonomies(:empty_organization).name}" }
+    # post path, params: {:toState => scc_accounts_url, :bastion_page => "select_organization"}
+    # follow_redirect!
+    assert_response :success
+  end
+
+  test 'should get new' do
+    get new_scc_account_url
+    assert_response :success
+  end
+
+  test 'should create scc_account' do
+    assert_difference('SccAccount.count') do
+      post scc_accounts_url, params: { scc_account: {} }
+    end
+
+    assert_redirected_to scc_account_url(SccAccount.last)
+  end
+
+  test 'should show scc_account' do
+    get scc_account_url(@scc_account)
+    assert_response :success
+  end
+
+  test 'should get edit' do
+    get edit_scc_account_url(@scc_account)
+    assert_response :success
+  end
+
+  test 'should update scc_account' do
+    patch scc_account_url(@scc_account), params: { scc_account: {} }
+    assert_redirected_to scc_account_url(@scc_account)
+  end
+
+  test 'should destroy scc_account' do
+    assert_difference('SccAccount.count', -1) do
+      delete scc_account_url(@scc_account)
+    end
+
+    assert_redirected_to scc_accounts_url
+  end
+end

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,7 +7,7 @@ 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
 
 two:
@@ -17,7 +17,7 @@ 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
 
 three:

data/test/fixtures/models/scc_repositories.yml

@@ -13,3 +13,17 @@ repo_<%= i %>:
   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,68 @@ 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
+  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,6 +15,17 @@ 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

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.5
+  version: 1.8.6
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -154,6 +154,7 @@ files:
 - 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
 - lib/foreman_scc_manager.rb
 - lib/foreman_scc_manager/engine.rb
 - lib/foreman_scc_manager/version.rb
@@ -169,6 +170,8 @@ files:
 - 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
@@ -176,11 +179,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/
@@ -207,19 +212,23 @@ 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_accounts.yml
 - test/fixtures/models/scc_repositories.yml
 - test/fixtures/models/scc_products.yml
-- test/fixtures/models/scc_accounts.yml
-- test/fixtures/files/data_subscriptions.json
+- 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