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/unit/indirector/certificate_request | |
| 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/unit/indirector/certificate_request')
| -rwxr-xr-x | spec/unit/indirector/certificate_request/ca_spec.rb | 14 | ||||
| -rwxr-xr-x | spec/unit/indirector/certificate_request/file_spec.rb | 14 | ||||
| -rwxr-xr-x | spec/unit/indirector/certificate_request/rest_spec.rb | 24 |
3 files changed, 26 insertions, 26 deletions
diff --git a/spec/unit/indirector/certificate_request/ca_spec.rb b/spec/unit/indirector/certificate_request/ca_spec.rb index b35d8b474..1bcbc46df 100755 --- a/spec/unit/indirector/certificate_request/ca_spec.rb +++ b/spec/unit/indirector/certificate_request/ca_spec.rb @@ -8,12 +8,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/indirector/certificate_request/ca' describe Puppet::SSL::CertificateRequest::Ca do - it "should have documentation" do - Puppet::SSL::CertificateRequest::Ca.doc.should be_instance_of(String) - end + it "should have documentation" do + Puppet::SSL::CertificateRequest::Ca.doc.should be_instance_of(String) + end - it "should use the :csrdir as the collection directory" do - Puppet.settings.expects(:value).with(:csrdir).returns "/request/dir" - Puppet::SSL::CertificateRequest::Ca.collection_directory.should == "/request/dir" - end + it "should use the :csrdir as the collection directory" do + Puppet.settings.expects(:value).with(:csrdir).returns "/request/dir" + Puppet::SSL::CertificateRequest::Ca.collection_directory.should == "/request/dir" + end end diff --git a/spec/unit/indirector/certificate_request/file_spec.rb b/spec/unit/indirector/certificate_request/file_spec.rb index e1f442e2a..f18ba2ca8 100755 --- a/spec/unit/indirector/certificate_request/file_spec.rb +++ b/spec/unit/indirector/certificate_request/file_spec.rb @@ -8,12 +8,12 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/indirector/certificate_request/file' describe Puppet::SSL::CertificateRequest::File do - it "should have documentation" do - Puppet::SSL::CertificateRequest::File.doc.should be_instance_of(String) - end + it "should have documentation" do + Puppet::SSL::CertificateRequest::File.doc.should be_instance_of(String) + end - it "should use the :requestdir as the collection directory" do - Puppet.settings.expects(:value).with(:requestdir).returns "/request/dir" - Puppet::SSL::CertificateRequest::File.collection_directory.should == "/request/dir" - end + it "should use the :requestdir as the collection directory" do + Puppet.settings.expects(:value).with(:requestdir).returns "/request/dir" + Puppet::SSL::CertificateRequest::File.collection_directory.should == "/request/dir" + end end diff --git a/spec/unit/indirector/certificate_request/rest_spec.rb b/spec/unit/indirector/certificate_request/rest_spec.rb index a1492acab..8b90b46a9 100755 --- a/spec/unit/indirector/certificate_request/rest_spec.rb +++ b/spec/unit/indirector/certificate_request/rest_spec.rb @@ -5,19 +5,19 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require 'puppet/indirector/certificate_request/rest' describe Puppet::SSL::CertificateRequest::Rest do - before do - @searcher = Puppet::SSL::CertificateRequest::Rest.new - end + before do + @searcher = Puppet::SSL::CertificateRequest::Rest.new + end - it "should be a sublcass of Puppet::Indirector::REST" do - Puppet::SSL::CertificateRequest::Rest.superclass.should equal(Puppet::Indirector::REST) - end + it "should be a sublcass of Puppet::Indirector::REST" do + Puppet::SSL::CertificateRequest::Rest.superclass.should equal(Puppet::Indirector::REST) + end - it "should set server_setting to :ca_server" do - Puppet::SSL::CertificateRequest::Rest.server_setting.should == :ca_server - end + it "should set server_setting to :ca_server" do + Puppet::SSL::CertificateRequest::Rest.server_setting.should == :ca_server + end - it "should set port_setting to :ca_port" do - Puppet::SSL::CertificateRequest::Rest.port_setting.should == :ca_port - end + it "should set port_setting to :ca_port" do + Puppet::SSL::CertificateRequest::Rest.port_setting.should == :ca_port + end end |
