summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorLuke Kanies <luke@puppetlabs.com>2010-04-09 15:55:17 -0700
committerLuke Kanies <luke@puppetlabs.com>2010-04-09 15:55:17 -0700
commitfe140a283fc51216a460be24c19641e26724c92c (patch)
tree35df1a58d10ed0a4be90322060556237bbd4dac3 /spec
parentedef6478e0cc47c0d2db0198fcc54897f85657bb (diff)
downloadpuppet-fe140a283fc51216a460be24c19641e26724c92c.tar.gz
puppet-fe140a283fc51216a460be24c19641e26724c92c.tar.xz
puppet-fe140a283fc51216a460be24c19641e26724c92c.zip
Migrating "puppet" executable integration test
Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Diffstat (limited to 'spec')
-rwxr-xr-xspec/integration/application/main.rb (renamed from spec/integration/application/puppet.rb)6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/application/puppet.rb b/spec/integration/application/main.rb
index cfafc9c0c..b8933e438 100755
--- a/spec/integration/application/puppet.rb
+++ b/spec/integration/application/main.rb
@@ -4,9 +4,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
require 'puppet_spec/files'
-require 'puppet/application/puppet'
+require 'puppet/application/main'
-describe "Puppet" do
+describe "main" do
include PuppetSpec::Files
describe "when applying provided catalogs" do
@@ -21,7 +21,7 @@ describe "Puppet" do
File.open(manifest, "w") { |f| f.print catalog.to_pson }
- puppet = Puppet::Application[:puppet]
+ puppet = Puppet::Application[:main]
puppet.options[:catalog] = manifest
puppet.apply