From f144a985e44a8f3acf0275eeeae6739de200d0f8 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 14 Nov 2016 14:34:02 -0800 Subject: fixes Style/Semicolon cop these all seem like useless uses of semicolons. Signed-off-by: Lamont Granquist --- lib/chef/exceptions.rb | 2 +- lib/chef/win32/api/security.rb | 24 ++++++++++++------------ spec/functional/resource/registry_spec.rb | 6 +++--- spec/unit/provider/service/macosx_spec.rb | 2 +- spec/unit/resource_reporter_spec.rb | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/chef/exceptions.rb b/lib/chef/exceptions.rb index 7126323ff7..c933841726 100644 --- a/lib/chef/exceptions.rb +++ b/lib/chef/exceptions.rb @@ -262,7 +262,7 @@ class Chef class ChildConvergeError < RuntimeError; end - class DeprecatedFeatureError < RuntimeError; + class DeprecatedFeatureError < RuntimeError def initalize(message) super("#{message} (raising error due to treat_deprecation_warnings_as_errors being set)") end diff --git a/lib/chef/win32/api/security.rb b/lib/chef/win32/api/security.rb index 64df077686..a2cfe35dad 100644 --- a/lib/chef/win32/api/security.rb +++ b/lib/chef/win32/api/security.rb @@ -182,18 +182,18 @@ class Chef MAXDWORD = 0xffffffff # LOGON32 constants for LogonUser - LOGON32_LOGON_INTERACTIVE = 2; - LOGON32_LOGON_NETWORK = 3; - LOGON32_LOGON_BATCH = 4; - LOGON32_LOGON_SERVICE = 5; - LOGON32_LOGON_UNLOCK = 7; - LOGON32_LOGON_NETWORK_CLEARTEXT = 8; - LOGON32_LOGON_NEW_CREDENTIALS = 9; - - LOGON32_PROVIDER_DEFAULT = 0; - LOGON32_PROVIDER_WINNT35 = 1; - LOGON32_PROVIDER_WINNT40 = 2; - LOGON32_PROVIDER_WINNT50 = 3; + LOGON32_LOGON_INTERACTIVE = 2 + LOGON32_LOGON_NETWORK = 3 + LOGON32_LOGON_BATCH = 4 + LOGON32_LOGON_SERVICE = 5 + LOGON32_LOGON_UNLOCK = 7 + LOGON32_LOGON_NETWORK_CLEARTEXT = 8 + LOGON32_LOGON_NEW_CREDENTIALS = 9 + + LOGON32_PROVIDER_DEFAULT = 0 + LOGON32_PROVIDER_WINNT35 = 1 + LOGON32_PROVIDER_WINNT40 = 2 + LOGON32_PROVIDER_WINNT50 = 3 # LSA access policy POLICY_VIEW_LOCAL_INFORMATION = 0x00000001 diff --git a/spec/functional/resource/registry_spec.rb b/spec/functional/resource/registry_spec.rb index a7748fa4e7..5c97626c78 100644 --- a/spec/functional/resource/registry_spec.rb +++ b/spec/functional/resource/registry_spec.rb @@ -112,9 +112,9 @@ describe Chef::Resource::RegistryKey, :windows_only, :broken => true do @node.name("windowsbox") @rest_client = double("Chef::ServerAPI (mock)") - allow(@rest_client).to receive(:create_url).and_return("reports/nodes/windowsbox/runs/#{@run_id}"); - allow(@rest_client).to receive(:raw_http_request).and_return({ "result" => "ok" }); - allow(@rest_client).to receive(:post_rest).and_return({ "uri" => "https://example.com/reports/nodes/windowsbox/runs/#{@run_id}" }); + allow(@rest_client).to receive(:create_url).and_return("reports/nodes/windowsbox/runs/#{@run_id}") + allow(@rest_client).to receive(:raw_http_request).and_return({ "result" => "ok" }) + allow(@rest_client).to receive(:post_rest).and_return({ "uri" => "https://example.com/reports/nodes/windowsbox/runs/#{@run_id}" }) @resource_reporter = Chef::ResourceReporter.new(@rest_client) @events.register(@resource_reporter) diff --git a/spec/unit/provider/service/macosx_spec.rb b/spec/unit/provider/service/macosx_spec.rb index 12f97431ba..c9dd629187 100644 --- a/spec/unit/provider/service/macosx_spec.rb +++ b/spec/unit/provider/service/macosx_spec.rb @@ -322,7 +322,7 @@ SVC_LIST it "stops and then starts service" do expect(provider).to receive(:unload_service) - expect(provider).to receive(:load_service); + expect(provider).to receive(:load_service) provider.restart_service end diff --git a/spec/unit/resource_reporter_spec.rb b/spec/unit/resource_reporter_spec.rb index 51075a7d44..f951c62b94 100644 --- a/spec/unit/resource_reporter_spec.rb +++ b/spec/unit/resource_reporter_spec.rb @@ -92,8 +92,8 @@ describe Chef::ResourceReporter do context "when chef fails" do before do - allow(@rest_client).to receive(:raw_request).and_return({ "result" => "ok" }); - allow(@rest_client).to receive(:post).and_return({ "uri" => "https://example.com/reports/nodes/spitfire/runs/#{@run_id}" }); + allow(@rest_client).to receive(:raw_request).and_return({ "result" => "ok" }) + allow(@rest_client).to receive(:post).and_return({ "uri" => "https://example.com/reports/nodes/spitfire/runs/#{@run_id}" }) end @@ -259,8 +259,8 @@ describe Chef::ResourceReporter do describe "when generating a report for the server" do before do - allow(@rest_client).to receive(:raw_request).and_return({ "result" => "ok" }); - allow(@rest_client).to receive(:post).and_return({ "uri" => "https://example.com/reports/nodes/spitfire/runs/#{@run_id}" }); + allow(@rest_client).to receive(:raw_request).and_return({ "result" => "ok" }) + allow(@rest_client).to receive(:post).and_return({ "uri" => "https://example.com/reports/nodes/spitfire/runs/#{@run_id}" }) @resource_reporter.run_started(@run_status) end -- cgit v1.2.1