Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use voxpupuli-acceptance #647

Merged
merged 1 commit into from
Apr 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions config_defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
# values will replace @@SET@@ with the docker_sets' value
- rvm: 2.5.3
services: docker
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
env: BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_setfile=@@SET@@ CHECK=beaker
bundler_args: --without development release
- rvm: 2.5.3
services: docker
env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=@@SET@@ BEAKER_HYPERVISOR=docker CHECK=beaker
env: BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_setfile=@@SET@@ CHECK=beaker
bundler_args: --without development release
includes:
- rvm: 2.4.4
Expand Down Expand Up @@ -49,22 +49,7 @@ Gemfile:
- gem: overcommit
version: '>= 0.39.1'
':system_tests':
- gem: winrm
- gem: beaker-rspec
version: '>= 6'
- gem: serverspec
- gem: beaker-hostgenerator
version: '>= 1.1.22'
- gem: beaker-docker
- gem: beaker-puppet
- gem: beaker-puppet_install_helper
- gem: beaker-module_install_helper
require: false
- gem: rbnacl
version: '>= 4'
- gem: rbnacl-libsodium
- gem: bcrypt_pbkdf
- gem: ed25519
- gem: voxpupuli-acceptance
':release':
- gem: github_changelog_generator
git: https://github.com/voxpupuli/github-changelog-generator
Expand Down Expand Up @@ -120,6 +105,8 @@ spec/acceptance/nodesets/windows-2012R2-serverstandard-x64.yml:
delete: true
spec/spec_helper.rb:
mock_with: false
spec/spec_helper_acceptance.rb:
unmanaged: true
CONTRIBUTING.md:
delete: true
...
Expand Down
3 changes: 3 additions & 0 deletions moduleroot/spec/spec_helper_acceptance.rb.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require 'voxpupuli/acceptance/spec_helper_acceptance'

configure_beaker