Merge pull request #176 from reidmv/simplify-spec-tests

Use `allow_any_<action>` syntax to simplify specs

Author: timidri

spec/plans/add_replica_spec.rb

@@ -3,25 +3,18 @@
 describe 'peadm::install' do
   include BoltSpec::Plans
 
-  def allow_standard_non_returning_calls(params)
+  def allow_standard_non_returning_calls
     allow_apply
-    allow_task('peadm::agent_install')
-    allow_task('peadm::ssl_clean')
-    allow_task('peadm::submit_csr')
-    allow_task('peadm::sign_csr')
-    allow_task('peadm::puppet_runonce')
-    allow_task('peadm::provision_replica')
-    allow_command('systemctl start puppet.service')
-    allow_command("puppet infrastructure forget #{params['replica_host']}")
-    allow_command("puppet node purge #{params['replica_host']}")
+    allow_any_task
+    allow_any_command
   end
 
   describe 'basic functionality' do
     let(:params) { { 'primary_host' => 'primary', 'replica_host' => 'replica' } }
     let(:certdata) { { 'certname' => 'primary', 'extensions' => { '1.3.6.1.4.1.34380.1.1.9813' => 'A' } } }
 
     it 'runs successfully when the primary doesn\'t have alt-names' do
-      allow_standard_non_returning_calls(params)
+      allow_standard_non_returning_calls
       expect_task('peadm::cert_data').always_return(certdata)
       expect_task('peadm::agent_install')
         .with_params({ 'server'        => 'primary',
@@ -37,7 +30,7 @@ def allow_standard_non_returning_calls(params)
     end
 
     it 'runs successfully when the primary has alt-names' do
-      allow_standard_non_returning_calls(params)
+      allow_standard_non_returning_calls
       expect_task('peadm::cert_data').always_return(certdata.merge({ 'dns-alt-names' => ['primary', 'alt'] }))
       expect_task('peadm::agent_install')
         .with_params({ 'server'        => 'primary',

spec/plans/subplans/configure_spec.rb

@@ -5,11 +5,12 @@
 
   describe 'Standard architecture without DR' do
     it 'runs successfully' do
-      expect_task('peadm::read_file').always_return({ 'content' => 'mock' })
-      expect_task('peadm::puppet_runonce')
-      expect_command('systemctl start puppet')
       allow_apply
+      allow_any_task
+      allow_any_plan
+      allow_any_command
 
+      expect_task('peadm::read_file').always_return({ 'content' => 'mock' })
       expect_task('peadm::provision_replica').not_be_called
       expect_task('peadm::code_manager').not_be_called
 

spec/plans/subplans/install_spec.rb

@@ -5,22 +5,16 @@
   include BoltSpec::Plans
 
   it 'minimum variables to run' do
+    allow_any_task
+    allow_any_plan
+    allow_any_command
+
     allow_task('peadm::precheck').return_for_targets(
       'primary' => {
         'hostname' => 'primary',
         'platform' => 'el-7.11-x86_64'
       },
     )
-    expect_task('peadm::mkdir_p_file').be_called_times(5)
-    expect_plan('peadm::util::retrieve_and_upload')
-    expect_task('peadm::read_file')
-    expect_task('peadm::pe_install')
-    expect_command('systemctl stop pe-puppetdb')
-    expect_command('systemctl start pe-puppetdb')
-    expect_task('peadm::rbac_token')
-    expect_task('peadm::code_manager')
-    expect_task('peadm::puppet_runonce').be_called_times(2)
-    expect_task('peadm::wait_until_service_ready')
 
     #########
     ## <🤮>

spec/plans/upgrade_spec.rb

@@ -9,20 +9,15 @@
   end
 
   it 'minimum variables to run' do
+    allow_apply
+    allow_any_task
+    allow_any_plan
+    allow_any_command
     allow_out_message
-    expect_task('peadm::cert_data').return_for_targets(
-      'primary' => trustedjson,
-    )
+
+    expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
     expect_task('peadm::read_file').always_return({ 'content' => 'mock' })
-    expect_task('peadm::precheck')
-    expect_plan('peadm::util::retrieve_and_upload')
-    expect_command('systemctl stop puppet')
-    allow_task('peadm::puppet_runonce')
-    expect_plan('peadm::modify_cert_extensions')
-    allow_apply
-    expect_task('peadm::pe_install')
-    allow_task('peadm::puppet_infra_upgrade')
-    expect_task('service')
+
     expect(run_plan('peadm::upgrade', 'primary_host' => 'primary', 'version' => '2019.8.6')).to be_ok
   end
 end