codacy cleanups

example42 · Aug 7, 2017 · fb8a414 · fb8a414
1 parent aa5d57c
commit fb8a414
Show file tree

Hide file tree

Showing 6 changed files with 221 additions and 216 deletions.
diff --git a/spec/hosts/aws.lab.psick.io_spec.rb b/spec/hosts/aws.lab.psick.io_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-os_facts = @os_facts
+@os_facts
 
 describe 'aws.lab.psick.io' do
   on_supported_os.each do |os, facts|
@@ -9,14 +9,15 @@
         OS_FACTS.merge(facts)
       end
       let(:environment) { 'production' }
-      let(:trusted_facts) { {
+      let(:trusted_facts) do
+        {
         'env' => 'lab',
         'zone' => 'lab',
         'datacenter' => 'lab',
         'role' => 'aws'
-      } }
+        }
+      end
       it { is_expected.to compile.with_all_deps }
     end
   end
 end
-
diff --git a/spec/hosts/build.lab.psick.io_spec.rb b/spec/hosts/build.lab.psick.io_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-os_facts = @os_facts
+@os_facts
 
 describe 'build.lab.psick.io' do
   on_supported_os.each do |os, facts|
@@ -9,14 +9,15 @@
         OS_FACTS.merge(facts)
       end
       let(:environment) { 'production' }
-      let(:trusted_facts) { {
+      let(:trusted_facts) do
+        {
         'env' => 'lab',
         'zone' => 'lab',
         'datacenter' => 'lab',
         'role' => 'build'
-      } }
+        }
+      end
       it { is_expected.to compile.with_all_deps }
     end
   end
 end
-
diff --git a/spec/hosts/puppet.foss.psick.io_spec.rb b/spec/hosts/puppet.foss.psick.io_spec.rb
@@ -1,27 +1,28 @@
 require 'spec_helper'
 
-os_facts = @os_facts
+@os_facts
 
 describe 'puppet.foss.psick.io' do
   test_on = {
     :supported_os => [
-      { 'operatingsystem' => 'RedHat' },
-    ],
+      { 'operatingsystem' => 'RedHat' }
+    ]
   }
   on_supported_os(test_on).each do |os, facts|
     context "on #{os}" do
       let(:facts) do
         OS_FACTS.merge(facts)
       end
       let(:environment) { 'production' }
-      let(:trusted_facts) { {
+      let(:trusted_facts) do
+        {
         'env' => 'lab',
         'zone' => 'lab',
         'datacenter' => 'lab',
         'role' => 'puppet'
-      } }
+        }
+      end
       it { is_expected.to compile.with_all_deps }
     end
   end
 end
-
diff --git a/spec/hosts/puppet.lab.psick.io_spec.rb b/spec/hosts/puppet.lab.psick.io_spec.rb
@@ -1,27 +1,28 @@
 require 'spec_helper'
 
-os_facts = @os_facts
+@os_facts
 
 describe 'puppet.lab.psick.io' do
   test_on = {
     :supported_os => [
-      { 'operatingsystem' => 'RedHat' },
-    ],
+      { 'operatingsystem' => 'RedHat' }
+    ]
   }
   on_supported_os(test_on).each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        OS_FACTS.merge(facts).merge({ :servername => 'puppet.example.com', })
+        OS_FACTS.merge(facts).merge({ :servername => 'puppet.example.com' })
       end
       let(:environment) { 'production' }
-      let(:trusted_facts) { {
+      let(:trusted_facts) do
+        {
         'env' => 'lab',
         'zone' => 'lab',
         'datacenter' => 'lab',
         'role' => 'puppet'
-      } }
+        }
+      end
       it { is_expected.to compile.with_all_deps }
     end
   end
 end
-
diff --git a/...s/ostest-windows2012-lab-psick-io_spec.rb → spec/hosts/windows2012.lab.psick.io_spec.rb b/...s/ostest-windows2012-lab-psick-io_spec.rb → spec/hosts/windows2012.lab.psick.io_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-os_facts = @os_facts
+@os_facts
 
 describe 'windows2012.lab.psick.io' do
   on_supported_os.each do |os, facts|
@@ -9,14 +9,15 @@
         OS_FACTS.merge(facts)
       end
       let(:environment) { 'production' }
-      let(:trusted_facts) { {
+      let(:trusted_facts) do
+        {
         'env' => 'lab',
         'zone' => 'lab',
         'datacenter' => 'lab',
         'role' => 'ostest'
-      } }
+        }
+      end
       it { is_expected.to compile.with_all_deps }
     end
   end
 end
-