Skip to content

Commit 3e974f4

Browse files
committed
Merge pull request #7 from bstopp/bug/fix_bad_specs
Fixing spec issues created by bad squash.
2 parents e2ee0e6 + e8b2ab1 commit 3e974f4

File tree

5 files changed

+18
-311
lines changed

5 files changed

+18
-311
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Puppet AEM Module - Manage your AEM Instances.
22

3-
Copyright 2015 Bryan Stopp
3+
Copyright 2015 Bryan Stopp ([email protected])
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

spec/acceptance/create_spec.rb

+10-11
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
apply_manifest(pp, :catch_failures => true)
4444
end
4545

46-
# after :context do
47-
# pp = <<-MANIFEST
48-
# File { backup => false, }
49-
# file { '/opt/aem' :
50-
# ensure => 'absent',
51-
# force => 'true',
52-
# }
53-
# MANIFEST
54-
# apply_manifest(pp, :catch_failures => true)
55-
# end
46+
after :context do
47+
pp = <<-MANIFEST
48+
File { backup => false, }
49+
file { '/opt/aem' :
50+
ensure => 'absent',
51+
force => 'true',
52+
}
53+
MANIFEST
54+
apply_manifest(pp, :catch_failures => true)
55+
end
5656

5757
context '#create' do
5858

@@ -72,7 +72,6 @@
7272
home => '/opt/aem',
7373
user => 'aem',
7474
group => 'aem',
75-
user => 'aem',
7675
}
7776
MANIFEST
7877

spec/acceptance/destroy_spec.rb

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
before :context do
66
pp = <<-MANIFEST
7+
File { backup => false, }
8+
79
file { '/opt/aem' :
810
ensure => 'directory',
911
@@ -42,6 +44,8 @@
4244

4345
after :context do
4446
pp = <<-MANIFEST
47+
File { backup => false, }
48+
4549
file { '/opt/aem' :
4650
ensure => 'absent',
4751
force => 'true',
@@ -55,6 +59,8 @@
5559

5660
it 'should work with no errors.' do
5761
pp = <<-MANIFEST
62+
File { backup => false, }
63+
5864
aem { '/opt/aem/faux' :
5965
ensure => absent,
6066
home => '/opt/aem/faux',

spec/acceptance/failures_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
it 'requires the source to be specified', :need_home => :true do
5757
pp = <<-MANIFEST
58+
File { backup => false, }
5859
aem { 'aem' :
5960
ensure => 'present',
6061
version => '6.1.0',

spec/unit/puppet/provider/aem/aem_spec.rb

-299
This file was deleted.

0 commit comments

Comments
 (0)