From 2683f2b448d93331f885d7feb819d6c88fdf2323 Mon Sep 17 00:00:00 2001 From: Patrick Riehecky Date: Mon, 28 Aug 2023 13:44:24 -0500 Subject: [PATCH] Try to use vox acceptance tests --- .sync.yml | 5 +++-- Gemfile | 1 - spec/spec_helper_acceptance.rb | 36 +++++----------------------------- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/.sync.yml b/.sync.yml index ecfaf514..aeee4b79 100644 --- a/.sync.yml +++ b/.sync.yml @@ -23,8 +23,9 @@ Gemfile: ':test': - gem: 'mocha' version: '~> 1.10.0' - ':system_tests': - - gem: 'simp-beaker-helpers' + +spec/spec_helper_acceptance.rb: + unmanaged: false .rubocop.yml: default_configs: diff --git a/Gemfile b/Gemfile index 02d669c4..096575c4 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,6 @@ end group :system_tests do gem 'voxpupuli-acceptance', '~> 2.0', :require => false - gem 'simp-beaker-helpers', :require => false end group :release do diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 4235f3e1..2681792e 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,36 +1,10 @@ # frozen_string_literal: true -require 'beaker-rspec' -require 'tmpdir' -require 'yaml' -require 'simp/beaker_helpers' -# rubocop:disable Style/MixinUsage -include Simp::BeakerHelpers -# rubocop:enable Style/MixinUsage +# Managed by modulesync - DO NOT EDIT +# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ -UNSUPPORTED_PLATFORMS = %w[windows Darwin].freeze +require 'voxpupuli/acceptance/spec_helper_acceptance' -unless ENV['BEAKER_provision'] == 'no' - hosts.each do |host| - # Install Puppet - if host.is_pe? - install_pe - else - install_puppet - end - end -end +configure_beaker(modules: :metadata) -RSpec.configure do |c| - # ensure that environment OS is ready on each host - fix_errata_on hosts - - # Readable test descriptions - c.formatter = :documentation - - # Configure all nodes in nodeset - c.before :suite do - # Install modules and dependencies from spec/fixtures/modules - copy_fixture_modules_to(hosts) - end -end +Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }