Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions spec/acceptance/apache_parameters_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class { 'apache':
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
Expand All @@ -70,7 +70,7 @@ class { 'apache':
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.not_to be_running }
it { is_expected.not_to be_enabled }
end
Expand All @@ -88,7 +88,7 @@ class { 'apache':
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.not_to be_running }
it { is_expected.not_to be_enabled }
end
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
it { is_expected.to be_installed }
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -77,7 +77,7 @@ class { 'apache':
idempotent_apply(pp)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down
8 changes: 4 additions & 4 deletions spec/acceptance/default_mods_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class { 'apache':
idempotent_apply(pp)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
end
end
Expand Down Expand Up @@ -56,7 +56,7 @@ class { 'apache':
end
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.not_to be_running }
end
end
Expand Down Expand Up @@ -89,7 +89,7 @@ class { 'apache':
idempotent_apply(pp)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
end
end
Expand All @@ -108,7 +108,7 @@ class { 'apache': default_mods => false }
idempotent_apply(pp)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
end

Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/itk_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class { 'apache':
end
end

describe service(service_name), skip: 'FM-8483' do
describe service(service_name) do
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/prefork_worker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class { 'apache':
end
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
Expand All @@ -39,7 +39,7 @@ class { 'apache':
end
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
Expand All @@ -61,7 +61,7 @@ class { 'apache':
end
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_running }
it { is_expected.to be_enabled }
end
Expand Down
18 changes: 9 additions & 9 deletions spec/acceptance/vhost_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class { 'apache':
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -247,7 +247,7 @@ class { 'apache':
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -307,7 +307,7 @@ class { 'apache': }
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -369,7 +369,7 @@ class { 'apache': }
apply_manifest(pp_one, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -411,7 +411,7 @@ class { 'apache': }
apply_manifest(pp_two, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -487,7 +487,7 @@ class { 'apache': }
apply_manifest(pp_two, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }

Expand Down Expand Up @@ -528,7 +528,7 @@ class { 'apache': }
apply_manifest(pp, catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -574,7 +574,7 @@ class { 'apache': default_vhost => false, }
), catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down Expand Up @@ -619,7 +619,7 @@ class { 'apache': default_vhost => false, }
), catch_failures: true)
end

describe service(apache_hash['service_name']), skip: 'FM-8483' do
describe service(apache_hash['service_name']) do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end
Expand Down