Skip to content

Commit 06a19b2

Browse files
authored
Merge pull request #175 from glennsarti/ticket/maint/remove-simplecov-gem
(FM-5387) Remove simplecov gem and update for modsync
2 parents ed1ee4d + 54a3c0a commit 06a19b2

File tree

5 files changed

+6
-29
lines changed

5 files changed

+6
-29
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ coverage/
1313
.*.sw[op]
1414
.DS_Store
1515
.rspec
16+
tmp/
1617

.sync.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,9 @@ CONTRIBUTING.md:
1010
unmanaged: true
1111
Gemfile:
1212
supports_windows: true
13-
required:
13+
optional:
1414
':development':
15-
- gem: rake
16-
version: '~>10.1'
17-
- gem: rspec
18-
version: '~>3.0'
19-
- gem: puppet-lint
20-
- gem: puppetlabs_spec_helper
21-
version: '~>0.10.3'
22-
- gem: puppet_facts
23-
- gem: mocha
24-
version: '~>0.10.5'
25-
- gem: pry
26-
- gem: simplecov
2715
- gem: yard
28-
':system_tests':
29-
- gem: beaker-rspec
30-
- gem: beaker
31-
- gem: beaker-puppet_install_helper
3216
Rakefile:
3317
unmanaged: true
3418
spec/spec_helper.rb:

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ end
3636
#end
3737

3838
group :development do
39-
gem 'rake', '~>10.1', :require => false
39+
gem 'rake', :require => false
4040
gem 'rspec', '~>3.0', :require => false
4141
gem 'puppet-lint', :require => false
4242
gem 'puppetlabs_spec_helper', '~>0.10.3', :require => false
4343
gem 'puppet_facts', :require => false
4444
gem 'mocha', '~>0.10.5', :require => false
4545
gem 'pry', :require => false
46-
gem 'simplecov', :require => false
4746
gem 'yard', :require => false
4847
end
4948

Rakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
require 'puppetlabs_spec_helper/rake_tasks'
22
require 'puppet-lint/tasks/puppet-lint'
33

4+
# Line length test is 80 chars in puppet-lint 1.1.0
45
PuppetLint.configuration.send('disable_80chars')
6+
# Line length test is 140 chars in puppet-lint 2.x
7+
PuppetLint.configuration.send('disable_140chars')
58
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
69

710
desc "Validate manifests, templates, and ruby files"

spec/spec_helper.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require 'simplecov'
21
require 'rspec-puppet'
32
require 'puppetlabs_spec_helper/module_spec_helper'
43

@@ -12,12 +11,3 @@
1211
end
1312
end
1413

15-
SimpleCov.start do
16-
add_group "Functions", "lib/puppet/parser/functions"
17-
add_group "Types", "lib/puppet/type/"
18-
add_group "Provider", "lib/puppet/provider"
19-
add_group "Manifests", "manifests"
20-
add_group "PuppetX", "lib/puppet_x/"
21-
add_filter "/spec/"
22-
end
23-

0 commit comments

Comments
 (0)