Merge pull request #165 from puppetlabs/resolvelintissues

Resolving linting issues

Author: davidsandilands

spec/plans/convert_spec.rb

@@ -8,20 +8,20 @@
     JSON.parse File.read(File.expand_path(File.join(fixtures, 'plans', 'trusted_facts.json')))
   end
 
-it 'single primary no dr valid' do
-  expect_out_message()
-  expect_task('peadm::trusted_facts').return_for_targets(
+  it 'single primary no dr valid' do
+    expect_out_message
+    expect_task('peadm::trusted_facts').return_for_targets(
 
-    'primary' => trustedjson,
-  )
-  pending('a lack of support for functions requires a workaround to be written')
-  expect_task('peadm::read_file').always_return({'content' => '2019.2.4'})
-  expect_command('systemctl is-active puppet.service')
-  expect_command('systemctl stop puppet.service')
-  #expect_plan('peadm::util::add_cert_extensions')
-  allow_apply()
-  expect_task('peadm::cert_data')
-  expect_task('peadm::puppet_runonce')
-  expect(run_plan('peadm::convert', 'primary_host' => 'primary')).to be_ok
+      'primary' => trustedjson,
+    )
+    pending('a lack of support for functions requires a workaround to be written')
+    expect_task('peadm::read_file').always_return({ 'content' => '2019.2.4' })
+    expect_command('systemctl is-active puppet.service')
+    expect_command('systemctl stop puppet.service')
+    # expect_plan('peadm::util::add_cert_extensions')
+    allow_apply
+    expect_task('peadm::cert_data')
+    expect_task('peadm::puppet_runonce')
+    expect(run_plan('peadm::convert', 'primary_host' => 'primary')).to be_ok
   end
-end
+end

spec/plans/util/sanitize_pg_pe_conf_spec.rb

@@ -1,6 +1,5 @@
 # spec/spec_helper.rb
 
-
 describe 'peadm::util::sanitize_pg_pe_conf ' do
   # Include the BoltSpec library functions
   include BoltSpec::Plans
@@ -9,12 +8,12 @@
     JSON.parse File.read(File.expand_path(File.join(fixtures, 'plans', 'pe_conf.json')))
   end
 
-it 'Runs' do
-#  1) peadm::util::sanitize_pg_pe_conf  Runs
-#Failure/Error: expect(run_plan('peadm::util::sanitize_pg_pe_conf', 'targets' => 'foo,bar', 'primary_host' => 'pe-server-d8b317-0.us-west1-a.c.davidsand.internal')).to be_ok
-#expected `#<Bolt::PlanResult:0x00007fd37d94b8a0 @value=#<Bolt::PAL::PALError: undefined method `start_with?' for #<Hash:0x00007fd36e30b350>>, @status="failure">.ok?` to be truthy, got false
-  pending('a lack of support for functions requires a workaround to be written')
-  expect_task('peadm::read_file').always_return('content' => pe_conf_json)
-  expect(run_plan('peadm::util::sanitize_pg_pe_conf', 'targets' => 'foo,bar', 'primary_host' => 'pe-server-d8b317-0.us-west1-a.c.davidsand.internal')).to be_ok
+  it 'Runs' do
+    #  1) peadm::util::sanitize_pg_pe_conf  Runs
+    # Failure/Error: expect(run_plan('peadm::util::sanitize_pg_pe_conf', 'targets' => 'foo,bar', 'primary_host' => 'pe-server-d8b317-0.us-west1-a.c.davidsand.internal')).to be_ok
+    # expected `#<Bolt::PlanResult:0x00007fd37d94b8a0 @value=#<Bolt::PAL::PALError: undefined method `start_with?' for #<Hash:0x00007fd36e30b350>>, @status="failure">.ok?` to be truthy, got false
+    pending('a lack of support for functions requires a workaround to be written')
+    expect_task('peadm::read_file').always_return('content' => pe_conf_json)
+    expect(run_plan('peadm::util::sanitize_pg_pe_conf', 'targets' => 'foo,bar', 'primary_host' => 'pe-server-d8b317-0.us-west1-a.c.davidsand.internal')).to be_ok
   end
 end