1 files changed, 149 insertions, 90 deletions
diff --git a/spec/defines/openvpn_client_spec.rb b/spec/defines/openvpn_client_spec.rb
index da71d63..143b76f 100644
--- a/spec/defines/openvpn_client_spec.rb
+++ b/spec/defines/openvpn_client_spec.rb
@@ -23,94 +23,153 @@ describe 'openvpn::client', :type => :define do
     'command' => '/bin/rm test_client.tar.gz; tar --exclude=\*.conf.d -chzvf test_client.tar.gz test_client'
   ) }
 
-  it { should contain_openvpn__option('ca test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'ca', 
-    'value'   => 'keys/ca.crt'
-  )}
-  it { should contain_openvpn__option('cert test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'cert', 
-    'value'   => 'keys/test_client.crt'
-  )}
-  it { should contain_openvpn__option('key test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'key', 
-    'value'   => 'keys/test_client.key'
-  )}
-  it { should contain_openvpn__option('client test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'client'
-  )}
-  it { should contain_openvpn__option('dev test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'dev', 
-    'value'   => 'tun'
-  )}
-  it { should contain_openvpn__option('proto test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'proto', 
-    'value'   => 'tcp'
-  )}
-  it { should contain_openvpn__option('remote test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'remote', 
-    'value'   => 'somehost 1194'
-  )}
-  it { should contain_openvpn__option('resolv-retry test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'resolv-retry', 
-    'value'   => 'infinite'
-  )}
-  it { should contain_openvpn__option('nobind test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'nobind'
-  )}
-  it { should contain_openvpn__option('persist-key test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'persist-key'
-  )}
-  it { should contain_openvpn__option('persist-tun test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'persist-tun'
-  )}
-  it { should contain_openvpn__option('mute-replay-warnings test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'mute-replay-warnings'
-  )}
-  it { should contain_openvpn__option('ns-cert-type test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'ns-cert-type', 
-    'value'   => 'server'
-  )}
-  it { should contain_openvpn__option('comp-lzo test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'comp-lzo'
-  )}
-  it { should contain_openvpn__option('verb test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'verb', 
-    'value'   => '3'
-  )}
-  it { should contain_openvpn__option('mute test_server with test_client').with(
-    'server'  => 'test_server', 
-    'client'  => 'test_client',
-    'key'     => 'mute', 
-    'value'   => '20'
-  )}
+  context "setting the minimum parameters" do
+    let(:params) { { 'server' => 'test_server' } }
+    let(:facts) { { :fqdn => 'somehost', :concat_basedir => '/var/lib/puppet/concat' } }
+
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^client$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^ca\s+keys\/ca\.crt$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^cert\s+keys\/test_client.crt$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^key\s+keys\/test_client\.key$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^dev\s+tun$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^proto\s+tcp$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^remote\s+somehost\s+1194$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^comp-lzo$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^resolv-retry\s+infinite$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^nobind$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^persist-key$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^persist-tun$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^mute-replay-warnings$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^ns\-cert\-type\s+server$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^verb\s+3$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^mute\s+20$/)}
+  end
+
+  context "setting all of the parameters" do
+    let(:params) { { 
+      'server'                => 'test_server',
+      'compression'           => 'comp-something',
+      'dev'                   => 'tap',
+      'mute'                  => 10,
+      'mute_replay_warnings'  => false,
+      'nobind'                => false,
+      'ns_cert_type'          => 'client',
+      'persist_key'           => false,
+      'persist_tun'           => false,
+      'port'                  => '123',
+      'proto'                 => 'udp',
+      'remote_host'           => 'somewhere',
+      'resolv_retry'          => '2m',
+      'verb'                  => '1'
+    } }
+    let(:facts) { { :fqdn => 'somehost', :concat_basedir => '/var/lib/puppet/concat' } }
+
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^client$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^ca\s+keys\/ca\.crt$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^cert\s+keys\/test_client.crt$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^key\s+keys\/test_client\.key$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^dev\s+tap$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^proto\s+udp$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^remote\s+somewhere\s+123$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^comp-something$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^resolv-retry\s+2m$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^ns\-cert\-type\s+client$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^verb\s+1$/)}
+    it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^mute\s+10$/)}
+  end
+
+
+
+
+
+#  it { should contain_openvpn__option('ca test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'ca', 
+#    'value'   => 'keys/ca.crt'
+#  )}
+#  it { should contain_openvpn__option('cert test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'cert', 
+#    'value'   => 'keys/test_client.crt'
+#  )}
+#  it { should contain_openvpn__option('key test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'key', 
+#    'value'   => 'keys/test_client.key'
+#  )}
+#  it { should contain_openvpn__option('client test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'client'
+#  )}
+#  it { should contain_openvpn__option('dev test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'dev', 
+#    'value'   => 'tun'
+#  )}
+#  it { should contain_openvpn__option('proto test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'proto', 
+#    'value'   => 'tcp'
+#  )}
+#  it { should contain_openvpn__option('remote test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'remote', 
+#    'value'   => 'somehost 1194'
+#  )}
+#  it { should contain_openvpn__option('resolv-retry test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'resolv-retry', 
+#    'value'   => 'infinite'
+#  )}
+#  it { should contain_openvpn__option('nobind test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'nobind'
+#  )}
+#  it { should contain_openvpn__option('persist-key test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'persist-key'
+#  )}
+#  it { should contain_openvpn__option('persist-tun test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'persist-tun'
+#  )}
+#  it { should contain_openvpn__option('mute-replay-warnings test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'mute-replay-warnings'
+#  )}
+#  it { should contain_openvpn__option('ns-cert-type test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'ns-cert-type', 
+#    'value'   => 'server'
+#  )}
+#  it { should contain_openvpn__option('comp-lzo test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'comp-lzo'
+#  )}
+#  it { should contain_openvpn__option('verb test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'verb', 
+#    'value'   => '3'
+#  )}
+#  it { should contain_openvpn__option('mute test_server with test_client').with(
+#    'server'  => 'test_server', 
+#    'client'  => 'test_client',
+#    'key'     => 'mute', 
+#    'value'   => '20'
+#  )}
 end