Skip to content

Commit a6284ac

Browse files
committed
Use new rspec syntax
1 parent 9fe3ef5 commit a6284ac

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

spec/integration/provider/oratab/parsed_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
include PuppetlabsSpec::Files
88

99
before :each do
10-
described_class.stubs(:suitable?).returns true
11-
described_class.stubs(:default_target).returns fake_oratab
12-
Puppet::Type.type(:oratab).stubs(:defaultprovider).returns described_class
10+
allow(described_class).to receive(:suitable?).and_return(true)
11+
allow(described_class).to receive(:default_target).and_return(fake_oratab)
12+
allow(Puppet::Type.type(:oratab)).to receive(:defaultprovider).and_return(described_class)
1313
end
1414

1515
let :fake_oratab do
@@ -100,11 +100,11 @@
100100
end
101101

102102
def run_in_catalog(*resources)
103-
Puppet::FileBucket::Dipper.any_instance.stubs(:backup) # Don't backup to filebucket
103+
allow_any_instance_of(Puppet::FileBucket::Dipper).to receive(:backup)
104104
catalog = Puppet::Resource::Catalog.new
105105
catalog.host_config = false
106106
resources.each do |resource|
107-
resource.expects(:err).never
107+
expect(resource).not_to receive(:err)
108108
catalog.add_resource(resource)
109109
end
110110
catalog.apply
@@ -113,7 +113,7 @@ def run_in_catalog(*resources)
113113
def check_content_against(fixture)
114114
content = File.read(fake_oratab).lines.map{|l| l.chomp}.reject{|l| l=~ /^\s*#|^\s*$/}.sort.join("\n")
115115
expected_content = File.read(my_fixture(fixture)).lines.map{|l| l.chomp}.reject{|l| l=~ /^\s*#|^\s*$/}.sort.join("\n")
116-
content.should == expected_content
116+
expect(content).to eq(expected_content)
117117
end
118118

119119
describe "when managing one resource" do

spec/unit/provider/oratab/parsed_spec.rb

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,24 @@
55
describe Puppet::Type.type(:oratab).provider(:parsed) do
66

77
before :each do
8-
described_class.stubs(:suitable?).returns true
9-
described_class.stubs(:default_target).returns my_fixture('oratab')
10-
Puppet::Type.type(:oratab).stubs(:defaultprovider).returns described_class
8+
allow(Puppet::Type.type(:oratab)).to receive(:defaultprovider).and_return(described_class)
9+
allow(described_class).to receive(:default_target).and_return(my_fixture('oratab'))
1110
end
1211

13-
let :provider do
14-
described_class.new(
15-
:name => 'TEST01',
16-
:ensure => :present,
17-
:home => '/u01/app/oracle/product/9.2.0.1.0',
18-
:atboot => :yes,
12+
let :resource do
13+
Puppet::Type.type(:oratab).new(
14+
:name => 'TEST01',
15+
:ensure => :present,
16+
:home => '/u01/app/oracle/product/9.2.0.1.0',
17+
:atboot => :yes,
1918
:description => 'managed by puppet'
2019
)
2120
end
2221

22+
let :provider do
23+
described_class.new(resource)
24+
end
25+
2326
[:destroy, :create, :exists?].each do |method|
2427
it "should respond to #{method}" do
2528
expect(provider).to respond_to method

0 commit comments

Comments
 (0)