Skip to content

Commit

Permalink
Don't disable recommended extensions for a base product
Browse files Browse the repository at this point in the history
  • Loading branch information
tmuntaner committed Apr 23, 2018
1 parent 07ed85e commit 98d1c7a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 6 deletions.
12 changes: 7 additions & 5 deletions lib/rmt/cli/products.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ def change_product(target, set_enabled)
products = Product.where(conditions).to_a
end

products.each do |product|
extensions = Product.recommended_extensions(product.id).to_a
next if extensions.empty?
puts "The following required extensions for #{product.product_string} have been enabled: #{extensions.pluck(:name).join(', ')}."
products.push(*extensions)
if set_enabled
products.each do |product|
extensions = Product.recommended_extensions(product.id).to_a
next if extensions.empty?
puts "The following required extensions for #{product.product_string} have been enabled: #{extensions.pluck(:name).join(', ')}."
products.push(*extensions)
end
end

repo_count = repository_service.change_mirroring_by_product!(set_enabled, products.uniq)
Expand Down
18 changes: 17 additions & 1 deletion spec/lib/rmt/cli/products_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
end
end

context 'with recommended products' do
context 'with recommended extensions' do
let(:product) { create :product, :with_not_mirrored_repositories, :with_recommended_extensions }
let(:extensions) { Product.recommended_extensions(product).to_a }
let(:products) { [product] + extensions }
Expand Down Expand Up @@ -198,6 +198,22 @@
expect(repository.mirroring_enabled).to eq(false)
end
end

context 'with recommended extensions' do
let(:product) { create :product, :with_mirrored_repositories, :with_recommended_extensions }
let(:extensions) { Product.recommended_extensions(product).to_a }

it 'disabled the mandatory product repositories' do
product.repositories.each do |repository|
expect(repository.mirroring_enabled).to eq(false)
end
extensions.each do |extension|
extension.repositories.each do |repository|
expect(repository.mirroring_enabled).to eq(false)
end
end
end
end
end

context 'by product string' do
Expand Down

0 comments on commit 98d1c7a

Please sign in to comment.