mirror of
https://github.com/athityakumar/colorls.git
synced 2024-09-19 05:31:23 +02:00
Merge branch 'master' into issue_515
This commit is contained in:
commit
0e2bed11ad
4 changed files with 8 additions and 8 deletions
|
@ -75,10 +75,10 @@ Gem::Specification.new do |spec|
|
|||
spec.add_development_dependency 'ronn', '~> 0'
|
||||
spec.add_development_dependency 'rspec', '~> 3.7'
|
||||
spec.add_development_dependency 'rspec-its', '~> 1.2'
|
||||
spec.add_development_dependency 'rubocop', '~> 1.39.0'
|
||||
spec.add_development_dependency 'rubocop-performance', '~> 1.15.0'
|
||||
spec.add_development_dependency 'rubocop', '~> 1.44.0'
|
||||
spec.add_development_dependency 'rubocop-performance', '~> 1.16.0'
|
||||
spec.add_development_dependency 'rubocop-rake', '~> 0.5'
|
||||
spec.add_development_dependency 'rubocop-rspec', '~> 2.15.0'
|
||||
spec.add_development_dependency 'rubocop-rspec', '~> 2.18.1'
|
||||
spec.add_development_dependency 'rubygems-tasks', '~> 0'
|
||||
spec.add_development_dependency 'simplecov', '~> 0.21.2'
|
||||
spec.metadata['rubygems_mfa_required'] = 'true'
|
||||
|
|
|
@ -318,7 +318,7 @@ module ColorLS
|
|||
line_array.push links if @hard_links_count
|
||||
line_array.push user_info(content) if @show_user
|
||||
line_array.push group_info(content.group) if @show_group
|
||||
line_array.concat [size_info(content.size), mtime_info(content.mtime)]
|
||||
line_array.push(size_info(content.size), mtime_info(content.mtime))
|
||||
line_array.join(' ')
|
||||
end
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ RSpec.describe ColorLS::Core do
|
|||
executable?: false
|
||||
)
|
||||
|
||||
allow(::Dir).to receive(:entries).and_return([camera])
|
||||
allow(Dir).to receive(:entries).and_return([camera])
|
||||
|
||||
allow(ColorLS::FileInfo).to receive(:new).and_return(file_info)
|
||||
|
||||
|
|
|
@ -149,8 +149,8 @@ RSpec.describe ColorLS::Flags do
|
|||
end
|
||||
|
||||
it 'returns no user / group info' do
|
||||
allow(::Etc).to receive(:getpwuid).and_return(nil)
|
||||
allow(::Etc).to receive(:getgrgid).and_return(nil)
|
||||
allow(Etc).to receive(:getpwuid).and_return(nil)
|
||||
allow(Etc).to receive(:getgrgid).and_return(nil)
|
||||
|
||||
expect { subject }.to output(/\s+ \d+ \s+ \d+ .* a.txt/mx).to_stdout
|
||||
end
|
||||
|
@ -338,7 +338,7 @@ RSpec.describe ColorLS::Flags do
|
|||
let(:args) { ['--snafu'] }
|
||||
|
||||
it 'issues a warning, hint about `--help` and exit' do # rubocop:todo RSpec/MultipleExpectations
|
||||
allow(::Kernel).to receive(:warn) do |message|
|
||||
allow(Kernel).to receive(:warn) do |message|
|
||||
expect(message).to output '--snafu'
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue