From d4b8b6432dd0595be6d775c279fd609849e46503 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Wed, 29 Jan 2014 14:58:42 +0000 Subject: [PATCH] move Pacemaker::CIBObject.from_name test to libraries/primitive_spec --- spec/libraries/cib_object_spec.rb | 7 ------- spec/libraries/primitive_spec.rb | 10 ++++++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spec/libraries/cib_object_spec.rb b/spec/libraries/cib_object_spec.rb index 3545716..eed83f9 100644 --- a/spec/libraries/cib_object_spec.rb +++ b/spec/libraries/cib_object_spec.rb @@ -68,13 +68,6 @@ describe Pacemaker::CIBObject do end end end - - describe "::from_name" do - it "should instantiate a Pacemaker::Resource::Primitive" do - obj = Pacemaker::CIBObject.from_name(cib_object.name) - expect(obj.is_a? Pacemaker::Resource::Primitive).to be_true - end - end end context "CIB object with unregistered type" do diff --git a/spec/libraries/primitive_spec.rb b/spec/libraries/primitive_spec.rb index 32032d2..f722dd0 100644 --- a/spec/libraries/primitive_spec.rb +++ b/spec/libraries/primitive_spec.rb @@ -8,6 +8,16 @@ describe Pacemaker::Resource::Primitive do Mixlib::ShellOut.any_instance.stub(:run_command) end + it "should be instantiated via Pacemaker::CIBObject.from_name" do + Mixlib::ShellOut.any_instance.stub(:error!) + expect_any_instance_of(Mixlib::ShellOut) \ + .to receive(:stdout) \ + .and_return(@primitive.definition_string) + + obj = Pacemaker::CIBObject.from_name(@primitive.name) + expect(obj.is_a? Pacemaker::Resource::Primitive).to be_true + end + it "should barf if the loaded definition's type is not primitive" do Mixlib::ShellOut.any_instance.stub(:error!) expect_any_instance_of(Mixlib::ShellOut) \