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

tickets controller fix message

Browse source
This commit is contained in:
Stella Rouzi 2014-09-02 23:28:23 +03:00
parent 9ff8becaf6
commit bb731aec00
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/ticket_purchases_controller.rb
View file

@ -8,7 +8,7 @@ class TicketPurchasesController < ApplicationController
if message.blank? if message.blank?
redirect_to conference_conference_registrations_path(@conference.short_title), redirect_to conference_conference_registrations_path(@conference.short_title),
notice: 'Congratulations, you have successfully purchased a ticket! ' \ notice: 'Congratulations, you have successfully purchased a ticket! ' \
"You can pay it cash on check in! Thank you for supporting #{@conference.title}!" "You can pay for it in cash when you arrive! Thank you for supporting #{@conference.title}!"
else else
redirect_to conference_conference_registrations_path(@conference.short_title), redirect_to conference_conference_registrations_path(@conference.short_title),
alert: "Oops, something went wrong with your purchase! #{message}" alert: "Oops, something went wrong with your purchase! #{message}"
@ -19,10 +19,10 @@ class TicketPurchasesController < ApplicationController
@ticket_purchases = current_user.ticket_purchases.find_by(ticket_id: params[:id]) @ticket_purchases = current_user.ticket_purchases.find_by(ticket_id: params[:id])
if @ticket_purchases.destroy if @ticket_purchases.destroy
redirect_to conference_conference_registrations_path(@conference.short_title), redirect_to conference_conference_registrations_path(@conference.short_title),
notice: 'Ticket successfully destroyed.' notice: 'Ticket successfully deleted.'
else else
redirect_to conference_conference_registrations_path(@conference.short_title), redirect_to conference_conference_registrations_path(@conference.short_title),
notice: 'A error prohibited deleting your purchase! '\ alert: 'An error prohibited deleting your purchase! '\
"#{@ticket_purchases.errors.full_messages.join('. ')}." "#{@ticket_purchases.errors.full_messages.join('. ')}."
end end
end end

4
spec/features/ticket_purchases_spec.rb
View file

@ -29,7 +29,7 @@ feature Registration do
expect(purchase.quantity).to eq(2) expect(purchase.quantity).to eq(2)
expect(current_path).to eq(conference_conference_registrations_path(conference.short_title)) expect(current_path).to eq(conference_conference_registrations_path(conference.short_title))
expect(flash). expect(flash).
to eq('Congratulations, you have successfully purchased a ticket! You can pay it cash on check in! Thank you for supporting ExampleCon!') to eq('Congratulations, you have successfully purchased a ticket! You can pay for it in cash when you arrive! Thank you for supporting ExampleCon!')
expect(page.has_content?('Business Ticket')).to be true expect(page.has_content?('Business Ticket')).to be true
end end
@ -43,7 +43,7 @@ feature Registration do
expect(page.has_content?('Business Ticket')).to be true expect(page.has_content?('Business Ticket')).to be true
click_link 'Delete' click_link 'Delete'
expect(flash).to eq('Ticket successfully destroyed.') expect(flash).to eq('Ticket successfully deleted.')
expect(TicketPurchase.count).to eq(0) expect(TicketPurchase.count).to eq(0)
end end
end end