Merge branch 'next'

* next:
  Revert "(#7220) Add the ability to "inherit" options."
  (#7469) Add license to test face so tests pass
  (#7264) Docs: Clarify that subscribe/notify imply require/before
  (#7468) Stub spec that tries to connect to pypi.python.org
  Prevent spec failure caused by network device mock leak
  Fix #7299 - do not require net/ssh for running rake spec

1 files changed, 0 insertions, 62 deletions

diff --git a/spec/unit/interface/action_builder_spec.rb b/spec/unit/interface/action_builder_spec.rb
index e9f10a1a6..c39860591 100755
--- a/spec/unit/interface/action_builder_spec.rb
+++ b/spec/unit/interface/action_builder_spec.rb
@@ -62,68 +62,6 @@ describe Puppet::Interface::ActionBuilder do
     end
   end
 
-  describe "#inherit_options_from" do
-    let :face do
-      Puppet::Interface.new(:face_with_some_options, '0.0.1') do
-        option '-w'
-
-        action(:foo) do
-          when_invoked do true end
-          option '-x', '--ex'
-          option '-y', '--why'
-        end
-
-        action(:bar) do
-          when_invoked do true end
-          option '-z', '--zee'
-        end
-
-        action(:baz) do
-          when_invoked do true end
-          option '-z', '--zed'
-        end
-      end
-    end
-
-    it 'should add the options from the specified action' do
-      foo = face.get_action(:foo)
-      action = Puppet::Interface::ActionBuilder.build(face, :inherit_options) do
-        when_invoked do true end
-        inherit_options_from foo
-      end
-      action.options.should == foo.options
-    end
-
-    it 'should add the options from multiple actions' do
-      foo = face.get_action(:foo)
-      bar = face.get_action(:bar)
-      action = Puppet::Interface::ActionBuilder.build(face, :inherit_options) do
-        when_invoked do true end
-        inherit_options_from foo
-        inherit_options_from bar
-      end
-      action.options.should == (foo.options + bar.options).uniq
-    end
-
-    it 'should permit symbolic names for actions in the same face' do
-      foo = face.get_action(:foo)
-      action = Puppet::Interface::ActionBuilder.build(face, :inherit_options) do
-        when_invoked do true end
-        inherit_options_from :foo
-      end
-      action.options.should == foo.options
-    end
-
-    it 'should raise a useful error if you supply a bad action name' do
-      expect do
-        Puppet::Interface::ActionBuilder.build(face, :inherit_options) do
-          when_invoked do true end
-          inherit_options_from :nowhere
-        end
-      end.to raise_error /nowhere/
-    end
-  end
-
   context "inline documentation" do
     it "should set the summary" do
       action = Puppet::Interface::ActionBuilder.build(face, :foo) do