Skip to content

Commit e38bede

Browse files
authored
clean class compose_spec.rb
1 parent 7a05746 commit e38bede

File tree

1 file changed

+1
-38
lines changed

1 file changed

+1
-38
lines changed

spec/classes/compose_spec.rb

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,6 @@
1010
'with version => 1.7.0' => {
1111
'version' => '1.7.0'
1212
},
13-
'when proxy is provided' => {
14-
'version' => '1.7.0',
15-
'proxy' => 'http://proxy.example.org:3128/'
16-
},
17-
'when proxy is not a http proxy' => {
18-
'proxy' => 'this is not a URL'
19-
},
20-
'when proxy contains username and password' => {
21-
'version' => '1.7.0',
22-
'proxy' => 'http://user:[email protected]:3128/'
23-
},
24-
'when proxy IP is provided' => {
25-
'version' => '1.7.0',
26-
'proxy' => 'http://10.10.10.10:3128/'
27-
},
28-
'when base_url is provided' => {
29-
'version' => '1.7.0',
30-
'base_url' => 'http://example.org'
31-
},
32-
'when raw_url is provided' => {
33-
'version' => '1.7.0',
34-
'raw_url' => 'http://example.org'
35-
}
3613
}
3714

3815
describe 'docker::compose', type: :class do
@@ -57,12 +34,6 @@
5734
params = {
5835
'ensure' => 'present',
5936
'version' => defaults['compose_version'],
60-
'install_path' => defaults['compose_install_path'],
61-
'symlink_name' => defaults['compose_symlink_name'],
62-
'proxy' => :undef,
63-
'base_url' => defaults['compose_base_url'],
64-
'raw_url' => :undef,
65-
'curl_ensure' => defaults['curl_ensure']
6637
}.merge(local_params)
6738

6839
let(:facts) do
@@ -73,15 +44,7 @@
7344
params
7445
end
7546

76-
if title == 'when proxy is not a http proxy'
77-
it 'raises an error for invalid proxy URL' do
78-
expect(subject).to compile.and_raise_error(
79-
%r{parameter 'proxy' expects an undef value or a match for Pattern},
80-
)
81-
end
82-
else
83-
include_examples 'compose', params, facts
84-
end
47+
include_examples 'compose', params, facts
8548
end
8649
end
8750
end

0 commit comments

Comments
 (0)