summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorMax Martin <max@puppetlabs.com>2011-02-21 16:44:26 -0800
committerMax Martin <max@puppetlabs.com>2011-02-21 16:44:26 -0800
commit079bf95504b2bc807c51c1b1f4202e47cd660356 (patch)
tree984ec183a1b3a8bceec2435a22ee42def932c25c /spec
parent983c2420d47c83922a4417ec2b85af0740468029 (diff)
parentbb31c3d82f58ed192efa1bd8b85958ffa50d1d73 (diff)
downloadpuppet-079bf95504b2bc807c51c1b1f4202e47cd660356.tar.gz
puppet-079bf95504b2bc807c51c1b1f4202e47cd660356.tar.xz
puppet-079bf95504b2bc807c51c1b1f4202e47cd660356.zip
Merge branch 'ticket/2.6.next/6376-_search-support' into 2.6.next
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/network/http/api/v1_spec.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/unit/network/http/api/v1_spec.rb b/spec/unit/network/http/api/v1_spec.rb
index e7348312b..9a8780c62 100644
--- a/spec/unit/network/http/api/v1_spec.rb
+++ b/spec/unit/network/http/api/v1_spec.rb
@@ -96,7 +96,11 @@ describe Puppet::Network::HTTP::API::V1 do
@tester.uri2indirection("GET", "/env/facts_search/bar", {}).indirection_name.should == :facts
end
- it "should change indirection name to 'status' if the http method is a GEt and the indirection name is statuses" do
+ it "should not change indirection name from 'facts' if the http method is a GET and the indirection name is facts" do
+ @tester.uri2indirection("GET", "/env/facts/bar", {}).indirection_name.should == :facts
+ end
+
+ it "should change indirection name to 'status' if the http method is a GET and the indirection name is statuses" do
@tester.uri2indirection("GET", "/env/statuses/bar", {}).indirection_name.should == :status
end