Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit 121749b

Browse files
committed
Merge pull request #53 from bflad/rubocop_fixes
Rubocop fixes and ignores
2 parents 741d7ec + 78588cc commit 121749b

File tree

8 files changed

+5
-6
lines changed

8 files changed

+5
-6
lines changed

files/default/tests/minitest/apache2_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
it 'enables apache' do
1515
apache_service.must_be_enabled
1616
end
17-
1817
end

files/default/tests/minitest/configuration_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
it 'creates Stash properties file' do
77
file("#{node['stash']['home_path']}/shared/stash-config.properties").must_exist
88
end
9-
109
end

files/default/tests/minitest/default_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22

33
describe_recipe 'stash::default' do
44
include Helpers::Stash
5-
65
end

files/default/tests/minitest/linux_standalone_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
it 'creates Java KeyStore' do
1111
file("#{node['stash']['home_path']}/.keystore").must_exist.with(:owner, node['stash']['user'])
1212
end
13-
1413
end

files/default/tests/minitest/service_init_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@
1010
it 'enables Stash' do
1111
service('stash').must_be_enabled
1212
end
13-
1413
end

libraries/stash.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ class Chef
44
class Recipe
55
# Chef::Recipe::Stash class
66
class Stash
7+
# rubocop:disable Metrics/AbcSize
78
def self.settings(node)
89
begin
910
if Chef::Config[:solo]
@@ -27,6 +28,7 @@ def self.settings(node)
2728

2829
settings
2930
end
31+
# rubocop:enable Metrics/AbcSize
3032

3133
def self.default_database_port(type)
3234
case type

providers/hook.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def whyrun_supported?
5656
end
5757
end
5858

59+
# rubocop:disable Metrics/AbcSize
5960
def load_current_resource
6061
server = @new_resource.server
6162
user = @new_resource.user
@@ -74,6 +75,7 @@ def load_current_resource
7475

7576
@current_resource.settings hook_settings(server, hook_opts) if @current_resource.configured
7677
end
78+
# rubocop:enable Metrics/AbcSize
7779

7880
private
7981

recipes/apache2.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
include_recipe 'apache2::mod_ssl'
88

99
# Disable mod_auth_basic because it isn't supported in Stash 2.10 and later
10-
apache_module "auth_basic" do
10+
apache_module 'auth_basic' do
1111
enable false
1212
end
1313

0 commit comments

Comments
 (0)