From b918a193de16f9b1c88687ccfab91664f975f1ab Mon Sep 17 00:00:00 2001 From: Jacob Helwig Date: Thu, 21 Jun 2018 14:45:50 -0700 Subject: Apply automatic PDK validation cleanup --- spec/unit/provider/sshkey/parsed_spec.rb | 48 +++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'spec/unit/provider/sshkey') diff --git a/spec/unit/provider/sshkey/parsed_spec.rb b/spec/unit/provider/sshkey/parsed_spec.rb index 38aa7f7..3e7eade 100644 --- a/spec/unit/provider/sshkey/parsed_spec.rb +++ b/spec/unit/provider/sshkey/parsed_spec.rb @@ -1,10 +1,11 @@ #! /usr/bin/env ruby require 'spec_helper' -describe "sshkey parsed provider" do +describe 'sshkey parsed provider' do + subject { provider } + let :type do Puppet::Type.type(:sshkey) end let :provider do type.provider(:parsed) end - subject { provider } after :each do subject.clear @@ -14,55 +15,56 @@ describe "sshkey parsed provider" do 'AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw==' end - it "should parse the name from the first field" do - expect(subject.parse_line('test ssh-rsa '+key)[:name]).to eq("test") + it 'parses the name from the first field' do + expect(subject.parse_line('test ssh-rsa ' + key)[:name]).to eq('test') end - it "should parse the first component of the first field as the name" do - expect(subject.parse_line('test,alias ssh-rsa '+key)[:name]).to eq("test") + it 'parses the first component of the first field as the name' do + expect(subject.parse_line('test,alias ssh-rsa ' + key)[:name]).to eq('test') end - it "should parse host_aliases from the remaining components of the first field" do - expect(subject.parse_line('test,alias ssh-rsa '+key)[:host_aliases]).to eq(["alias"]) + it 'parses host_aliases from the remaining components of the first field' do + expect(subject.parse_line('test,alias ssh-rsa ' + key)[:host_aliases]).to eq(['alias']) end - it "should parse multiple host_aliases" do - expect(subject.parse_line('test,alias1,alias2,alias3 ssh-rsa '+key)[:host_aliases]).to eq(["alias1","alias2","alias3"]) + it 'parses multiple host_aliases' do + expect(subject.parse_line('test,alias1,alias2,alias3 ssh-rsa ' + key)[:host_aliases]).to eq(['alias1', 'alias2', 'alias3']) end - it "should not drop an empty host_alias" do - expect(subject.parse_line('test,alias, ssh-rsa '+key)[:host_aliases]).to eq(["alias",""]) + it 'does not drop an empty host_alias' do + expect(subject.parse_line('test,alias, ssh-rsa ' + key)[:host_aliases]).to eq(['alias', '']) end - it "should recognise when there are no host aliases" do - expect(subject.parse_line('test ssh-rsa '+key)[:host_aliases]).to eq([]) + it 'recognises when there are no host aliases' do + expect(subject.parse_line('test ssh-rsa ' + key)[:host_aliases]).to eq([]) end - context "with the sample file" do + context 'with the sample file' do ['sample', 'sample_with_blank_lines'].each do |sample_file| let :fixture do my_fixture(sample_file) end + before :each do subject.stubs(:default_target).returns(fixture) end - it "should parse to records on prefetch" do + it 'parses to records on prefetch' do expect(subject.target_records(fixture)).to be_empty subject.prefetch records = subject.target_records(fixture) expect(records).to be_an Array - expect(records).to be_all {|x| expect(x).to be_an Hash } + expect(records).to be_all { |x| expect(x).to be_an Hash } end - it "should reconstitute the file from records" do + it 'reconstitutes the file from records' do subject.prefetch records = subject.target_records(fixture) - text = subject.to_file(records).gsub(/^# HEADER.+\n/, '') + text = subject.to_file(records).gsub(%r{^# HEADER.+\n}, '') oldlines = File.readlines(fixture).map(&:chomp) newlines = text.chomp.split("\n") expect(oldlines.length).to eq(newlines.length) oldlines.zip(newlines).each do |old, new| - expect(old.gsub(/\s+/, '')).to eq(new.gsub(/\s+/, '')) + expect(old.gsub(%r{\s+}, '')).to eq(new.gsub(%r{\s+}, '')) end end end @@ -70,7 +72,7 @@ describe "sshkey parsed provider" do context 'default ssh_known_hosts target path' do ['9.10', '9.11', '10.10'].each do |version| - it 'should be `/etc/ssh_known_hosts` when OSX version 10.10 or older`' do + it 'is `/etc/ssh_known_hosts` when OSX version 10.10 or older`' do Facter.expects(:value).with(:operatingsystem).returns('Darwin') Facter.expects(:value).with(:macosx_productversion_major).returns(version) expect(subject.default_target).to eq('/etc/ssh_known_hosts') @@ -78,14 +80,14 @@ describe "sshkey parsed provider" do end ['10.11', '10.13', '11.0', '11.11'].each do |version| - it 'should be `/etc/ssh/ssh_known_hosts` when OSX version 10.11 or newer`' do + it 'is `/etc/ssh/ssh_known_hosts` when OSX version 10.11 or newer`' do Facter.expects(:value).with(:operatingsystem).returns('Darwin') Facter.expects(:value).with(:macosx_productversion_major).returns(version) expect(subject.default_target).to eq('/etc/ssh/ssh_known_hosts') end end - it 'should be `/etc/ssh/ssh_known_hosts` on other operating systems' do + it 'is `/etc/ssh/ssh_known_hosts` on other operating systems' do Facter.expects(:value).with(:operatingsystem).returns('RedHat') expect(subject.default_target).to eq('/etc/ssh/ssh_known_hosts') end -- cgit v1.2.3