summaryrefslogtreecommitdiff
path: root/spec/integration/parser/catalog_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/integration/parser/catalog_spec.rb')
-rw-r--r--spec/integration/parser/catalog_spec.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/integration/parser/catalog_spec.rb b/spec/integration/parser/catalog_spec.rb
index e37eb591a..39aeb394e 100644
--- a/spec/integration/parser/catalog_spec.rb
+++ b/spec/integration/parser/catalog_spec.rb
@@ -75,6 +75,14 @@ describe "A catalog" do
expect(resources_in(agent_catalog)).to_not include(*exported_resources)
end
end
+ end
+
+ describe 'using classic parser' do
+ before :each do
+ Puppet[:parser] = 'current'
+ end
+ it_behaves_like 'when compiled' do
+ end
it "compiles resource creation from appended array as two separate resources" do
# moved here from acceptance test "jeff_append_to_array.rb"
@@ -92,14 +100,6 @@ describe "A catalog" do
end
end
- describe 'using classic parser' do
- before :each do
- Puppet[:parser] = 'current'
- end
- it_behaves_like 'when compiled' do
- end
- end
-
describe 'using future parser' do
before :each do
Puppet[:parser] = 'future'
@@ -113,9 +113,9 @@ describe "A catalog" do
end
def master_and_agent_catalogs_for(manifest)
- master_catalog = Puppet::Resource::Catalog::Compiler.new.filter(compile_to_catalog(manifest))
+ compiler = Puppet::Resource::Catalog::Compiler.new
+ master_catalog = compiler.filter(compile_to_catalog(manifest))
agent_catalog = Puppet::Resource::Catalog.convert_from(:pson, master_catalog.render(:pson))
-
[master_catalog, agent_catalog]
end