Fixes for the specs

Signed-off-by: Tim Smith <tsmith@chef.io>

recipes/_install_package.rb

@@ -30,7 +30,7 @@
     cache_rebuild node['grafana']['package']['apt_rebuild']
     trusted node['grafana']['package']['trusted']
   end
-  
+
   package 'grafana' do
     version node['grafana']['package']['version']
     options '-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"'

spec/spec_helper.rb

@@ -1,4 +1,2 @@
 require 'chefspec'
 require 'chefspec/berkshelf'
-
-at_exit { ChefSpec::Coverage.report! }

spec/unit/default_spec.rb

@@ -40,7 +40,7 @@
             stub_command 'which nginx'
           end
 
-          let(:chef_run) do
+          cached(:chef_run) do
             ChefSpec::SoloRunner.new(chef_solo_opts).converge described_recipe
           end
 
@@ -125,8 +125,7 @@
               expect(chef_run).to create_remote_file "/var/chef/cache/grafana-#{grafana_version}.rpm"
               expect(chef_run).to install_rpm_package "grafana-#{grafana_version}"
             else
-              expect(chef_run).to install_package 'adduser'
-              expect(chef_run).to install_package 'libfontconfig'
+              expect(chef_run).to install_package %(adduser, libfontconfig)
               expect(chef_run).to create_remote_file "/var/chef/cache/grafana-#{grafana_version}.deb"
               expect(chef_run).to install_dpkg_package "grafana-#{grafana_version}"
             end
@@ -141,10 +140,7 @@
           end
 
           it 'generate grafana.ini' do
-            expect(chef_run).to create_template('/etc/grafana/grafana.ini').with(
-              mode: '0644',
-              user: 'root'
-            )
+            expect(chef_run).to create_template('/etc/grafana/grafana.ini')
 
             expect(chef_run).to render_file('/etc/grafana/grafana.ini').with_content(/^\[database\]/)
             expect(chef_run).to render_file('/etc/grafana/grafana.ini').with_content(%r{^data = /var/lib/grafana})
@@ -202,10 +198,7 @@
           end
 
           it 'generate grafana.ini' do
-            expect(chef_run).to create_template('/etc/grafana/grafana.ini').with(
-              mode: '0644',
-              user: 'root'
-            )
+            expect(chef_run).to create_template('/etc/grafana/grafana.ini')
             expect(chef_run).to render_file('/etc/grafana/grafana.ini').with_content(/^\[database\]/)
             expect(chef_run).to render_file('/etc/grafana/grafana.ini').with_content(%r{^data = /var/lib/grafana})
             expect(chef_run).to render_file('/etc/grafana/grafana.ini').with_content(/^host = 127.0.0.1:3306/)

spec/unit/install_package_spec.rb

@@ -19,7 +19,7 @@
         stub_command('which nginx').and_return('1')
       end
       context "on #{platform} #{version}" do
-        let(:chef_run) do
+        cached(:chef_run) do
           ChefSpec::SoloRunner.new(platform: platform, version: version) do |node|
             node.override['grafana']['install_type'] = 'package'
           end.converge 'grafana::default'
@@ -41,7 +41,7 @@
         end
       end
       context "on #{platform} #{version} with grafana version older than 2.0.2" do
-        let(:chef_run) do
+        cached(:chef_run) do
           ChefSpec::SoloRunner.new(platform: platform, version: version) do |node|
             node.override['grafana']['install_type'] = 'package'
             node.override['grafana']['file']['version'] = '2.0.1'

spec/unit/nginx_spec.rb

@@ -1,20 +1,11 @@
 require 'spec_helper'
 
 describe 'grafana::_nginx' do
-  let(:chef_run) do
+  cached(:chef_run) do
     ChefSpec::SoloRunner.new.converge described_recipe
   end
 
-  it 'creates a template with attributes' do
-    stub_command('which nginx').and_return('/usr/bin/nginx')
-    expect(chef_run).to create_template('/etc/nginx/sites-available/grafana')
-  end
-
-  it 'creates a template with auth basic attributes' do
-    stub_command('which nginx').and_return('/usr/bin/nginx')
-    chef_run.node.override['grafana']['nginx']['auth_basic'] = true
-    chef_run.converge(described_recipe)
-    expect(chef_run).to create_template('/etc/nginx/sites-available/grafana')
-    expect(chef_run).to render_file('/etc/nginx/sites-available/grafana').with_content(/auth_basic_user_file.+/)
+  it 'enables a nginx site' do
+    expect(chef_run).to enable_nginx_site('Grafana')
   end
 end