Skip to content

Commit

Permalink
Merge pull request voxpupuli#136 from op-ct/fix-issue-135--spec-tests…
Browse files Browse the repository at this point in the history 
…-fail-on-non-debian-oses

Fix incorrect failures with rspec-puppet-facts
  • Loading branch information
@bastelfreak
bastelfreak authored Sep 24, 2017
2 parents b0bb041 + 536fcd3 commit 25a6fb6
Show file tree
Hide file tree
Showing 6 changed files with 327 additions and 316 deletions.
233 changes: 117 additions & 116 deletions spec/classes/confluence_config_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,130 +1,131 @@
require 'spec_helper.rb'

describe 'confluence' do
describe 'confluence::config' do
let :facts do
{
os: { family: 'RedHat' },
operatingsystem: 'RedHat'
}
end

context 'default params' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6'
}
on_supported_os.each do |os, fs_facts|
context "on #{os}" do
let :facts do
fs_facts
end

it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it { is_expected.to contain_augeas('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml') }
end
context 'with param manage_server_xml set to template' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
manage_server_xml: 'template'
}
end
describe 'confluence::config' do
context 'default params' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6'
}
end

it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml') }
end
context 'with param manage_server_xml set to template and non default params' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
manage_server_xml: 'template',
context_path: '/confluence1',
tomcat_port: 8089,
tomcat_max_threads: 999,
tomcat_accept_count: 999,
tomcat_proxy: {
'scheme' => 'https',
'proxyName' => 'EXAMPLE',
'proxyPort' => '443'
}
}
end
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it { is_expected.to contain_augeas('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml') }
end
context 'with param manage_server_xml set to template' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
manage_server_xml: 'template'
}
end

it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml').
with_content(%r{port="8089"}).
with_content(%r{maxThreads="999"}).
with_content(%r{acceptCount="999"}).
with_content(%r{scheme="https"}).
with_content(%r{proxyName="EXAMPLE"}).
with_content(%r{proxyPort="443"}).
with_content(%r{Context path="/confluence1"})
end
end
context 'with param data_dir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
data_dir: '/opt/confluence/confluence-data'
}
end
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml') }
end
context 'with param manage_server_xml set to template and non default params' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
manage_server_xml: 'template',
context_path: '/confluence1',
tomcat_port: 8089,
tomcat_max_threads: 999,
tomcat_accept_count: 999,
tomcat_proxy: {
'scheme' => 'https',
'proxyName' => 'EXAMPLE',
'proxyPort' => '443'
}
}
end

it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-data})
end
end
context 'with param data_dir not set and param homdir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
homedir: '/opt/confluence/confluence-home'
}
end
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/bin/setenv.sh') }
it { is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties') }
it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml').
with_content(%r{port="8089"}).
with_content(%r{maxThreads="999"}).
with_content(%r{acceptCount="999"}).
with_content(%r{scheme="https"}).
with_content(%r{proxyName="EXAMPLE"}).
with_content(%r{proxyPort="443"}).
with_content(%r{Context path="/confluence1"})
end
end
context 'with param data_dir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
data_dir: '/opt/confluence/confluence-data'
}
end

it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-home})
end
end
context 'with param data_dir set and param homdir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
data_dir: '/opt/confluence/confluence-data',
homedir: '/opt/confluence/confluence-home'
}
end
it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-data})
end
end
context 'with param data_dir not set and param homdir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
homedir: '/opt/confluence/confluence-home'
}
end

it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-data})
end
end
context 'ajp proxy' do
let(:params) do
{
version: '5.5.6',
javahome: '/opt/java',
manage_server_xml: 'template',
ajp: {
'port' => '8009',
'protocol' => 'AJP/1.3'
}
}
end
it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-home})
end
end
context 'with param data_dir set and param homdir set' do
let(:params) do
{
javahome: '/opt/java',
version: '5.5.6',
data_dir: '/opt/confluence/confluence-data',
homedir: '/opt/confluence/confluence-home'
}
end

it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/confluence/WEB-INF/classes/confluence-init.properties').
with_content(%r{confluence.home=/opt/confluence/confluence-data})
end
end
context 'ajp proxy' do
let(:params) do
{
version: '5.5.6',
javahome: '/opt/java',
manage_server_xml: 'template',
ajp: {
'port' => '8009',
'protocol' => 'AJP/1.3'
}
}
end

it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml').
with_content(%r{<Connector enableLookups="false" URIEncoding="UTF-8"\s+port = "8009"\s+protocol = "AJP/1.3"\s+/>})
it do
is_expected.to contain_file('/opt/confluence/atlassian-confluence-5.5.6/conf/server.xml').
with_content(%r{<Connector enableLookups="false" URIEncoding="UTF-8"\s+port = "8009"\s+protocol = "AJP/1.3"\s+/>})
end
end
end
end
end
Expand Down
Loading

0 comments on commit 25a6fb6

Please sign in to comment.