Skip to content

Commit d3ef657

Browse files
author
Ilja Bobkevic
committed
Fix directory backend tests
1 parent dc228fa commit d3ef657

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

spec/unit/backends/directory_spec.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,29 @@ module PuppetForgeServer::Backends
2424
let(:version) { 'bogus_version' }
2525
let(:directory) { PuppetForgeServer::Backends::Directory.new(url) }
2626
let(:file_metadata) { { :metadata => nil, :checksum => nil, :path => nil} }
27+
let(:backend_module) { PuppetForgeServer::Models::Module.new(file_metadata) }
2728
let(:file_data) { { :filename => 'bogus_filename' } }
2829

2930
before(:each) do
30-
allow(directory).to receive(:get_file_metadata).with("*#{name}*.tar.gz", {}) { file_metadata }
31-
allow(directory).to receive(:get_file_metadata).with("#{author}-#{name}-*.tar.gz", {}) { file_metadata }
32-
allow(directory).to receive(:get_file_metadata).with("#{author}-#{name}-#{version}.tar.gz", {:version => version}) { file_metadata }
31+
allow(directory).to receive(:get_modules).with("*#{name}*.tar.gz", {}) { backend_module }
32+
allow(directory).to receive(:get_modules).with("#{author}-#{name}-*.tar.gz", {}) { backend_module }
33+
allow(directory).to receive(:get_modules).with("#{author}-#{name}-#{version}.tar.gz", {:version => version}) { backend_module }
3334
allow(File).to receive(:open).with("#{url}/#{file_data[:filename]}", 'w')
3435
end
3536

3637
describe '#query_metadata' do
3738
it 'query metadata should return file metadata array' do
38-
expect(directory.query_metadata(name)).to eq(file_metadata)
39+
expect(directory.query_metadata(name)).to eq(backend_module)
3940
end
4041
end
4142

4243
describe '#get_metadata' do
4344
it 'get_metadata without version should return file metadata array' do
44-
expect(directory.get_metadata(author, name)).to eq(file_metadata)
45+
expect(directory.get_metadata(author, name)).to eq(backend_module)
4546
end
4647

4748
it 'get_metadata with version should return file metadata array' do
48-
expect(directory.get_metadata(author, name, {:version => version})).to eq(file_metadata)
49+
expect(directory.get_metadata(author, name, {:version => version})).to eq(backend_module)
4950
end
5051
end
5152

0 commit comments

Comments
 (0)