Skip to content

Commit

Permalink
Chore: Remove Unneeded Projector From Progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfelchner
jfelchner committed Mar 4, 2023
1 parent 2bc31d0 commit 03a9b27
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 52 deletions.
66 changes: 22 additions & 44 deletions spec/lib/ruby-progressbar/components/bar_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ module Components

describe '#bar' do
it 'displays the bar with no indication of progress when just begun' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 50)
progress = Progress.new(:total => 50)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -41,8 +40,7 @@ module Components

it 'displays the bar with an indication of progress when nothing has been ' \
'completed and the bar is incremented' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 50)
progress = Progress.new(:total => 50)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.increment
Expand All @@ -53,8 +51,7 @@ module Components

it 'displays the bar with no indication of progress when a fraction of a percentage ' \
'has been completed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 200)
progress = Progress.new(:total => 200)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.start :at => 1
Expand All @@ -64,8 +61,7 @@ module Components
end

it 'displays the bar as 100% complete when completed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 50)
progress = Progress.new(:total => 50)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.start :at => 50
Expand All @@ -76,8 +72,7 @@ module Components
end

it 'displays the bar as 98% complete when completed and the bar is decremented' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 50)
progress = Progress.new(:total => 50)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.start :at => 50
Expand All @@ -90,8 +85,7 @@ module Components

describe '#bar_with_percentage' do
it 'displays the bar with an integrated percentage properly when empty' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -101,8 +95,7 @@ module Components

it 'displays the bar with an integrated percentage properly just before' \
'the percentage is displayed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -114,8 +107,7 @@ module Components

it 'displays the bar with an integrated percentage properly immediately after' \
'the percentage is displayed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -127,8 +119,7 @@ module Components

it 'displays the bar with an integrated percentage properly on double digit' \
'percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -139,8 +130,7 @@ module Components
end

it 'displays the bar with an integrated percentage properly when finished' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.finish
Expand All @@ -151,8 +141,7 @@ module Components

it 'calculates the remaining negative space properly with an integrated percentage ' \
'bar of 0 percent' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 200)
progress = Progress.new(:total => 200)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -173,8 +162,7 @@ module Components

describe '#incomplete_space' do
it 'displays the bar with an integrated percentage properly when empty' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -184,8 +172,7 @@ module Components

it 'displays the bar with an integrated percentage properly just before' \
'the percentage is displayed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -197,8 +184,7 @@ module Components

it 'displays the bar with an integrated percentage properly immediately after' \
'the percentage is displayed' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -210,8 +196,7 @@ module Components

it 'displays the bar with an integrated percentage properly on double digit' \
'percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -222,8 +207,7 @@ module Components
end

it 'displays the bar with an integrated percentage properly when finished' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 100)
progress = Progress.new(:total => 100)
progressbar = Bar.new(:progress => progress,
:length => 100)
progress.finish
Expand All @@ -234,8 +218,7 @@ module Components

it 'calculates the remaining negative space properly with an integrated percentage ' \
'bar of 0 percent' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 200)
progress = Progress.new(:total => 200)
progressbar = Bar.new(:progress => progress,
:length => 100)

Expand All @@ -254,8 +237,7 @@ module Components
end

it 'is represented correctly when a bar has an unknown amount to completion' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => nil)
progress = Progress.new(:total => nil)
progressbar = Bar.new(:progress => progress,
:length => 80)

Expand All @@ -265,8 +247,7 @@ module Components

it 'is represented after being incremented once when a bar has an unknown amount ' \
'to completion' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => nil)
progress = Progress.new(:total => nil)
progressbar = Bar.new(:progress => progress,
:length => 80)

Expand All @@ -278,8 +259,7 @@ module Components

it 'is represented after being incremented twice when a bar has an unknown amount ' \
'to completion' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => nil)
progress = Progress.new(:total => nil)
progressbar = Bar.new(:progress => progress,
:length => 80)

Expand All @@ -290,8 +270,7 @@ module Components
end

it 'is represented correctly when a bar has a customized unknown animation' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => nil)
progress = Progress.new(:total => nil)
progressbar = Bar.new(:progress => progress,
:unknown_progress_animation_steps => [
'*--',
Expand All @@ -307,8 +286,7 @@ module Components

it 'raises an error when attempting to set the current value of the bar to be ' \
'greater than the total' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 10)
progress = Progress.new(:total => 10)
_progressbar = Bar.new(:progress => progress)

expect { progress.start :at => 11 }.
Expand Down
12 changes: 4 additions & 8 deletions spec/lib/ruby-progressbar/components/percentage_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ module Components
describe Percentage do
describe '#percentage' do
it 'returns the percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 10)
progress = Progress.new(:total => 10)
percentage = Percentage.new(:progress => progress)

progress.progress = 5
Expand All @@ -18,8 +17,7 @@ module Components

describe '#percentage_with_precision' do
it 'returns the percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 10)
progress = Progress.new(:total => 10)
percentage = Percentage.new(:progress => progress)

progress.progress = 5
Expand All @@ -30,8 +28,7 @@ module Components

describe '#justified_percentage' do
it 'returns the percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 10)
progress = Progress.new(:total => 10)
percentage = Percentage.new(:progress => progress)

progress.progress = 5
Expand All @@ -42,8 +39,7 @@ module Components

describe '#justified_percentage_with_precision' do
it 'returns the percentage' do
projector = Projectors::SmoothedAverage.new
progress = Progress.new(:projector => projector, :total => 10)
progress = Progress.new(:total => 10)
percentage = Percentage.new(:progress => progress)

progress.progress = 5
Expand Down

0 comments on commit 03a9b27

Please sign in to comment.