From e765056c4eb65db71244322be034ec6a80d0179a Mon Sep 17 00:00:00 2001 From: Chris Edester Date: Fri, 6 Jan 2017 13:08:45 -0500 Subject: [PATCH] Fixes #2 - all tests passing --- .fixtures.yml | 5 +++++ metadata.json | 5 ++++- spec/classes/shibidp_jetty_spec.rb | 15 +++++++++++++++ spec/classes/shibidp_simplesp_spec.rb | 15 +++++++++++++++ spec/classes/shibidp_spec.rb | 1 - 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 spec/classes/shibidp_jetty_spec.rb create mode 100644 spec/classes/shibidp_simplesp_spec.rb diff --git a/.fixtures.yml b/.fixtures.yml index 67102a4..8406d80 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,6 +1,11 @@ fixtures: repositories: stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" + concat: "https://github.com/puppetlabs/puppetlabs-concat.git" archive: "https://github.com/voxpupuli/puppet-archive.git" + openssl: "https://github.com/camptocamp/puppet-openssl.git" + profiled: "https://github.com/unibet/puppet-profiled.git" + # remove this after you get rid of all the cache_data calls + extlib: "https://github.com/voxpupuli/puppet-extlib.git" symlinks: shibidp: "#{source_dir}" diff --git a/metadata.json b/metadata.json index 8be6c08..ee31b84 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,10 @@ "tags": ["shibboleth"], "dependencies": [ {"name": "puppetlabs/stdlib", "version_requirement": ">= 4.2.0 < 5.0.0"}, - {"name": "puppet/archive", "version_requirement": ">= 0.5.0 < 1.0.0"} + {"name": "puppetlabs/concat", "version_requirement": ">= 1.1.1 < 3.0.0"}, + {"name": "puppet/archive", "version_requirement": ">= 0.5.0 < 1.0.0"}, + {"name": "camptocamp/openssl", "version_requirement": ">= 1.8.2 < 2.0.0"}, + {"name": "unibet/profiled", "version_requirement": ">= 0.1.4 < 1.0.0"} ], "operatingsystem_support": [ { diff --git a/spec/classes/shibidp_jetty_spec.rb b/spec/classes/shibidp_jetty_spec.rb new file mode 100644 index 0000000..63de2f4 --- /dev/null +++ b/spec/classes/shibidp_jetty_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe 'shibidp::jetty', :type => :class do + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge(:environment => 'test', :root_home => '/root', :service_provider => 'systemd') + end + + context 'with defaults' do + it { is_expected.to compile.with_all_deps } + end + end + end +end diff --git a/spec/classes/shibidp_simplesp_spec.rb b/spec/classes/shibidp_simplesp_spec.rb new file mode 100644 index 0000000..fd0b5ba --- /dev/null +++ b/spec/classes/shibidp_simplesp_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe 'shibidp::simplesp', :type => :class do + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge(:environment => 'test', :root_home => '/root', :service_provider => 'systemd') + end + + context 'with defaults' do + it { is_expected.to compile.with_all_deps } + end + end + end +end diff --git a/spec/classes/shibidp_spec.rb b/spec/classes/shibidp_spec.rb index 3791bd4..dbb43c6 100644 --- a/spec/classes/shibidp_spec.rb +++ b/spec/classes/shibidp_spec.rb @@ -14,7 +14,6 @@ it { is_expected.to contain_class('shibidp::metadata') } it { is_expected.to contain_class('shibidp::attribute_resolver') } it { is_expected.to contain_class('shibidp::attribute_filter') } - it { is_expected.to contain_class('shibidp::jetty') } end end end