From 637108ebcdab86b2de29ff51b41dfc6db39ab4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 30 Mar 2021 15:38:23 +0200 Subject: [PATCH] Use allow/expect instead of stubs/expects (#30) * Use allow/expect instead of stubs/expects * Fix unit test * Lint: block_given? -> block * Lint: Use safe navigation (&.) * Lint: empty lines between definitions * Lint: ignore RSpec/SubjectStub * Lint: use .match? instead of =~ --- lib/puppet/provider/augeasprovider/default.rb | 12 +- spec/fixtures/augeas | 2 +- spec/lib/augeas_spec.rb | 3 +- .../provider/augeasprovider/default_spec.rb | 218 +++++++++--------- 4 files changed, 118 insertions(+), 117 deletions(-) diff --git a/lib/puppet/provider/augeasprovider/default.rb b/lib/puppet/provider/augeasprovider/default.rb index abe28d3..c99461e 100644 --- a/lib/puppet/provider/augeasprovider/default.rb +++ b/lib/puppet/provider/augeasprovider/default.rb @@ -412,7 +412,7 @@ def self.default_file(&block) # @raise [Puppet::Error] if no block has been set when getting # @api public def self.lens(resource = nil, &block) - if block_given? + if block @lens_block = block else raise(Puppet::Error, 'Lens is not provided') unless @lens_block @@ -445,7 +445,7 @@ def self.path_label(aug, path) def self.whichquote(value, resource = nil, oldvalue = nil) oldquote = readquote oldvalue - quote = if resource && resource.parameters.include?(:quoted) + quote = if resource&.parameters&.include?(:quoted) resource[:quoted] else :auto @@ -454,7 +454,7 @@ def self.whichquote(value, resource = nil, oldvalue = nil) if quote == :auto quote = if oldquote oldquote - elsif value =~ %r{[|&;()<>\s]} + elsif value.match?(%r{[|&;()<>\s]}) :double else :none @@ -522,7 +522,7 @@ def self.readquote(value) # @see #target # @api public def self.resource_path(resource = nil, &block) - if block_given? + if block @resource_path_block = block elsif @resource_path_block @resource_path_block.call(resource) @@ -691,7 +691,7 @@ def self.augopen_internal(resource = nil, autosave = false, yield_resource = fal raise(Puppet::Error, "Augeas didn't load #{file} with #{lens}#{from}: #{message}") end - if block_given? + if block setvars(aug, resource) if yield_resource block.call(aug, resource, *yield_params) @@ -705,7 +705,7 @@ def self.augopen_internal(resource = nil, autosave = false, yield_resource = fal autosave = false raise ensure - if aug && block_given? && !supported?(:post_resource_eval) + if aug && block && !supported?(:post_resource_eval) augsave!(aug) if autosave augclose!(aug) end diff --git a/spec/fixtures/augeas b/spec/fixtures/augeas index 97e2a1c..6fffd52 160000 --- a/spec/fixtures/augeas +++ b/spec/fixtures/augeas @@ -1 +1 @@ -Subproject commit 97e2a1c8ac515f20d57b2e0688230732ff26adac +Subproject commit 6fffd52fc5163a67072186b39cba3c89d9bfaf98 diff --git a/spec/lib/augeas_spec.rb b/spec/lib/augeas_spec.rb index 26fe744..e4351ea 100644 --- a/spec/lib/augeas_spec.rb +++ b/spec/lib/augeas_spec.rb @@ -1,4 +1,5 @@ module AugeasSpec end + class AugeasSpec::Error < StandardError end @@ -12,6 +13,6 @@ class AugeasSpec::Error < StandardError config.include AugeasSpec::Fixtures config.before :each do - Puppet::Util::Storage.stubs(:store) + allow(Puppet::Util::Storage).to receive(:store) end end diff --git a/spec/unit/puppet/provider/augeasprovider/default_spec.rb b/spec/unit/puppet/provider/augeasprovider/default_spec.rb index e9b6d9b..a1cb01e 100755 --- a/spec/unit/puppet/provider/augeasprovider/default_spec.rb +++ b/spec/unit/puppet/provider/augeasprovider/default_spec.rb @@ -38,7 +38,7 @@ class Empty < provider_class describe '#resource_path' do it 'calls #target if no resource path block set' do resource = { name: 'foo' } - provider.expects(:target).with(resource) + expect(provider).to receive(:target).with(resource) # rubocop:disable RSpec/SubjectStub provider.resource_path(resource).should == '/foo' end @@ -99,7 +99,7 @@ class Empty < provider_class it 'uses the :quoted parameter when present' do resource = {} - resource.stubs(:parameters).returns([:quoted]) + allow(resource).to receive(:parameters).and_return([:quoted]) resource[:quoted] = :single provider.whichquote('foo', resource).should eq("'") @@ -142,7 +142,7 @@ class Empty < provider_class it 'uses the :quoted parameter when present' do resource = {} - resource.stubs(:parameters).returns([:quoted]) + allow(resource).to receive(:parameters).and_return([:quoted]) resource[:quoted] = :single provider.quoteit('foo', resource).should eq("'foo'") @@ -174,40 +174,40 @@ class Empty < provider_class describe '#parsed_as?' do context 'when text_store is supported' do it 'returns false when text_store fails' do - Augeas.expects(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).yields(augeas_handler) - augeas_handler.expects(:respond_to?).with(:text_store).returns(true) - augeas_handler.expects(:set).with('/input', 'foo').returns(nil) - augeas_handler.expects(:text_store).with('Baz.lns', '/input', '/parsed').returns(false) + expect(Augeas).to receive(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).and_yield(augeas_handler) + expect(augeas_handler).to receive(:respond_to?).with(:text_store).and_return(true) + expect(augeas_handler).to receive(:set).with('/input', 'foo').and_return(nil) + expect(augeas_handler).to receive(:text_store).with('Baz.lns', '/input', '/parsed').and_return(false) provider.parsed_as?('foo', 'bar', 'Baz.lns').should == false end it 'returns false when path is not found' do - Augeas.expects(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).yields(augeas_handler) - augeas_handler.expects(:respond_to?).with(:text_store).returns(true) - augeas_handler.expects(:set).with('/input', 'foo').returns(nil) - augeas_handler.expects(:text_store).with('Baz.lns', '/input', '/parsed').returns(true) - augeas_handler.expects(:match).with('/parsed/bar').returns([]) + expect(Augeas).to receive(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).and_yield(augeas_handler) + expect(augeas_handler).to receive(:respond_to?).with(:text_store).and_return(true) + expect(augeas_handler).to receive(:set).with('/input', 'foo').and_return(nil) + expect(augeas_handler).to receive(:text_store).with('Baz.lns', '/input', '/parsed').and_return(true) + expect(augeas_handler).to receive(:match).with('/parsed/bar').and_return([]) provider.parsed_as?('foo', 'bar', 'Baz.lns').should == false end it 'returns true when path is found' do - Augeas.expects(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).yields(augeas_handler) - augeas_handler.expects(:respond_to?).with(:text_store).returns(true) - augeas_handler.expects(:set).with('/input', 'foo').returns(nil) - augeas_handler.expects(:text_store).with('Baz.lns', '/input', '/parsed').returns(true) - augeas_handler.expects(:match).with('/parsed/bar').returns(['/parsed/bar']) + expect(Augeas).to receive(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).and_yield(augeas_handler) + expect(augeas_handler).to receive(:respond_to?).with(:text_store).and_return(true) + expect(augeas_handler).to receive(:set).with('/input', 'foo').and_return(nil) + expect(augeas_handler).to receive(:text_store).with('Baz.lns', '/input', '/parsed').and_return(true) + expect(augeas_handler).to receive(:match).with('/parsed/bar').and_return(['/parsed/bar']) provider.parsed_as?('foo', 'bar', 'Baz.lns').should == true end end context 'when text_store is not supported' do it 'returns true if path is found in tempfile' do - Augeas.expects(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).yields(augeas_handler) - augeas_handler.expects(:respond_to?).with(:text_store).returns(false) - augeas_handler.expects(:text_store).never - augeas_handler.expects(:transform) - augeas_handler.expects(:load!) - augeas_handler.expects(:match).returns(['/files/tmp/aug_text_store20140410-8734-icc4xn/bar']) + expect(Augeas).to receive(:open).with(nil, nil, Augeas::NO_MODL_AUTOLOAD).and_yield(augeas_handler) + expect(augeas_handler).to receive(:respond_to?).with(:text_store).and_return(false) + expect(augeas_handler).to receive(:text_store).never + expect(augeas_handler).to receive(:transform) + expect(augeas_handler).to receive(:load!) + expect(augeas_handler).to receive(:match).and_return(['/files/tmp/aug_text_store20140410-8734-icc4xn/bar']) provider.parsed_as?('foo', 'bar', 'Baz.lns').should == true end end @@ -231,8 +231,8 @@ class Empty < provider_class it 'calls #attr_aug_reader and #attr_aug_writer' do name = :foo opts = { bar: 'baz' } - provider.expects(:attr_aug_reader).with(name, opts) - provider.expects(:attr_aug_writer).with(name, opts) + expect(provider).to receive(:attr_aug_reader).with(name, opts) # rubocop:disable RSpec/SubjectStub + expect(provider).to receive(:attr_aug_writer).with(name, opts) # rubocop:disable RSpec/SubjectStub provider.attr_aug_accessor(name, opts) end end @@ -296,58 +296,58 @@ class Test < provider_class it 'adds libdir/augeas/lenses/ to the loadpath if it exists' do plugindir = File.join(Puppet[:libdir], 'augeas', 'lenses') - File.expects(:exist?).with(plugindir).returns(true) + expect(File).to receive(:exist?).with(plugindir).and_return(true) provider.send(:loadpath).should == plugindir end end describe '#augopen' do before(:each) do - provider.expects(:augsave!).never + expect(provider).to receive(:augsave!).never # rubocop:disable RSpec/SubjectStub end context 'on Puppet < 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(false) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(false) # rubocop:disable RSpec/SubjectStub end it 'calls Augeas#close when given a block' do provider.augopen(resource) do |aug| - aug.expects(:close) + expect(aug).to receive(:close) end end it 'does not call Augeas#close when not given a block' do - Augeas.any_instance.expects(:close).never # rubocop:disable RSpec/AnyInstance + expect(Augeas.any_instance).to receive(:close).never # rubocop:disable RSpec/AnyInstance provider.augopen(resource) end end context 'on Puppet >= 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(true) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(true) # rubocop:disable RSpec/SubjectStub end it 'does not call Augeas#close when given a block' do - Augeas.any_instance.expects(:close).never # rubocop:disable RSpec/AnyInstance + expect(Augeas.any_instance).to receive(:close).never # rubocop:disable RSpec/AnyInstance provider.augopen(resource) end it 'calls Augeas#close when calling post_resource_eval' do provider.augopen(resource) do |aug| - aug.expects(:close) + expect(aug).to receive(:close) provider.post_resource_eval end end end it 'calls #setvars when given a block' do - provider.expects(:setvars) + expect(provider).to receive(:setvars) # rubocop:disable RSpec/SubjectStub provider.augopen(resource) { |aug| } end it 'does not call #setvars when not given a block' do - provider.expects(:setvars).never + expect(provider).to receive(:setvars).never # rubocop:disable RSpec/SubjectStub provider.augopen(resource) end @@ -363,76 +363,76 @@ class Test < provider_class describe '#augopen!' do context 'on Puppet < 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(false) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(false) # rubocop:disable RSpec/SubjectStub end it 'calls Augeas#close when given a block' do provider.augopen!(resource) do |aug| - aug.expects(:close) + expect(aug).to receive(:close) end end it 'does not call Augeas#close when not given a block' do - Augeas.any_instance.expects(:close).never # rubocop:disable RSpec/AnyInstance + expect(Augeas.any_instance).to receive(:close).never # rubocop:disable RSpec/AnyInstance provider.augopen!(resource) end end context 'on Puppet >= 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(true) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(true) # rubocop:disable RSpec/SubjectStub end it 'does not call Augeas#close when given a block' do - Augeas.any_instance.expects(:close).never # rubocop:disable RSpec/AnyInstance + expect(Augeas.any_instance).to receive(:close).never # rubocop:disable RSpec/AnyInstance provider.augopen!(resource) end end it 'calls #setvars when given a block' do - provider.expects(:setvars) + expect(provider).to receive(:setvars) # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) { |aug| } end it 'does not call #setvars when not given a block' do - provider.expects(:setvars).never + expect(provider).to receive(:setvars).never # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) end context 'on Puppet < 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(false) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(false) # rubocop:disable RSpec/SubjectStub end it 'calls #augsave when given a block' do - provider.expects(:augsave!) + expect(provider).to receive(:augsave!) # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) { |aug| } end it 'does not call #augsave when not given a block' do - provider.expects(:augsave!).never + expect(provider).to receive(:augsave!).never # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) end end context 'on Puppet >= 3.4.0' do before :each do - provider.stubs(:supported?).with(:post_resource_eval).returns(true) + allow(provider).to receive(:supported?).with(:post_resource_eval).and_return(true) # rubocop:disable RSpec/SubjectStub end it 'does not call #augsave when given a block' do - provider.expects(:augsave!).never + expect(provider).to receive(:augsave!).never # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) { |aug| } end it 'does not call #augsave when not given a block' do - provider.expects(:augsave!).never + expect(provider).to receive(:augsave!).never # rubocop:disable RSpec/SubjectStub provider.augopen!(resource) end it 'calls Augeas#close when calling post_resource_eval' do provider.augopen(resource) do |aug| - aug.expects(:close) + expect(aug).to receive(:close) provider.post_resource_eval end end @@ -461,7 +461,7 @@ class Test < provider_class it 'prints /augeas//error on save' do provider.augopen(resource) do |aug| # Prepare an invalid save - provider.stubs(:debug) + allow(provider).to receive(:debug) # rubocop:disable RSpec/SubjectStub aug.rm("/files#{thetarget}/*/ipaddr").should_not eq(0) -> { provider.augsave!(aug) }.should raise_error Augeas::Error, %r{Failed to save Augeas tree} end @@ -471,24 +471,24 @@ class Test < provider_class describe '#path_label' do it 'uses Augeas#label when available' do provider.augopen(resource) do |aug| - aug.expects(:respond_to?).with(:label).returns true - aug.expects(:label).with('/files/foo[2]').returns 'foo' + expect(aug).to receive(:respond_to?).with(:label).and_return true + expect(aug).to receive(:label).with('/files/foo[2]').and_return 'foo' provider.path_label(aug, '/files/foo[2]').should == 'foo' end end it 'emulates Augeas#label when it is not available' do provider.augopen(resource) do |aug| - aug.expects(:respond_to?).with(:label).returns false - aug.expects(:label).with('/files/bar[4]').never + expect(aug).to receive(:respond_to?).with(:label).and_return false + expect(aug).to receive(:label).with('/files/bar[4]').never provider.path_label(aug, '/files/bar[4]').should == 'bar' end end it 'emulates Augeas#label when no label is found in the tree' do provider.augopen(resource) do |aug| - aug.expects(:respond_to?).with(:label).returns true - aug.expects(:label).with('/files/baz[15]').returns nil + expect(aug).to receive(:respond_to?).with(:label).and_return true + expect(aug).to receive(:label).with('/files/baz[15]').and_return nil provider.path_label(aug, '/files/baz[15]').should == 'baz' end end @@ -497,18 +497,18 @@ class Test < provider_class describe '#setvars' do it 'calls Augeas#defnode to set $target, Augeas#defvar to set $resource and Augeas#set to set /augeas/context when resource is passed' do provider.augopen(resource) do |aug| - aug.expects(:context=).with("/files#{thetarget}") - aug.expects(:defnode).with('target', "/files#{thetarget}", nil) - provider.expects(:resource_path).with(resource).returns('/files/foo') - aug.expects(:defvar).with('resource', '/files/foo') + expect(aug).to receive(:context=).with("/files#{thetarget}") + expect(aug).to receive(:defnode).with('target', "/files#{thetarget}", nil) + expect(provider).to receive(:resource_path).with(resource).and_return('/files/foo') # rubocop:disable RSpec/SubjectStub + expect(aug).to receive(:defvar).with('resource', '/files/foo') provider.setvars(aug, resource) end end it 'calls Augeas#defnode to set $target but not $resource when no resource is passed' do provider.augopen(resource) do |aug| - aug.expects(:defnode).with('target', '/files/foo', nil) - aug.expects(:defvar).never + expect(aug).to receive(:defnode).with('target', '/files/foo', nil) + expect(aug).to receive(:defvar).never provider.setvars(aug) end end @@ -519,8 +519,8 @@ class Test < provider_class provider.attr_aug_reader(:foo, {}) provider.method_defined?('attr_aug_reader_foo').should be true - Augeas.any_instance.expects(:get).with('$resource/foo').returns('bar') # rubocop:disable RSpec/AnyInstance provider.augopen(resource) do |aug| + expect(aug).to receive(:get).with('$resource/foo').and_return('bar') provider.attr_aug_reader_foo(aug).should == 'bar' end end @@ -530,7 +530,7 @@ class Test < provider_class provider.method_defined?('attr_aug_reader_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:get).with('$resource/foo').returns('baz,bazz') + expect(aug).to receive(:get).with('$resource/foo').and_return('baz,bazz') provider.attr_aug_reader_foo(aug).should == ['baz', 'bazz'] end end @@ -541,9 +541,9 @@ class Test < provider_class rpath = "/files#{thetarget}/test/foo" provider.augopen(resource) do |aug| - aug.expects(:match).with('$resource/foo').returns(["#{rpath}[1]", "#{rpath}[2]"]) - aug.expects(:get).with("#{rpath}[1]").returns('baz') - aug.expects(:get).with("#{rpath}[2]").returns('bazz') + expect(aug).to receive(:match).with('$resource/foo').and_return(["#{rpath}[1]", "#{rpath}[2]"]) + expect(aug).to receive(:get).with("#{rpath}[1]").and_return('baz') + expect(aug).to receive(:get).with("#{rpath}[2]").and_return('bazz') provider.attr_aug_reader_foo(aug).should == ['baz', 'bazz'] end end @@ -554,12 +554,12 @@ class Test < provider_class rpath = "/files#{thetarget}/test/foo" provider.augopen(resource) do |aug| - aug.expects(:match).with('$resource/foo').returns(["#{rpath}[1]", "#{rpath}[2]"]) - aug.expects(:match).with("#{rpath}[1]/*[label()=~regexp('[0-9]+')]").returns(["#{rpath}[1]/1"]) - aug.expects(:get).with("#{rpath}[1]/1").returns('val11') - aug.expects(:match).with("#{rpath}[2]/*[label()=~regexp('[0-9]+')]").returns(["#{rpath}[2]/1", "#{rpath}[2]/2"]) - aug.expects(:get).with("#{rpath}[2]/1").returns('val21') - aug.expects(:get).with("#{rpath}[2]/2").returns('val22') + expect(aug).to receive(:match).with('$resource/foo').and_return(["#{rpath}[1]", "#{rpath}[2]"]) + expect(aug).to receive(:match).with("#{rpath}[1]/*[label()=~regexp('[0-9]+')]").and_return(["#{rpath}[1]/1"]) + expect(aug).to receive(:get).with("#{rpath}[1]/1").and_return('val11') + expect(aug).to receive(:match).with("#{rpath}[2]/*[label()=~regexp('[0-9]+')]").and_return(["#{rpath}[2]/1", "#{rpath}[2]/2"]) + expect(aug).to receive(:get).with("#{rpath}[2]/1").and_return('val21') + expect(aug).to receive(:get).with("#{rpath}[2]/2").and_return('val22') provider.attr_aug_reader_foo(aug).should == ['val11', 'val21', 'val22'] end end @@ -570,12 +570,12 @@ class Test < provider_class rpath = "/files#{thetarget}/test/foo" provider.augopen(resource) do |aug| - aug.expects(:match).with('$resource/foo').returns(["#{rpath}[1]", "#{rpath}[2]"]) - aug.expects(:match).with("#{rpath}[1]/sl").returns(["#{rpath}[1]/sl"]) - aug.expects(:get).with("#{rpath}[1]/sl").returns('val11') - aug.expects(:match).with("#{rpath}[2]/sl").returns(["#{rpath}[2]/sl[1]", "#{rpath}[2]/sl[2]"]) - aug.expects(:get).with("#{rpath}[2]/sl[1]").returns('val21') - aug.expects(:get).with("#{rpath}[2]/sl[2]").returns('val22') + expect(aug).to receive(:match).with('$resource/foo').and_return(["#{rpath}[1]", "#{rpath}[2]"]) + expect(aug).to receive(:match).with("#{rpath}[1]/sl").and_return(["#{rpath}[1]/sl"]) + expect(aug).to receive(:get).with("#{rpath}[1]/sl").and_return('val11') + expect(aug).to receive(:match).with("#{rpath}[2]/sl").and_return(["#{rpath}[2]/sl[1]", "#{rpath}[2]/sl[2]"]) + expect(aug).to receive(:get).with("#{rpath}[2]/sl[1]").and_return('val21') + expect(aug).to receive(:get).with("#{rpath}[2]/sl[2]").and_return('val22') provider.attr_aug_reader_foo(aug).should == ['val11', 'val21', 'val22'] end end @@ -592,11 +592,11 @@ class Test < provider_class rpath = "/files#{thetarget}/test/foo" provider.augopen(resource) do |aug| - aug.expects(:match).with('$resource/foo').returns(["#{rpath}[1]", "#{rpath}[2]"]) - aug.expects(:get).with("#{rpath}[1]").returns('baz') - aug.expects(:get).with("#{rpath}[1]/sl").returns('bazval') - aug.expects(:get).with("#{rpath}[2]").returns('bazz') - aug.expects(:get).with("#{rpath}[2]/sl").returns(nil) + expect(aug).to receive(:match).with('$resource/foo').and_return(["#{rpath}[1]", "#{rpath}[2]"]) + expect(aug).to receive(:get).with("#{rpath}[1]").and_return('baz') + expect(aug).to receive(:get).with("#{rpath}[1]/sl").and_return('bazval') + expect(aug).to receive(:get).with("#{rpath}[2]").and_return('bazz') + expect(aug).to receive(:get).with("#{rpath}[2]/sl").and_return(nil) provider.attr_aug_reader_foo(aug).should == { 'baz' => 'bazval', 'bazz' => 'deflt' } end end @@ -614,9 +614,9 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:set).with('$resource/foo', 'bar') + expect(aug).to receive(:set).with('$resource/foo', 'bar') provider.attr_aug_writer_foo(aug, 'bar') - aug.expects(:clear).with('$resource/foo') + expect(aug).to receive(:clear).with('$resource/foo') provider.attr_aug_writer_foo(aug) end end @@ -626,9 +626,9 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:set).with('$resource/foo', 'bar') + expect(aug).to receive(:set).with('$resource/foo', 'bar') provider.attr_aug_writer_foo(aug, 'bar') - aug.expects(:rm).with('$resource/foo') + expect(aug).to receive(:rm).with('$resource/foo') provider.attr_aug_writer_foo(aug) end end @@ -639,15 +639,15 @@ class Test < provider_class provider.augopen(resource) do |aug| # one value - aug.expects(:set).with('$resource/foo', 'bar') + expect(aug).to receive(:set).with('$resource/foo', 'bar') provider.attr_aug_writer_foo(aug, ['bar']) # multiple values - aug.expects(:set).with('$resource/foo', 'bar,baz') + expect(aug).to receive(:set).with('$resource/foo', 'bar,baz') provider.attr_aug_writer_foo(aug, ['bar', 'baz']) # purge values - aug.expects(:rm).with('$resource/foo') + expect(aug).to receive(:rm).with('$resource/foo') provider.attr_aug_writer_foo(aug, []) - aug.expects(:rm).with('$resource/foo') + expect(aug).to receive(:rm).with('$resource/foo') provider.attr_aug_writer_foo(aug) end end @@ -657,11 +657,11 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:rm).with('$resource/foo') - aug.expects(:set).with('$resource/foo[1]', 'bar') + expect(aug).to receive(:rm).with('$resource/foo') + expect(aug).to receive(:set).with('$resource/foo[1]', 'bar') provider.attr_aug_writer_foo(aug) - aug.expects(:rm).with('$resource/foo') - aug.expects(:set).with('$resource/foo[2]', 'baz') + expect(aug).to receive(:rm).with('$resource/foo') + expect(aug).to receive(:set).with('$resource/foo[2]', 'baz') provider.attr_aug_writer_foo(aug, ['bar', 'baz']) end end @@ -671,11 +671,11 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:rm).with('$resource/foo') + expect(aug).to receive(:rm).with('$resource/foo') provider.attr_aug_writer_foo(aug) - aug.expects(:rm).with("$resource/foo/*[label()=~regexp('[0-9]+')]") - aug.expects(:set).with('$resource/foo/1', 'bar') - aug.expects(:set).with('$resource/foo/2', 'baz') + expect(aug).to receive(:rm).with("$resource/foo/*[label()=~regexp('[0-9]+')]") + expect(aug).to receive(:set).with('$resource/foo/1', 'bar') + expect(aug).to receive(:set).with('$resource/foo/2', 'baz') provider.attr_aug_writer_foo(aug, ['bar', 'baz']) end end @@ -685,11 +685,11 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:rm).with('$resource/foo') + expect(aug).to receive(:rm).with('$resource/foo') provider.attr_aug_writer_foo(aug) - aug.expects(:rm).with('$resource/foo/sl') - aug.expects(:set).with('$resource/foo/sl[1]', 'bar') - aug.expects(:set).with('$resource/foo/sl[2]', 'baz') + expect(aug).to receive(:rm).with('$resource/foo/sl') + expect(aug).to receive(:set).with('$resource/foo/sl[1]', 'bar') + expect(aug).to receive(:set).with('$resource/foo/sl[2]', 'baz') provider.attr_aug_writer_foo(aug, ['bar', 'baz']) end end @@ -705,11 +705,11 @@ class Test < provider_class provider.method_defined?('attr_aug_writer_foo').should be true provider.augopen(resource) do |aug| - aug.expects(:rm).with('$resource/foo') - aug.expects(:set).with("$resource/foo[.='baz']", 'baz') - aug.expects(:set).with("$resource/foo[.='baz']/sl", 'bazval') - aug.expects(:set).with("$resource/foo[.='bazz']", 'bazz') - aug.expects(:set).with("$resource/foo[.='bazz']/sl", 'bazzval').never + expect(aug).to receive(:rm).with('$resource/foo') + expect(aug).to receive(:set).with("$resource/foo[.='baz']", 'baz') + expect(aug).to receive(:set).with("$resource/foo[.='baz']/sl", 'bazval') + expect(aug).to receive(:set).with("$resource/foo[.='bazz']", 'bazz') + expect(aug).to receive(:set).with("$resource/foo[.='bazz']/sl", 'bazzval').never provider.attr_aug_writer_foo(aug, 'baz' => 'bazval', 'bazz' => 'deflt') end end