Upgrade to latest serverspec/specinfra

This commit is contained in:
Thom May 2015-06-23 11:30:55 +01:00
parent d13ea38c2f
commit ea6441eb57
8 changed files with 14 additions and 24 deletions

13
Gemfile
View File

@ -1,22 +1,21 @@
source 'https://rubygems.org' source 'https://rubygems.org'
group :lint do group :lint do
gem 'foodcritic', '~> 3.0' gem 'foodcritic'
gem 'rubocop', '~> 0.18' gem 'rubocop'
gem 'rainbow', '< 2.0'
end end
group :unit do group :unit do
gem 'berkshelf', '~> 3.1' gem 'berkshelf'
gem 'chefspec', '~> 3.4' gem 'chefspec'
end end
group :kitchen_common do group :kitchen_common do
gem 'test-kitchen', '~> 1.2' gem 'test-kitchen'
end end
group :kitchen_vagrant do group :kitchen_vagrant do
gem 'kitchen-vagrant', '~> 0.11' gem 'kitchen-vagrant'
end end
group :kitchen_cloud do group :kitchen_cloud do

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
require_relative '../../../kitchen/data/spec_helper' require_relative './spec_helper'
describe 'postfix::aliases' do describe 'postfix::aliases' do
context 'configures' do context 'configures' do

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
require_relative '../../../kitchen/data/spec_helper' require_relative './spec_helper'
describe 'postfix::client' do describe 'postfix::client' do
it 'doesnt configure postfix because solo is unsupported' do it 'doesnt configure postfix because solo is unsupported' do

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
require_relative '../../../kitchen/data/spec_helper' require_relative './spec_helper'
describe 'postfix::default' do describe 'postfix::default' do
describe package('postfix') do describe package('postfix') do

View File

@ -0,0 +1,3 @@
require 'serverspec'
set :backend, :exec

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
require_relative '../../../kitchen/data/spec_helper' require_relative './spec_helper'
describe 'postfix::sasl_auth' do describe 'postfix::sasl_auth' do
let(:sasl_passwd_file) { '/etc/postfix/sasl_passwd' } let(:sasl_passwd_file) { '/etc/postfix/sasl_passwd' }

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
require_relative '../../../kitchen/data/spec_helper' require_relative './spec_helper'
describe 'postfix::server' do describe 'postfix::server' do
it 'doesnt configure postfix because solo is unsupported' do it 'doesnt configure postfix because solo is unsupported' do

View File

@ -1,12 +0,0 @@
require 'serverspec'
include SpecInfra::Helper::Exec
include SpecInfra::Helper::DetectOS
RSpec.configure do |config|
config.before(:all) do
# centos-59 doesn't have /sbin in the default path,
# so we must ensure it's on serverspec's path
config.path = '/sbin'
end
end