spec/solaris/file_spec.rb in serverspec-0.7.10 vs spec/solaris/file_spec.rb in serverspec-0.7.11
- old
+ new
@@ -29,42 +29,42 @@
it { should_not be_socket }
end
describe file('/etc/ssh/sshd_config') do
it { should contain 'This is the sshd server system-wide configuration file' }
- its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+ its(:command) { should eq "grep -q -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
end
describe file('/etc/ssh/sshd_config') do
it { should contain /^This is the sshd server system-wide configuration file/ }
- its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
+ its(:command) { should eq "grep -q -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config || grep -qF -- \\^This\\ is\\ the\\ sshd\\ server\\ system-wide\\ configuration\\ file /etc/ssh/sshd_config" }
end
describe file('/etc/ssh/sshd_config') do
it { should_not contain 'This is invalid text!!' }
end
describe file('Gemfile') do
it { should contain('rspec').from(/^group :test do/).to(/^end/) }
- its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+ its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
end
describe file('/etc/ssh/sshd_config') do
it { should_not contain('This is invalid text!!').from(/^group :test do/).to(/^end/) }
end
describe file('Gemfile') do
it { should contain('rspec').after(/^group :test do/) }
- its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin" }
+ its(:command) { should eq "sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -q -- rspec /dev/stdin || sed -n /\\^group\\ :test\\ do/,\\$p Gemfile | grep -qF -- rspec /dev/stdin" }
end
describe file('/etc/ssh/sshd_config') do
it { should_not contain('This is invalid text!!').after(/^group :test do/) }
end
describe file('Gemfile') do
it { should contain('rspec').before(/^end/) }
- its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin" }
+ its(:command) { should eq "sed -n 1,/\\^end/p Gemfile | grep -q -- rspec /dev/stdin || sed -n 1,/\\^end/p Gemfile | grep -qF -- rspec /dev/stdin" }
end
describe file('/etc/ssh/sshd_config') do
it { should_not contain('This is invalid text!!').before(/^end/) }
end