fix tests

cristifalcas · Sep 12, 2016 · 5d71edc · 5d71edc
1 parent 43cd60d
commit 5d71edc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,22 +1,22 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : "~> 3.0"
-gem 'rake'
+gem 'rake', '~> 10'
 gem 'rspec-puppet', '~> 2.0'
 gem 'puppetlabs_spec_helper', '>= 0.8.0'
 gem 'puppet-lint', '>= 1'
 gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-empty_string-check'
 gem 'puppet-lint-spaceship_operator_without_tag-check'
-gem 'puppet-lint-variable_contains_upcase'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-undef_in_function-check'
 gem 'puppet-lint-leading_zero-check'
 gem 'puppet-lint-trailing_comma-check'
 gem 'puppet-lint-file_ensure-check'
+gem 'puppet-lint-variable_contains_upcase'
 gem 'simplecov'
 gem 'rspec-puppet-facts'
 gem 'metadata-json-lint'
 gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
-gem 'json'
-
+gem 'json', '< 2.0', {"platforms"=>["ruby_18"]}
+gem 'json_pure', '< 2.0', {"platforms"=>["ruby_18"]}
diff --git a/Rakefile b/Rakefile
@@ -17,7 +17,6 @@ PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 PuppetLint.configuration.send('disable_empty_string_assignment')
-PuppetLint.configuration.send('disable_variable_contains_upcase')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -16,8 +16,8 @@
   $options = undef
 ) inherits journald::params {
   if $::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '7.0') >= 0 {
-    contain journald::config
-    contain journald::service
+    contain ::journald::config
+    contain ::journald::service
 
     Class['journald::config'] ~>
     Class['journald::service']

diff --git a/metadata.json b/metadata.json
@@ -1,7 +1,7 @@
 {
 	"name": "cristifalcas-journald",
 	"author": "Cristian Falcas",
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"dependencies": [{
 			"name": "puppetlabs/stdlib",
 			"version_requirement": "4.x"

diff --git a/tests/init.pp b/tests/init.pp
@@ -1 +1 @@
-include journald
+include ::journald