gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename more commericals to materials

Browse source
This commit is contained in:
Michael Ball 2020-01-27 13:37:23 -08:00
parent 9a1739e86e
commit 3eeaebbdc8
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/commercials/edit.html.haml
View file

@ -2,7 +2,7 @@
.row .row
.col-md-12 .col-md-12
.page-header .page-header
%h1 Editing Commercial %h1 Edit Materials
.row .row
.col-md-12 .col-md-12
= semantic_form_for @commercial, url: conference_program_proposal_commercial_path(conference_id: @conference.short_title, proposal_id: @event.id, id: @commercial.id) do |f| = semantic_form_for @commercial, url: conference_program_proposal_commercial_path(conference_id: @conference.short_title, proposal_id: @event.id, id: @commercial.id) do |f|

2
app/views/commercials/new.html.haml
View file

@ -2,7 +2,7 @@
.row .row
.col-md-12 .col-md-12
.page-header .page-header
%h1 New Commercial %h1 New Materials
.row .row
.col-md-12 .col-md-12
= semantic_form_for @commercial, url: conference_program_proposal_commercials_path(conference_id: @conference.short_title, proposal_id: @event.id) do |f| = semantic_form_for @commercial, url: conference_program_proposal_commercials_path(conference_id: @conference.short_title, proposal_id: @event.id) do |f|

8
spec/features/commercials_spec.rb
View file

@ -17,7 +17,7 @@ feature Commercial do
# Create valid commercial # Create valid commercial
fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw' fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw'
click_button 'Create Commercial' click_button 'Save Materials'
page.find('#flash') page.find('#flash')
expect(flash).to eq('Commercial was successfully created.') expect(flash).to eq('Commercial was successfully created.')
page.find('#flash .button.close').click page.find('#flash .button.close').click
@ -59,10 +59,10 @@ feature Commercial do
click_link 'Commercials' click_link 'Commercials'
fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw' fill_in 'commercial_url', with: 'https://www.youtube.com/watch?v=M9bq_alk-sw'
# Workaround to enable the 'Create Commercial' button # Workaround to enable the 'Save Materials' button
page.execute_script("$('#commercial_submit_action').prop('disabled', false)") page.execute_script("$('#commercial_submit_action').prop('disabled', false)")
click_button 'Create Commercial' click_button 'Save Materials'
page.find('#flash') page.find('#flash')
expect(flash).to eq('Commercial was successfully created.') expect(flash).to eq('Commercial was successfully created.')
end end
@ -72,7 +72,7 @@ feature Commercial do
click_link 'Commercials' click_link 'Commercials'
fill_in 'commercial_url', with: 'invalid_commercial_url' fill_in 'commercial_url', with: 'invalid_commercial_url'
expect(page).to have_content('No embeddable content') expect(page).to have_content('No embeddable content')
expect(page).to have_css("button[type='submit']:disabled", text: 'Create Commercial') expect(page).to have_css("button[type='submit']:disabled", text: 'Save Materials')
end end
scenario 'updates a commercial of an event', feature: true, js: true do scenario 'updates a commercial of an event', feature: true, js: true do