Merge branch 'fix_tests' into rspec-fail-fast

voxpupuli · Feb 10, 2022 · 954d11d · 954d11d
2 parents 64c71c8 + 1fdd2c8
commit 954d11d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,12 @@ if ENV['PUPPET_VERSION']
   gem 'puppet', ENV['PUPPET_VERSION']
 end
 
+group :test do
+  # Required for the final controlrepo tests
+  gem 'toml-rb'
+end
+
+
 # Evaluate Gemfile.local if it exists
 if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)

diff --git a/spec/fixtures/controlrepos/puppet_controlrepo b/spec/fixtures/controlrepos/puppet_controlrepo
+3 −0		Gemfile
+7 −5		Puppetfile
+1 −1		site-modules/profile/manifests/metrics/dashboard.pp
+1 −1		site-modules/role/manifests/puppetmaster/basic.pp