summaryrefslogtreecommitdiffstats
path: root/spec/integration
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-04-30 16:39:08 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit5fd6e546af5b5e4520f2cc88aaa5b705cdfd4249 (patch)
tree89bf4dd9d611e18e8fbfe9b22d3291963f4a9129 /spec/integration
parent009629fe9f4d53882c819a0039ed873193917a32 (diff)
downloadpuppet-5fd6e546af5b5e4520f2cc88aaa5b705cdfd4249.tar.gz
puppet-5fd6e546af5b5e4520f2cc88aaa5b705cdfd4249.tar.xz
puppet-5fd6e546af5b5e4520f2cc88aaa5b705cdfd4249.zip
Change the main spec to an apply spec
This appears to have been left out of the preceeding commit sequence.
Diffstat (limited to 'spec/integration')
-rwxr-xr-xspec/integration/application/apply.rb (renamed from spec/integration/application/main.rb)6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/application/main.rb b/spec/integration/application/apply.rb
index b8933e438..c6e73e880 100755
--- a/spec/integration/application/main.rb
+++ b/spec/integration/application/apply.rb
@@ -4,9 +4,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
require 'puppet_spec/files'
-require 'puppet/application/main'
+require 'puppet/application/apply'
-describe "main" do
+describe "apply" do
include PuppetSpec::Files
describe "when applying provided catalogs" do
@@ -21,7 +21,7 @@ describe "main" do
File.open(manifest, "w") { |f| f.print catalog.to_pson }
- puppet = Puppet::Application[:main]
+ puppet = Puppet::Application[:apply]
puppet.options[:catalog] = manifest
puppet.apply