summaryrefslogtreecommitdiffstats
path: root/spec/unit/network/http/api
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
committerMarkus Roberts <Markus@reality.com>2010-07-09 18:12:17 -0700
commit3180b9d9b2c844dade1d361326600f7001ec66dd (patch)
tree98fe7c5ac7eb942aac9c39f019a17b0b3f5a57f4 /spec/unit/network/http/api
parent543225970225de5697734bfaf0a6eee996802c04 (diff)
downloadpuppet-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/network/http/api')
-rw-r--r--spec/unit/network/http/api/v1_spec.rb166
1 files changed, 83 insertions, 83 deletions
diff --git a/spec/unit/network/http/api/v1_spec.rb b/spec/unit/network/http/api/v1_spec.rb
index fc284de82..c593242c0 100644
--- a/spec/unit/network/http/api/v1_spec.rb
+++ b/spec/unit/network/http/api/v1_spec.rb
@@ -5,118 +5,118 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
require 'puppet/network/http/api/v1'
class V1RestApiTester
- include Puppet::Network::HTTP::API::V1
+ include Puppet::Network::HTTP::API::V1
end
describe Puppet::Network::HTTP::API::V1 do
+ before do
+ @tester = V1RestApiTester.new
+ end
+
+ it "should be able to convert a URI into a request" do
+ @tester.should respond_to(:uri2indirection)
+ end
+
+ it "should be able to convert a request into a URI" do
+ @tester.should respond_to(:indirection2uri)
+ end
+
+ describe "when converting a URI into a request" do
before do
- @tester = V1RestApiTester.new
+ @tester.stubs(:handler).returns "foo"
end
- it "should be able to convert a URI into a request" do
- @tester.should respond_to(:uri2indirection)
+ it "should require the http method, the URI, and the query parameters" do
+ # Not a terribly useful test, but an important statement for the spec
+ lambda { @tester.uri2indirection("/foo") }.should raise_error(ArgumentError)
end
- it "should be able to convert a request into a URI" do
- @tester.should respond_to(:indirection2uri)
+ it "should use the first field of the URI as the environment" do
+ @tester.uri2indirection("GET", "/env/foo/bar", {}).environment.should == Puppet::Node::Environment.new("env")
end
- describe "when converting a URI into a request" do
- before do
- @tester.stubs(:handler).returns "foo"
- end
-
- it "should require the http method, the URI, and the query parameters" do
- # Not a terribly useful test, but an important statement for the spec
- lambda { @tester.uri2indirection("/foo") }.should raise_error(ArgumentError)
- end
-
- it "should use the first field of the URI as the environment" do
- @tester.uri2indirection("GET", "/env/foo/bar", {}).environment.should == Puppet::Node::Environment.new("env")
- end
-
- it "should fail if the environment is not alphanumeric" do
- lambda { @tester.uri2indirection("GET", "/env ness/foo/bar", {}) }.should raise_error(ArgumentError)
- end
+ it "should fail if the environment is not alphanumeric" do
+ lambda { @tester.uri2indirection("GET", "/env ness/foo/bar", {}) }.should raise_error(ArgumentError)
+ end
- it "should use the environment from the URI even if one is specified in the parameters" do
- @tester.uri2indirection("GET", "/env/foo/bar", {:environment => "otherenv"}).environment.should == Puppet::Node::Environment.new("env")
- end
+ it "should use the environment from the URI even if one is specified in the parameters" do
+ @tester.uri2indirection("GET", "/env/foo/bar", {:environment => "otherenv"}).environment.should == Puppet::Node::Environment.new("env")
+ end
- it "should use the second field of the URI as the indirection name" do
- @tester.uri2indirection("GET", "/env/foo/bar", {}).indirection_name.should == :foo
- end
+ it "should use the second field of the URI as the indirection name" do
+ @tester.uri2indirection("GET", "/env/foo/bar", {}).indirection_name.should == :foo
+ end
- it "should fail if the indirection name is not alphanumeric" do
- lambda { @tester.uri2indirection("GET", "/env/foo ness/bar", {}) }.should raise_error(ArgumentError)
- end
+ it "should fail if the indirection name is not alphanumeric" do
+ lambda { @tester.uri2indirection("GET", "/env/foo ness/bar", {}) }.should raise_error(ArgumentError)
+ end
- it "should use the remainder of the URI as the indirection key" do
- @tester.uri2indirection("GET", "/env/foo/bar", {}).key.should == "bar"
- end
+ it "should use the remainder of the URI as the indirection key" do
+ @tester.uri2indirection("GET", "/env/foo/bar", {}).key.should == "bar"
+ end
- it "should support the indirection key being a /-separated file path" do
- @tester.uri2indirection("GET", "/env/foo/bee/baz/bomb", {}).key.should == "bee/baz/bomb"
- end
+ it "should support the indirection key being a /-separated file path" do
+ @tester.uri2indirection("GET", "/env/foo/bee/baz/bomb", {}).key.should == "bee/baz/bomb"
+ end
- it "should fail if no indirection key is specified" do
- lambda { @tester.uri2indirection("GET", "/env/foo/", {}) }.should raise_error(ArgumentError)
- lambda { @tester.uri2indirection("GET", "/env/foo", {}) }.should raise_error(ArgumentError)
- end
+ it "should fail if no indirection key is specified" do
+ lambda { @tester.uri2indirection("GET", "/env/foo/", {}) }.should raise_error(ArgumentError)
+ lambda { @tester.uri2indirection("GET", "/env/foo", {}) }.should raise_error(ArgumentError)
+ end
- it "should choose 'find' as the indirection method if the http method is a GET and the indirection name is singular" do
- @tester.uri2indirection("GET", "/env/foo/bar", {}).method.should == :find
- end
+ it "should choose 'find' as the indirection method if the http method is a GET and the indirection name is singular" do
+ @tester.uri2indirection("GET", "/env/foo/bar", {}).method.should == :find
+ end
- it "should choose 'search' as the indirection method if the http method is a GET and the indirection name is plural" do
- @tester.uri2indirection("GET", "/env/foos/bar", {}).method.should == :search
- end
+ it "should choose 'search' as the indirection method if the http method is a GET and the indirection name is plural" do
+ @tester.uri2indirection("GET", "/env/foos/bar", {}).method.should == :search
+ end
- it "should choose 'delete' as the indirection method if the http method is a DELETE and the indirection name is singular" do
- @tester.uri2indirection("DELETE", "/env/foo/bar", {}).method.should == :destroy
- end
+ it "should choose 'delete' as the indirection method if the http method is a DELETE and the indirection name is singular" do
+ @tester.uri2indirection("DELETE", "/env/foo/bar", {}).method.should == :destroy
+ end
- it "should choose 'save' as the indirection method if the http method is a PUT and the indirection name is singular" do
- @tester.uri2indirection("PUT", "/env/foo/bar", {}).method.should == :save
- end
+ it "should choose 'save' as the indirection method if the http method is a PUT and the indirection name is singular" do
+ @tester.uri2indirection("PUT", "/env/foo/bar", {}).method.should == :save
+ end
- it "should fail if an indirection method cannot be picked" do
- lambda { @tester.uri2indirection("UPDATE", "/env/foo/bar", {}) }.should raise_error(ArgumentError)
- end
+ it "should fail if an indirection method cannot be picked" do
+ lambda { @tester.uri2indirection("UPDATE", "/env/foo/bar", {}) }.should raise_error(ArgumentError)
+ end
- it "should URI unescape the indirection key" do
- escaped = URI.escape("foo bar")
- @tester.uri2indirection("GET", "/env/foo/#{escaped}", {}).key.should == "foo bar"
- end
+ it "should URI unescape the indirection key" do
+ escaped = URI.escape("foo bar")
+ @tester.uri2indirection("GET", "/env/foo/#{escaped}", {}).key.should == "foo bar"
end
+ end
- describe "when converting a request into a URI" do
- before do
- @request = Puppet::Indirector::Request.new(:foo, :find, "with spaces", :foo => :bar, :environment => "myenv")
- end
+ describe "when converting a request into a URI" do
+ before do
+ @request = Puppet::Indirector::Request.new(:foo, :find, "with spaces", :foo => :bar, :environment => "myenv")
+ end
- it "should use the environment as the first field of the URI" do
- @tester.indirection2uri(@request).split("/")[1].should == "myenv"
- end
+ it "should use the environment as the first field of the URI" do
+ @tester.indirection2uri(@request).split("/")[1].should == "myenv"
+ end
- it "should use the indirection as the second field of the URI" do
- @tester.indirection2uri(@request).split("/")[2].should == "foo"
- end
+ it "should use the indirection as the second field of the URI" do
+ @tester.indirection2uri(@request).split("/")[2].should == "foo"
+ end
- it "should pluralize the indirection name if the method is 'search'" do
- @request.stubs(:method).returns :search
- @tester.indirection2uri(@request).split("/")[2].should == "foos"
- end
+ it "should pluralize the indirection name if the method is 'search'" do
+ @request.stubs(:method).returns :search
+ @tester.indirection2uri(@request).split("/")[2].should == "foos"
+ end
- it "should use the escaped key as the remainder of the URI" do
- escaped = URI.escape("with spaces")
- @tester.indirection2uri(@request).split("/")[3].sub(/\?.+/, '').should == escaped
- end
+ it "should use the escaped key as the remainder of the URI" do
+ escaped = URI.escape("with spaces")
+ @tester.indirection2uri(@request).split("/")[3].sub(/\?.+/, '').should == escaped
+ end
- it "should add the query string to the URI" do
- @request.expects(:query_string).returns "?query"
- @tester.indirection2uri(@request).should =~ /\?query$/
- end
+ it "should add the query string to the URI" do
+ @request.expects(:query_string).returns "?query"
+ @tester.indirection2uri(@request).should =~ /\?query$/
end
+ end
end