Skip to content
This repository has been archived by the owner on Apr 7, 2018. It is now read-only.

Commit

Permalink
Remove the remaining system gem reference
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Jan 6, 2017
1 parent b9199e1 commit cf34cc4
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ Lint/UselessAssignment:
Exclude:
- 'libraries/omnitrucker.rb'

Performance/DoubleStartEndWith:
Exclude:
- 'recipes/remove_chef_system_gem.rb'

# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
# NamePrefix: is_, has_, have_
# NamePrefixBlacklist: is_, has_, have_
Expand Down
4 changes: 0 additions & 4 deletions recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,3 @@
include_recipe 'omnibus_updater::downloader'
include_recipe 'omnibus_updater::installer'
end

if node['omnibus_updater']['remove_chef_system_gem']
include_recipe 'omnibus_updater::remove_chef_system_gem'
end
16 changes: 0 additions & 16 deletions spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,4 @@
it 'includes the old_package_cleaner recipe' do
expect(chef_run).to include_recipe('omnibus_updater::old_package_cleaner')
end

it 'does not include the remove_chef_system_gem recipe' do
expect(chef_run).to_not include_recipe('omnibus_updater::remove_chef_system_gem')
end
end

describe 'omnibus_updater::default with remove_chef_system_gem set' do
let(:chef_run) do
ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04') do |node|
node.normal['omnibus_updater']['remove_chef_system_gem'] = true
end.converge('omnibus_updater::default')

it 'includes the remove_chef_system_gem recipe' do
expect(chef_run).to include_recipe('omnibus_updater::remove_chef_system_gem')
end
end
end

0 comments on commit cf34cc4

Please sign in to comment.