diff --git a/app/views/proposal/_form.html.haml b/app/views/proposal/_form.html.haml index 83e67ae1..3eb85510 100644 --- a/app/views/proposal/_form.html.haml +++ b/app/views/proposal/_form.html.haml @@ -28,7 +28,7 @@ = render partial: 'shared/media_item', locals: { commercial_type: commercial.commercial_type, commercial_id: commercial.commercial_id } - if can? :update, commercial = link_to 'Edit', edit_conference_proposal_commercial_path(@conference.short_title, @event.id, commercial.id), class: 'btn btn-primary' - - if can? :destrooy, commercial + - if can? :destroy, commercial = link_to 'Delete', conference_proposal_commercial_path(@conference.short_title, @event.id, commercial.id), :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger' - if can? :create, @event.commercials.new diff --git a/spec/features/proposal_spec.rb b/spec/features/proposal_spec.rb index 1f4aa796..e534b2ea 100644 --- a/spec/features/proposal_spec.rb +++ b/spec/features/proposal_spec.rb @@ -92,6 +92,7 @@ feature Event do # Delete a commercial click_link 'Commercials' click_link 'Delete' + page.driver.network_traffic expect(flash).to eq('Commercial was successfully destroyed.') expect(event.commercials.count).to eq(expected_count_commercial - 1)