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/provider | |
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/provider')
-rwxr-xr-x | spec/integration/provider/mailalias/aliases_spec.rb | 22 | ||||
-rwxr-xr-x | spec/integration/provider/package_spec.rb | 30 | ||||
-rwxr-xr-x | spec/integration/provider/service/init_spec.rb | 30 |
3 files changed, 41 insertions, 41 deletions
diff --git a/spec/integration/provider/mailalias/aliases_spec.rb b/spec/integration/provider/mailalias/aliases_spec.rb index fde0b001f..8106c2cb5 100755 --- a/spec/integration/provider/mailalias/aliases_spec.rb +++ b/spec/integration/provider/mailalias/aliases_spec.rb @@ -9,17 +9,17 @@ require 'puppettest/fileparsing' provider_class = Puppet::Type.type(:mailalias).provider(:aliases) describe provider_class do - include PuppetTest - include PuppetTest::FileParsing + include PuppetTest + include PuppetTest::FileParsing - before :each do - @provider = provider_class - end + before :each do + @provider = provider_class + end - # #1560 - PuppetTest.fakedata("data/providers/mailalias/aliases").each { |file| - it "should be able to parse the examples in #{file}" do - fakedataparse(file) - end - } + # #1560 + PuppetTest.fakedata("data/providers/mailalias/aliases").each { |file| + it "should be able to parse the examples in #{file}" do + fakedataparse(file) + end + } end diff --git a/spec/integration/provider/package_spec.rb b/spec/integration/provider/package_spec.rb index 6c854fb3e..736a34e68 100755 --- a/spec/integration/provider/package_spec.rb +++ b/spec/integration/provider/package_spec.rb @@ -3,24 +3,24 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") } describe "Package Provider" do - Puppet::Type.type(:package).providers.each do |name| - provider = Puppet::Type.type(:package).provider(name) + Puppet::Type.type(:package).providers.each do |name| + provider = Puppet::Type.type(:package).provider(name) - describe name do - confine "Provider #{name} is not suitable" => provider.suitable? + describe name do + confine "Provider #{name} is not suitable" => provider.suitable? - it "should fail when asked to install an invalid package" do - pending("This test hangs forever with recent versions of RubyGems") if provider.name == :gem - pkg = Puppet::Type.newpackage :name => "nosuch#{provider.name}", :provider => provider.name - lambda { pkg.provider.install }.should raise_error - end + it "should fail when asked to install an invalid package" do + pending("This test hangs forever with recent versions of RubyGems") if provider.name == :gem + pkg = Puppet::Type.newpackage :name => "nosuch#{provider.name}", :provider => provider.name + lambda { pkg.provider.install }.should raise_error + end - it "should be able to get a list of existing packages" do - provider.instances.each do |package| - package.should be_instance_of(provider) - package.properties[:provider].should == provider.name - end - end + it "should be able to get a list of existing packages" do + provider.instances.each do |package| + package.should be_instance_of(provider) + package.properties[:provider].should == provider.name end + end end + end end diff --git a/spec/integration/provider/service/init_spec.rb b/spec/integration/provider/service/init_spec.rb index e185247cb..d916ab32a 100755 --- a/spec/integration/provider/service/init_spec.rb +++ b/spec/integration/provider/service/init_spec.rb @@ -6,27 +6,27 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f provider = Puppet::Type.type(:service).provider(:init) describe provider do - describe "when running on FreeBSD" do - confine "Not running on FreeBSD" => (Facter.value(:operatingsystem) == "FreeBSD") + describe "when running on FreeBSD" do + confine "Not running on FreeBSD" => (Facter.value(:operatingsystem) == "FreeBSD") - it "should set its default path to include /etc/init.d and /usr/local/etc/init.d" do - provider.defpath.should == ["/etc/rc.d", "/usr/local/etc/rc.d"] - end + it "should set its default path to include /etc/init.d and /usr/local/etc/init.d" do + provider.defpath.should == ["/etc/rc.d", "/usr/local/etc/rc.d"] end + end - describe "when running on HP-UX" do - confine "Not running on HP-UX" => (Facter.value(:operatingsystem) == "HP-UX") + describe "when running on HP-UX" do + confine "Not running on HP-UX" => (Facter.value(:operatingsystem) == "HP-UX") - it "should set its default path to include /sbin/init.d" do - provider.defpath.should == "/sbin/init.d" - end + it "should set its default path to include /sbin/init.d" do + provider.defpath.should == "/sbin/init.d" end + end - describe "when not running on FreeBSD or HP-UX" do - confine "Running on HP-UX or FreeBSD" => (! %w{HP-UX FreeBSD}.include?(Facter.value(:operatingsystem))) + describe "when not running on FreeBSD or HP-UX" do + confine "Running on HP-UX or FreeBSD" => (! %w{HP-UX FreeBSD}.include?(Facter.value(:operatingsystem))) - it "should set its default path to include /etc/init.d" do - provider.defpath.should == "/etc/init.d" - end + it "should set its default path to include /etc/init.d" do + provider.defpath.should == "/etc/init.d" end + end end |