Skip to content

Commit f6d1e13

Browse files
committed
Drop deprecated apache_pw_hash, apache::apache_pw_hash and bool2httpd
1 parent 4b316af commit f6d1e13

File tree

5 files changed

+2
-62
lines changed

5 files changed

+2
-62
lines changed

lib/puppet/functions/apache/apache_pw_hash.rb

-12
This file was deleted.

lib/puppet/functions/apache_pw_hash.rb

-12
This file was deleted.

lib/puppet/functions/bool2httpd.rb

-12
This file was deleted.

spec/functions/bool2httpd_spec.rb

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper'
44

5-
shared_examples 'apache::bool2httpd function' do
5+
describe 'apache::bool2httpd' do
66
it { is_expected.not_to eq(nil) }
77
it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
88
it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
@@ -25,13 +25,3 @@
2525
it { is_expected.to run.with_params(:undef).and_return('Off') }
2626
it { is_expected.to run.with_params('foo').and_return('foo') }
2727
end
28-
29-
describe 'apache::bool2httpd' do
30-
it_behaves_like 'apache::bool2httpd function'
31-
32-
describe 'deprecated non-namespaced shim' do
33-
describe 'bool2httpd', type: :puppet_function do
34-
it_behaves_like 'apache::bool2httpd function'
35-
end
36-
end
37-
end

spec/functions/pw_hash_spec.rb

+1-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
require 'spec_helper'
44

5-
shared_examples 'apache::pw_hash function' do
5+
describe 'apache::pw_hash' do
66
it { is_expected.not_to eq(nil) }
77
it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
88
it { is_expected.to run.with_params('').and_raise_error(ArgumentError) }
@@ -12,17 +12,3 @@
1212
it { is_expected.to run.with_params([]).and_raise_error(ArgumentError) }
1313
it { is_expected.to run.with_params('test').and_return('{SHA}qUqP5cyxm6YcTAhz05Hph5gvu9M=') }
1414
end
15-
16-
describe 'apache::pw_hash' do
17-
it_behaves_like 'apache::pw_hash function'
18-
19-
describe 'deprecated shims' do
20-
describe 'apache_pw_hash', type: :puppet_function do
21-
it_behaves_like 'apache::pw_hash function'
22-
end
23-
24-
describe 'apache::apache_pw_hash', type: :puppet_function do
25-
it_behaves_like 'apache::pw_hash function'
26-
end
27-
end
28-
end

0 commit comments

Comments
 (0)