Merge pull request #44 from tas50/master

Fix failing Chefspecs

Author: chris-rock

.travis.yml

@@ -29,17 +29,15 @@ env:
 before_script:
   - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
   - eval "$(/opt/chefdk/bin/chef shell-init bash)"
+  - /opt/chefdk/embedded/bin/chef --version
+  - /opt/chefdk/embedded/bin/cookstyle --version
+  - /opt/chefdk/embedded/bin/foodcritic --version
   - /opt/chefdk/embedded/bin/chef gem install coveralls # needed for chefspecs
 
 script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
 
 matrix:
   include:
-    - before_script:
-      - eval "$(/opt/chefdk/bin/chef shell-init bash)"
-      - /opt/chefdk/embedded/bin/chef --version
-      - /opt/chefdk/embedded/bin/cookstyle --version
-      - /opt/chefdk/embedded/bin/foodcritic --version
     - script:
       - /opt/chefdk/bin/chef exec rake
       env: UNIT_AND_LINT=1

spec/recipes/default_spec.rb

@@ -15,23 +15,17 @@
 # limitations under the License.
 #
 
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe 'nginx-hardening::default' do
-  before { allow_any_instance_of(Chef::Recipe).to receive(:search) }
   let(:runner) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
-  let(:node) { runner.node }
   let(:chef_run) { runner.converge('chef_nginx::default', described_recipe) }
 
-  before do
-    stub_command('/usr/sbin/apache2 -t')
+  before(:each) do
     stub_command("find /etc/nginx -perm -o+r -type f -o -perm -o+w -type f | wc -l | egrep '^0$'")
-    stub_command('which nginx').and_return(true)
-    allow(::File).to receive(:exist?).and_return(false)
-    allow(::File).to receive(:exist?).with('/etc/nginx/dh2048.pem').and_return(false)
   end
 
-  # check that the recipres are executed
+  # check that the recipes are executed
   it 'default should include os-hardening recipes by default' do
     expect(chef_run).to include_recipe 'nginx-hardening::minimize_access'
   end

spec/spec_helper.rb

@@ -20,6 +20,12 @@
 require 'chefspec/berkshelf'
 require 'coveralls'
 
+RSpec.configure do |config|
+  config.color = true               # Use color in STDOUT
+  config.formatter = :documentation # Use the specified formatter
+  config.log_level = :error         # Avoid deprecation notice SPAM
+end
+
 # coverage report
 Coveralls.wear!
 at_exit { ChefSpec::Coverage.report! }