From 61edff9ba5e8e4f8db8bb9cd5a84a986b8703c5d Mon Sep 17 00:00:00 2001 From: Daniel Pittman Date: Thu, 5 May 2011 16:24:26 -0700 Subject: (#7353) Remove :for_humans format entirely. Since we never shipped this in a real release, we don't need to maintain compatibility. So, remove it entirely from the codebase. Reviewed-By: Max Martin --- spec/unit/application/face_base_spec.rb | 11 ----------- spec/unit/interface/action_builder_spec.rb | 10 ---------- 2 files changed, 21 deletions(-) (limited to 'spec') diff --git a/spec/unit/application/face_base_spec.rb b/spec/unit/application/face_base_spec.rb index 25797ea3e..2a9a22356 100755 --- a/spec/unit/application/face_base_spec.rb +++ b/spec/unit/application/face_base_spec.rb @@ -329,15 +329,4 @@ EOT }.to have_printed(/you invoked the 's' rendering hook/) end end - - describe "#render_as=" do - # This is for compatibility with the format name in 2.7.0rc1, but isn't a - # long term desirable name. We can't just randomly drop it since it was - # released, though, so it will live for a couple of major versions. - # --daniel 2011-05-04 - it "should treat :for_humans as a synonym for :console" do - app.render_as = :for_humans - app.render_as.name.should == :console - end - end end diff --git a/spec/unit/interface/action_builder_spec.rb b/spec/unit/interface/action_builder_spec.rb index 89aef26d0..c39860591 100755 --- a/spec/unit/interface/action_builder_spec.rb +++ b/spec/unit/interface/action_builder_spec.rb @@ -200,16 +200,6 @@ describe Puppet::Interface::ActionBuilder do end end - # :for_humans is an alias for :console, and deprecated, but since we - # shipped it in 2.7.0rc1 we need to support it. --daniel 2011-05-04 - it "should accept :for_humans format" do - action = Puppet::Interface::ActionBuilder.build(face, :foo) do - when_invoked do true end - render_as :for_humans - end - action.render_as.should == :for_humans - end - [:if_you_define_this_format_you_frighten_me, "json", 12].each do |input| it "should fail if given #{input.inspect}" do expect { -- cgit