diff options
| author | Markus Roberts <Markus@reality.com> | 2010-07-09 18:12:17 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-09 18:12:17 -0700 |
| commit | 3180b9d9b2c844dade1d361326600f7001ec66dd (patch) | |
| tree | 98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /spec/integration/parser/functions | |
| parent | 543225970225de5697734bfaf0a6eee996802c04 (diff) | |
| download | puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.gz puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.tar.xz puppet-3180b9d9b2c844dade1d361326600f7001ec66dd.zip | |
Code smell: Two space indentation
Replaced 106806 occurances of ^( +)(.*$) with
The ruby community almost universally (i.e. everyone but Luke, Markus, and the other eleven people
who learned ruby in the 1900s) uses two-space indentation.
3 Examples:
The code:
end
# Tell getopt which arguments are valid
def test_get_getopt_args
element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
becomes:
end
# Tell getopt which arguments are valid
def test_get_getopt_args
element = Setting.new :name => "foo", :desc => "anything", :settings => Puppet::Util::Settings.new
assert_equal([["--foo", GetoptLong::REQUIRED_ARGUMENT]], element.getopt_args, "Did not produce appropriate getopt args")
The code:
assert_equal(str, val)
assert_instance_of(Float, result)
end
# Now test it with a passed object
becomes:
assert_equal(str, val)
assert_instance_of(Float, result)
end
# Now test it with a passed object
The code:
end
assert_nothing_raised do
klass[:Yay] = "boo"
klass["Cool"] = :yayness
end
becomes:
end
assert_nothing_raised do
klass[:Yay] = "boo"
klass["Cool"] = :yayness
end
Diffstat (limited to 'spec/integration/parser/functions')
| -rwxr-xr-x | spec/integration/parser/functions/require_spec.rb | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/spec/integration/parser/functions/require_spec.rb b/spec/integration/parser/functions/require_spec.rb index 3d65a50f0..8b3beefe9 100755 --- a/spec/integration/parser/functions/require_spec.rb +++ b/spec/integration/parser/functions/require_spec.rb @@ -3,42 +3,42 @@ require File.dirname(__FILE__) + '/../../../spec_helper' describe "The require function" do - before :each do - @node = Puppet::Node.new("mynode") - @compiler = Puppet::Parser::Compiler.new(@node) - - @compiler.send(:evaluate_main) - @compiler.catalog.client_version = "0.25" - @scope = @compiler.topscope - # preload our functions - Puppet::Parser::Functions.function(:include) - Puppet::Parser::Functions.function(:require) - end - - it "should add a dependency between the 'required' class and our class" do - @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass") - - @scope.function_require("requiredclass") - @scope.resource["require"].should_not be_nil - ref = @scope.resource["require"].shift - ref.type.should == "Class" - ref.title.should == "Requiredclass" - end - - it "should queue relationships between the 'required' class and our classes" do - @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass1") - @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass2") - - @scope.function_require("requiredclass1") - @scope.function_require("requiredclass2") - - @scope.resource["require"].should_not be_nil - - (ref1,ref2) = @scope.resource["require"] - ref1.type.should == "Class" - ref1.title.should == "Requiredclass1" - ref2.type.should == "Class" - ref2.title.should == "Requiredclass2" - end + before :each do + @node = Puppet::Node.new("mynode") + @compiler = Puppet::Parser::Compiler.new(@node) + + @compiler.send(:evaluate_main) + @compiler.catalog.client_version = "0.25" + @scope = @compiler.topscope + # preload our functions + Puppet::Parser::Functions.function(:include) + Puppet::Parser::Functions.function(:require) + end + + it "should add a dependency between the 'required' class and our class" do + @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass") + + @scope.function_require("requiredclass") + @scope.resource["require"].should_not be_nil + ref = @scope.resource["require"].shift + ref.type.should == "Class" + ref.title.should == "Requiredclass" + end + + it "should queue relationships between the 'required' class and our classes" do + @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass1") + @compiler.known_resource_types.add Puppet::Resource::Type.new(:hostclass, "requiredclass2") + + @scope.function_require("requiredclass1") + @scope.function_require("requiredclass2") + + @scope.resource["require"].should_not be_nil + + (ref1,ref2) = @scope.resource["require"] + ref1.type.should == "Class" + ref1.title.should == "Requiredclass1" + ref2.type.should == "Class" + ref2.title.should == "Requiredclass2" + end end |
