Merge pull request #110 from ekohl/acceptance-tests

Add acceptance tests to CI

.github/workflows/test.yml

@@ -3,6 +3,9 @@ name: Test
 on:
   - pull_request
 
+env:
+  BEAKER_HYPERVISOR: docker
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -27,3 +30,5 @@ jobs:
           bundler-cache: true
       - name: Verify gem builds
         run: bundle exec gem build beaker-rspec.gemspec
+      - name: Run acceptance tests
+        run: bundle exec rake beaker

Gemfile

@@ -10,20 +10,18 @@ def location_for(place, fake_version = nil)
   end
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-
-if beaker_version
+if (beaker_version = ENV['BEAKER_VERSION'])
   gem 'beaker', *location_for(beaker_version)
-else
-  gem 'beaker'
 end
 
-# For running the spec/acceptance/example_spec.rb
-gem 'beaker-vagrant'
-
-# Dependencies for CI acceptance testing; TODO: fix CI so this can be removed
-gem 'beaker-hostgenerator'
-gem 'beaker-vmpooler', '~> 1.3'
+case ENV['BEAKER_HYPERVISOR']
+when 'docker'
+  gem 'beaker-docker'
+when 'vagrant', 'vagrant_libvirt'
+  gem 'beaker-vagrant'
+when 'vmpooler'
+  gem 'beaker-vmpooler', '~> 1.3'
+end
 
 group :release do
   gem 'github_changelog_generator', '>= 1.16.4', require: false if RUBY_VERSION >= '2.5'

Rakefile

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-task default: [:changelog]
+require 'beaker-rspec/rake_task'
+
+task default: :beaker
 
 begin
   require 'rubygems'

beaker-rspec.gemspec

@@ -28,9 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'thin'
 
-  # Dependency for example spec/acceptance tests
-  s.add_development_dependency 'beaker-pe'
-
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '> 3.0'
   s.add_runtime_dependency 'rspec', '~> 3.0'

spec/acceptance/example_spec.rb

@@ -12,8 +12,8 @@
     self.hosts = hosts
   end
 
-  example "access options hash" do
-    install_pe
+  example "use DSL method" do
+    echo_on hosts, 'Hello World!'
   end
 
   example "access the logger" do

spec/spec_helper.rb

@@ -1,6 +1,3 @@
-# if you need DSL extension libraries, it appears that they have to be loaded before the RSpec shim
-require "beaker-pe"
-
-ENV['RS_SETFILE'] ||= 'sample.cfg'
+ENV['RS_SETFILE'] ||= 'centos8-64'
 
 require "beaker-rspec"