Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use rspec-puppet > 1.0.1 from git #2

Merged
merged 2 commits into from
Nov 19, 2014
Merged

use rspec-puppet > 1.0.1 from git #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c92bd
use rspec-puppet > 1.0.1 & rspec-puppet-augeas from git
jhoblitt Nov 19, 2014
eb74769
add compatibility with rspec 1.0.1+ exception handling
jhoblitt Nov 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@ gem 'rake', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-syntax', :require => false
gem 'rspec-puppet', :require => false
gem 'rspec-puppet',
:git => 'https://github.com/rodjek/rspec-puppet.git',
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
:require => false
# rspec 3 spews warnings with rspec-puppet 1.0.1
gem 'rspec-core', '~> 2.0', :require => false

# rspec-puppet > 1 appears to breaks rspec-puppet-augeas 0.2.3
# see https://github.com/domcleal/rspec-puppet-augeas/issues/9
# rspec-puppet-augeas requires rspec-puppet < 1
gem 'rspec-puppet-augeas', '0.3.0', :require => false
gem 'rspec-puppet-augeas',
:git => '[email protected]:jhoblitt/rspec-puppet-augeas.git',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using an HTTPS URL here may fix the Travis CI failure, so it doesn't require an SSH key.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried restarting the travis job; if it fails again I'll do exactly that. Travis has been running so slow lately I didn't even wait for the job to finish before linking to the PR.

:ref => '6152e283a65f96188dded35be30f6e0540208594',
:require => false
gem 'ruby-augeas', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
Expand Down
14 changes: 7 additions & 7 deletions spec/unit/classes/mdadm_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
let(:params) {{ :config_file_manage => 'foo' }}

it 'should fail' do
expect { should }.to raise_error(/is not a boolean/)
should raise_error(/is not a boolean/)
end
end
end # config_file_manage =>
Expand Down Expand Up @@ -112,7 +112,7 @@
let(:params) {{ :config_file_options => nil }}

it 'should fail' do
expect { should }.to raise_error(/is not a Hash/)
should raise_error(/is not a Hash/)
end
end
end # options =>
Expand Down Expand Up @@ -150,7 +150,7 @@
let(:params) {{ :service_force => 'foo' }}

it 'should fail' do
expect { should }.to raise_error(/is not a boolean/)
should raise_error(/is not a boolean/)
end
end
end # service_force
Expand Down Expand Up @@ -188,7 +188,7 @@
let(:params) {{ :service_ensure => 'foo' }}

it 'should fail' do
expect { should }.to raise_error(/does not match/)
should raise_error(/does not match/)
end
end
end # service_ensure
Expand Down Expand Up @@ -226,7 +226,7 @@
let(:params) {{ :service_enable => 'foo' }}

it 'should fail' do
expect { should }.to raise_error(/is not a boolean/)
should raise_error(/is not a boolean/)
end
end
end # service_enable
Expand All @@ -248,7 +248,7 @@
let(:params) {{ :raid_check_manage => 'foo' }}

it 'should fail' do
expect { should }.to raise_error(/is not a boolean/)
should raise_error(/is not a boolean/)
end
end
end # raid_check_manage
Expand Down Expand Up @@ -323,7 +323,7 @@
let(:params) {{ :raid_check_options => 'some_string' }}

it 'should fail' do
expect { should }.to raise_error(/is not a Hash/)
should raise_error(/is not a Hash/)
end
end

Expand Down