PR 76: Testing suite overhauled

Signed-off-by: gmiranda23 <[email protected]>

Author: shortdudey123

.kitchen.yml

@@ -5,6 +5,9 @@ driver_config:
     memory: 1024
 
 platforms:
+  - name: ubuntu-14.04
+    run_list:
+    - recipe[apt]
   - name: ubuntu-12.04
     run_list:
     - recipe[apt]

.rspec

@@ -0,0 +1 @@
+--color

.rubocop.yml

@@ -1,14 +1,21 @@
 AllCops:
-  Excludes:
+  Exclude:
     - vendor/**
 
-AlignParameters:
-  Enabled: false
-Encoding:
+Style/SingleSpaceBeforeFirstArg:
   Enabled: false
+
 HashSyntax:
   Enabled: false
+
 LineLength:
   Enabled: false
+
 MethodLength:
   Max: 30
+
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+Style/BlockComments:
+  Enabled: false

.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.5
+bundler_args: --without integration
 before_script:
   - bundle exec berks install
 script:
-  - bundle exec rubocop
-  - bundle exec foodcritic -f any --tags ~FC023 .
-  - bundle exec rspec --color --format progress
+  - bundle exec rake

Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf',  '~> 2.0'
-gem 'chefspec',   '~> 2.0'
-gem 'foodcritic', '~> 3.0'
-gem 'rubocop',    '~> 0.23'
+gem 'chefspec',   '~> 4.0'
+gem 'foodcritic', '~> 4.0'
+gem 'rubocop',    '~> 0.27.1'
 
 group :integration do
-  gem 'test-kitchen',    '~> 1.2'
+  gem 'test-kitchen',    '~> 1.2.1'
   gem 'kitchen-vagrant', '~> 0.15'
 end

README.md

@@ -1,6 +1,6 @@
 NTP Cookbook
 ============
-[![Build Status](https://secure.travis-ci.org/opscode-cookbooks/ntp.png?branch=master)](http://travis-ci.org/opscode-cookbooks/ntp)
+[![Build Status](https://secure.travis-ci.org/gmiranda23/ntp.png?branch=master)](http://travis-ci.org/gmiranda23/ntp)
 
 Installs and configures ntp. On Windows systems it uses the Meinberg port of the standard NTPd client to Windows.
 
@@ -157,7 +157,7 @@ If for some reason you need to stop and remove the ntp daemon, you can apply thi
 
 ### windows_client recipe
 
-Windows only. Apply on a Windows host to install the Meinberg NTPd client. 
+Windows only. Apply on a Windows host to install the Meinberg NTPd client.
 
 
 Development
@@ -179,10 +179,8 @@ This section details "quick development" steps. For a detailed explanation, see
 4. **Write tests**
 5. Make your changes/patches/fixes, committing appropriately
 6. Run the tests:
-    - `bundle exec foodcritic -f any .`
-    - `bundle exec rspec`
-    - `bundle exec rubocop`
-    - `bundle exec kitchen test`
+    - `bundle exec rake`
+    - `bundle exec rake kitchen`
 
   In detail:
     - Foodcritic will catch any Chef-specific style errors

Rakefile

@@ -0,0 +1,36 @@
+#!/usr/bin/env rake
+
+require 'foodcritic'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+
+task :default => [
+  :style,
+  :spec
+]
+task :kitchen => [
+  'kitchen:all'
+]
+
+# Style tests. Rubocop and Foodcritic
+namespace :style do
+  desc 'Run Ruby style checks'
+  RuboCop::RakeTask.new(:ruby)
+
+  desc 'Run Chef style checks'
+  FoodCritic::Rake::LintTask.new(:chef)
+end
+
+desc 'Run all style checks'
+task style: ['style:chef', 'style:ruby']
+
+# Rspec and ChefSpec
+desc 'Run ChefSpec examples'
+RSpec::Core::RakeTask.new(:spec)
+
+begin
+  require 'kitchen/rake_tasks'
+  Kitchen::RakeTasks.new
+rescue LoadError
+  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
+end

TESTING.md

@@ -42,10 +42,8 @@ Development
 5. Write tests to support those changes. It is highly recommended you write both unit and integration tests.
 6. Run the tests:
 
-    - `bundle exec rspec`
-    - `bundle exec foodcritic .`
-    - `bundle exec rubocop`
-    - `bundle exec kitchen test`
+    - `bundle exec rake`
+    - `bundle exec rake kitchen`
 
 7. Assuming the tests pass, open a Pull Request on GitHub
 8. Open a JIRA ticket for this component, linking the JIRA ticket to the Pull Request and visa versa.

metadata.rb

@@ -8,7 +8,7 @@
 
 recipe 'ntp', 'Installs and configures ntp either as a server or client'
 
-%w{ amazon centos debian fedora freebsd gentoo redhat scientific solaris2 oracle ubuntu windows xcp }.each do |os|
+%w( amazon centos debian fedora freebsd gentoo redhat scientific solaris2 oracle ubuntu windows xcp ).each do |os|
   supports os
 end
 

recipes/default.rb

@@ -99,11 +99,10 @@
   end
 end
 
-if node['ntp']['sync_hw_clock'] && !platform_family?('windows')
-  execute 'Force sync hardware clock with system clock' do
-    command 'hwclock --systohc'
-    action :run
-  end
+execute 'Force sync hardware clock with system clock' do
+  command 'hwclock --systohc'
+  action :run
+  only_if { node['ntp']['sync_hw_clock'] && !platform_family?('windows') }
 end
 
 service node['ntp']['service'] do

recipes/windows_client.rb

@@ -41,7 +41,7 @@
   only_if        { node['kernel']['release'].to_f < 6 }
 end
 
-unless File.exists?('C:/NTP/bin/ntpd.exe')
+unless File.exist?('C:/NTP/bin/ntpd.exe')
   remote_file "#{Chef::Config[:file_cache_path]}/ntpd.exe" do
     source node['ntp']['package_url']
   end

spec/unit/attributes_spec.rb

@@ -24,7 +24,7 @@
 require 'spec_helper'
 
 describe 'ntp attributes' do
-  let(:chef_run) { ChefSpec::ChefRunner.new.converge('ntp::default') }
+  let(:chef_run) { ChefSpec::SoloRunner.new.converge('ntp::default') }
   let(:ntp) { chef_run.node['ntp'] }
 
   describe 'on an unknown platform' do
@@ -88,23 +88,23 @@
   end
 
   describe 'on Debian-family platforms' do
-    let(:chef_run) { ChefSpec::ChefRunner.new(platform: 'ubuntu', version: '12.04').converge('ntp::default') }
+    let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04').converge('ntp::default') }
 
     it 'sets the service name to ntp' do
       expect(ntp['service']).to eq('ntp')
     end
   end
 
   describe 'on Ubuntu' do
-    let(:chef_run) { ChefSpec::ChefRunner.new(platform: 'ubuntu', version: '12.04').converge('ntp::default') }
+    let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '12.04').converge('ntp::default') }
 
     it 'sets the apparmor_enabled attribute to true' do
       expect(ntp['apparmor_enabled']).to eq(true)
     end
   end
 
   describe 'on the CentOS 5 platform' do
-    let(:chef_run) { ChefSpec::ChefRunner.new(platform: 'centos', version: '5.8').converge('ntp::default') }
+    let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'centos', version: '5.8').converge('ntp::default') }
 
     it 'sets the package list to only ntp' do
       expect(ntp['packages']).to include('ntp')
@@ -113,8 +113,26 @@
   end
 
   describe 'on the Windows platform' do
-    let(:chef_run) { ChefSpec::ChefRunner.new(platform: 'windows', version: '2008R2').converge('ntp::default') }
+    let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'windows', version: '2008R2').converge('ntp::default') }
 
+    # chefspec can not check windows reliably so skip these tests for now
+    it 'sets the service name to NTP'
+
+    it 'sets the drift file to /var/db/ntpd.drift'
+
+    it 'sets the conf file to /etc/ntp.conf'
+
+    it 'sets the conf_owner to root'
+
+    it 'sets the conf_group to root'
+
+    it 'sets the package_url correctly'
+
+    it 'sets the vs_runtime_url correctly'
+
+    it 'sets the vs_runtime_productname correctly'
+
+=begin
     it 'sets the service name to NTP' do
       pending('ChefSpec does not yet understand the inherits attribute in cookbook_file resources')
       expect(ntp['service']).to eq('NTP')
@@ -154,10 +172,12 @@
       pending('ChefSpec does not yet understand the inherits attribute in cookbook_file resources')
       expect(ntp['vs_runtime_productname']).to eq('Microsoft Visual C++ 2008 Redistributable - x86 9.0.21022')
     end
+=end
+
   end
 
   describe 'on the FreeBSD platform' do
-    let(:chef_run) { ChefSpec::ChefRunner.new(platform: 'freebsd', version: '9.1').converge('ntp::default') }
+    let(:chef_run) { ChefSpec::SoloRunner.new(platform: 'freebsd', version: '9.1').converge('ntp::default') }
 
     it 'sets the package list to only ntp' do
       expect(ntp['packages']).to include('ntp')

spec/unit/recipes/apparmor_spec.rb

@@ -1,16 +1,17 @@
 require 'spec_helper'
 
 describe 'ntp::apparmor' do
-  let(:chef_run) { ChefSpec::ChefRunner.new.converge('recipe[ntp::apparmor]') }
+  let(:chef_run) { ChefSpec::SoloRunner.new.converge('recipe[ntp::apparmor]') }
 
   it 'creates the apparmor file' do
     expect(chef_run).to create_cookbook_file '/etc/apparmor.d/usr.sbin.ntpd'
     file = chef_run.cookbook_file('/etc/apparmor.d/usr.sbin.ntpd')
-    expect(file).to be_owned_by('root', 'root')
+    expect(file.owner).to eq('root')
+    expect(file.group).to eq('root')
   end
 
   it 'restarts the apparmor service' do
-    chef_run.cookbook_file('/etc/apparmor.d/usr.sbin.ntpd').should notify('service[apparmor]', :restart)
+    expect(chef_run.cookbook_file('/etc/apparmor.d/usr.sbin.ntpd')).to notify('service[apparmor]').to(:restart)
   end
 
 end