Adjusted tests for proxy variables.

pascalseeland · Jun 15, 2015 · 310ed82 · 310ed82
1 parent 10f7710
commit 310ed82
Showing 1 changed file with 11 additions and 42 deletions.
diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -48,12 +48,6 @@
           :group => 'root',
           :mode => '0644'
         )}
-        it { is_expected.to contain_file("/etc/nginx/conf.d/proxy.conf").with(
-          :ensure => 'file',
-          :owner => 'root',
-          :group => 'root',
-          :mode => '0644'
-        )}
         it { is_expected.to contain_file("/tmp/nginx.d").with(
           :ensure => 'absent',
           :purge => true,
@@ -379,48 +373,23 @@
           :value => false,
           :notmatch => /mail/,
         },
-      ].each do |param|
-        context "when #{param[:attr]} is #{param[:value]}" do
-          let :params do { param[:attr].to_sym => param[:value] } end
-
-          it { is_expected.to contain_file("/etc/nginx/nginx.conf").with_mode('0644') }
-          it param[:title] do
-            matches  = Array(param[:match])
-
-            if matches.all? { |m| m.is_a? Regexp }
-              matches.each { |item| is_expected.to contain_file('/etc/nginx/nginx.conf').with_content(item) }
-            else
-              lines = catalogue.resource('file', '/etc/nginx/nginx.conf').send(:parameters)[:content].split("\n")
-              expect(lines & Array(param[:match])).to eq(Array(param[:match]))
-            end
-
-            Array(param[:notmatch]).each do |item|
-              is_expected.to contain_file("/etc/nginx/nginx.conf").without_content(item)
-            end
-          end
-        end
-      end
-    end
-
-    describe "proxy.conf template content" do
-      [
         {
           :title => 'should set proxy_buffers',
           :attr  => 'proxy_buffers',
           :value => '50 5k',
-          :match => 'proxy_buffers           50 5k;',
+          :match => '  proxy_buffers           50 5k;',
         },
         {
           :title => 'should set proxy_buffer_size',
           :attr  => 'proxy_buffer_size',
           :value => '2k',
-          :match => 'proxy_buffer_size       2k;',
+          :match => '  proxy_buffer_size       2k;',
         },
         {
           :title => 'should set proxy_http_version',
           :attr  => 'proxy_http_version',
           :value => '1.1',
-          :match => 'proxy_http_version      1.1;',
+          :match => '  proxy_http_version      1.1;',
         },
         {
           :title    => 'should not set proxy_http_version',
@@ -433,39 +402,39 @@
           :attr  => 'proxy_set_header',
           :value => ['header1','header2'],
           :match => [
-            'proxy_set_header        header1;',
-            'proxy_set_header        header2;',
+            '  proxy_set_header        header1;',
+            '  proxy_set_header        header2;',
           ],
         },
         {
             :title    => 'should set client_body_temp_path',
             :attr     => 'client_body_temp_path',
             :value    => '/path/to/body_temp',
-            :match => 'client_body_temp_path   /path/to/body_temp;',
+            :match => '  client_body_temp_path   /path/to/body_temp;',
         },
         {
             :title    => 'should set proxy_temp_path',
             :attr     => 'proxy_temp_path',
             :value    => '/path/to/proxy_temp',
-            :match => 'proxy_temp_path         /path/to/proxy_temp;',
+            :match => '  proxy_temp_path         /path/to/proxy_temp;',
         },
       ].each do |param|
         context "when #{param[:attr]} is #{param[:value]}" do
           let :params do { param[:attr].to_sym => param[:value] } end
 
-          it { is_expected.to contain_file("/etc/nginx/conf.d/proxy.conf").with_mode('0644') }
+          it { is_expected.to contain_file("/etc/nginx/nginx.conf").with_mode('0644') }
           it param[:title] do
             matches  = Array(param[:match])
 
             if matches.all? { |m| m.is_a? Regexp }
-              matches.each { |item| is_expected.to contain_file('/etc/nginx/conf.d/proxy.conf').with_content(item) }
+              matches.each { |item| is_expected.to contain_file('/etc/nginx/nginx.conf').with_content(item) }
             else
-              lines = catalogue.resource('file', '/etc/nginx/conf.d/proxy.conf').send(:parameters)[:content].split("\n")
+              lines = catalogue.resource('file', '/etc/nginx/nginx.conf').send(:parameters)[:content].split("\n")
               expect(lines & Array(param[:match])).to eq(Array(param[:match]))
             end
 
             Array(param[:notmatch]).each do |item|
-              is_expected.to contain_file("/etc/nginx/conf.d/proxy.conf").without_content(item)
+              is_expected.to contain_file("/etc/nginx/nginx.conf").without_content(item)
             end
           end
         end