gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #474 from bear454/minor_fixes

Browse source 
Minor fixes
This commit is contained in:
James Mason 2014-08-19 14:24:21 -07:00
commit b5fe3bfdcd
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/proposal/_form.html.haml
View file

@ -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

1
spec/features/proposal_spec.rb
View file

@ -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)