diff options
| -rw-r--r-- | app/helpers/widget_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/widgets/show.html.erb | 4 | ||||
| -rw-r--r-- | spec/helpers/widget_helper_spec.rb | 39 |
3 files changed, 21 insertions, 25 deletions
diff --git a/app/helpers/widget_helper.rb b/app/helpers/widget_helper.rb index f188f6b08..e604954fe 100644 --- a/app/helpers/widget_helper.rb +++ b/app/helpers/widget_helper.rb @@ -1,6 +1,5 @@ module WidgetHelper - def status_description(info_request) - status = info_request.calculate_status + def status_description(info_request, status) case status when 'waiting_classification' _('Awaiting classification') diff --git a/app/views/widgets/show.html.erb b/app/views/widgets/show.html.erb index fd2391035..1dd8969b6 100644 --- a/app/views/widgets/show.html.erb +++ b/app/views/widgets/show.html.erb @@ -8,9 +8,9 @@ <div class="alaveteli-widget__title"> <%= link_to @info_request.title, request_path(@info_request), :target => "_top" %> </div> - <div class="alaveteli-widget__status <%= @info_request.calculate_status %>"> + <div class="alaveteli-widget__status <%= @status %>"> <p class="alaveteli-widget__status__status-label">Status</p> - <%= status_description(@info_request) %> + <%= status_description(@info_request, @status) %> </div> </div> <div class="alaveteli-widget__people-count"> diff --git a/spec/helpers/widget_helper_spec.rb b/spec/helpers/widget_helper_spec.rb index b0da20c39..c8c41b14f 100644 --- a/spec/helpers/widget_helper_spec.rb +++ b/spec/helpers/widget_helper_spec.rb @@ -4,27 +4,24 @@ describe WidgetHelper do include WidgetHelper - describe :status_description do - - before do - @info_request = FactoryGirl.build(:info_request) - end - - it 'should return "Awaiting classification" for "waiting_classification' do - @info_request.stub!(:calculate_status).and_return("waiting_classification") - expect(status_description(@info_request)).to eq('Awaiting classification') - end - - it 'should call theme_display_status for a theme status' do - @info_request.stub!(:calculate_status).and_return("special_status") - @info_request.stub!(:theme_display_status).and_return("Special status") - expect(status_description(@info_request)).to eq('Special status') - end - - it 'should return unknown for an unknown status' do - @info_request.stub!(:calculate_status).and_return("special_status") - expect(status_description(@info_request)).to eq('Unknown') - end + describe :status_description do + + before do + @info_request = FactoryGirl.build(:info_request) + end + + it 'should return "Awaiting classification" for "waiting_classification' do + expect(status_description(@info_request, 'waiting_classification')).to eq('Awaiting classification') + end + + it 'should call theme_display_status for a theme status' do + @info_request.stub!(:theme_display_status).and_return("Special status") + expect(status_description(@info_request, 'special_status')).to eq('Special status') + end + + it 'should return unknown for an unknown status' do + expect(status_description(@info_request, 'special_status')).to eq('Unknown') + end end |