Update tests for PR #22

Author: Vamsee Kanakala

README.md

@@ -1,4 +1,4 @@
-# Solr Module  
+# Solr Module
 
 [![Build Status](https://travis-ci.org/vamsee/puppet-solr.png)](https://travis-ci.org/vamsee/puppet-solr)
 
@@ -20,7 +20,7 @@ It's _**highly**_ recommended that you use a mirror like so:
 
     class { 'solr':
       mirror        => 'http://apache.bytenet.in/lucene/solr',
-      version       => '4.10.3',
+      version       => '4.10.4',
       cores         => ['development', 'staging', 'production'],
     }
 

spec/classes/config_spec.rb

@@ -92,9 +92,10 @@
   context "when params are passed" do
 
     let(:params) { {
-        :cores    => ['dev', 'prod'],
-        :version  => '5.6.2',
-        :mirror   => 'http://some-random-site.us',
+        :cores     => ['dev', 'prod'],
+        :version   => '5.6.2',
+        :mirror    => 'http://some-random-site.us',
+        :dist_root => '/opt/tmpdata',
     } }
 
     it { should contain_file('/etc/default/jetty')
@@ -149,9 +150,9 @@
     it { should contain_exec('solr-download')
         .with({
                 'command'   =>  'wget http://some-random-site.us/5.6.2/solr-5.6.2.tgz',
-                'cwd'       =>  '/tmp',
-                'creates'   =>  '/tmp/solr-5.6.2.tgz',
-                'onlyif'    =>  'test ! -d /usr/share/solr/WEB-INF && test ! -f /tmp/solr-5.6.2.tgz',
+                'cwd'       =>  '/opt/tmpdata',
+                'creates'   =>  '/opt/tmpdata/solr-5.6.2.tgz',
+                'onlyif'    =>  'test ! -d /usr/share/solr/WEB-INF && test ! -f /opt/tmpdata/solr-5.6.2.tgz',
                 'timeout'   =>  0,
                 'require'   =>  'File[/usr/share/solr]'
               })
@@ -161,17 +162,17 @@
         .with({
                 'path'      =>  '["/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin"]',
                 'command'   =>  'tar xvf solr-5.6.2.tgz',
-                'cwd'       =>  '/tmp',
-                'onlyif'    =>  'test -f /tmp/solr-5.6.2.tgz && test ! -d /tmp/solr-5.6.2',
+                'cwd'       =>  '/opt/tmpdata',
+                'onlyif'    =>  'test -f /opt/tmpdata/solr-5.6.2.tgz && test ! -d /opt/tmpdata/solr-5.6.2',
                 'require'   =>  'Exec[solr-download]',
               })
     }
 
     it { should contain_exec('copy-solr')
         .with({
                 'path'      =>  '["/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin"]',
-                'command'   =>  "jar xvf /tmp/solr-5.6.2/dist/solr-5.6.2.war; \
-    cp /tmp/solr-5.6.2/example/lib/ext/*.jar WEB-INF/lib",
+                'command'   =>  "jar xvf /opt/tmpdata/solr-5.6.2/dist/solr-5.6.2.war; \
+    cp /opt/tmpdata/solr-5.6.2/example/lib/ext/*.jar WEB-INF/lib",
                 'cwd'       =>  '/usr/share/solr',
                 'onlyif'    =>  'test ! -d /usr/share/solr/WEB-INF',
                 'require'   =>  'Exec[extract-solr]',

spec/classes/init_spec.rb

@@ -13,6 +13,7 @@
                 'cores'     => ['default'],
                 'version'   => '4.7.2',
                 'mirror'    => 'http://www.us.apache.org/dist/lucene/solr',
+                'dist_root' => '/tmp',
               })
     }
 
@@ -23,9 +24,10 @@
   context "where params are passed" do
 
     let(:params) { {
-        :cores    => ['dev', 'prod'],
-        :version  => '5.6.2',
-        :mirror   => 'http://some-random-site.us',
+        :cores       => ['dev', 'prod'],
+        :version     => '5.6.2',
+        :mirror      => 'http://some-random-site.us',
+        :dist_root   => '/opt/tmpdata',
     } }
 
     it { should contain_solr__params }
@@ -37,6 +39,7 @@
                 'cores'      => ['dev', 'prod'],
                 'version'    => '5.6.2',
                 'mirror'     => 'http://some-random-site.us',
+                'dist_root'  => '/opt/tmpdata'
               })
     }
 

vagrant/base.pp

@@ -24,7 +24,7 @@
 
 # With all options
 class { 'solr':
-  mirror  => 'http://apache.bytenet.in/lucene/solr',
-  version => '4.10.3',
+  mirror  => 'http://www.interior-dsgn.com/apache/lucene/solr',
+  version => '4.10.4',
   cores   => ['development', 'staging', 'production'],
 }