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 #493 from differentreality/typo

Browse source 
Typos
This commit is contained in:
Artem Chernikov 2014-09-09 12:51:56 +02:00
commit c486027e6b
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/commercials_controller.rb
View file

@ -22,7 +22,7 @@ module Admin
redirect_to admin_conference_commercials_path,
notice: 'Commercial was successfully created.'
else
flash[:alert] = "A error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
flash[:alert] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :new
end
end
@ -32,7 +32,7 @@ module Admin
redirect_to admin_conference_commercials_path,
notice: 'Commercial was successfully updated.'
else
flash[:alert] = "A error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
flash[:alert] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :edit
end
end

4
app/controllers/commercials_controller.rb
View file

@ -18,7 +18,7 @@ class CommercialsController < ApplicationController
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id),
notice: 'Commercial was successfully created.'
else
flash[:alert] = "A error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
flash[:alert] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :new
end
end
@ -28,7 +28,7 @@ class CommercialsController < ApplicationController
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id),
notice: 'Commercial was successfully updated.'
else
flash[:alert] = "A error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
flash[:alert] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :edit
end
end

6
app/controllers/ticket_purchases_controller.rb
View file

@ -8,7 +8,7 @@ class TicketPurchasesController < ApplicationController
if message.blank?
redirect_to conference_conference_registrations_path(@conference.short_title),
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
redirect_to conference_conference_registrations_path(@conference.short_title),
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])
if @ticket_purchases.destroy
redirect_to conference_conference_registrations_path(@conference.short_title),
notice: 'Ticket successfully destroyed.'
notice: 'Ticket successfully deleted.'
else
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('. ')}."
end
end

8
spec/features/commercials_spec.rb
View file

@ -20,7 +20,7 @@ feature Commercial do
select('SlideShare', from: 'commercial_commercial_type')
click_button 'Create Commercial'
expect(flash).to eq("A error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(flash).to eq("An error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(conference.commercials.count).to eq(expected_count - 1)
# Create valid commercial
@ -39,7 +39,7 @@ feature Commercial do
fill_in 'commercial_commercial_id', with: ''
click_button 'Update Commercial'
expect(flash).to eq("A error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(flash).to eq("An error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(conference.commercials.count).to eq(expected_count)
# Update valid commercial
@ -97,7 +97,7 @@ feature Commercial do
select('SlideShare', from: 'commercial_commercial_type')
click_button 'Create Commercial'
expect(flash).to eq("A error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(flash).to eq("An error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(event.commercials.count).to eq(@expected_count - 1)
end
@ -125,7 +125,7 @@ feature Commercial do
select('SlideShare', from: 'commercial_commercial_type')
fill_in 'commercial_commercial_id', with: ''
click_button 'Update Commercial'
expect(flash).to eq("A error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(flash).to eq("An error prohibited this Commercial from being saved: Commercial can't be blank.")
expect(event.commercials.count).to eq(@expected_count)
end

4
spec/features/ticket_purchases_spec.rb
View file

@ -29,7 +29,7 @@ feature Registration do
expect(purchase.quantity).to eq(2)
expect(current_path).to eq(conference_conference_registrations_path(conference.short_title))
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
end
@ -43,7 +43,7 @@ feature Registration do
expect(page.has_content?('Business Ticket')).to be true
click_link 'Delete'
expect(flash).to eq('Ticket successfully destroyed.')
expect(flash).to eq('Ticket successfully deleted.')
expect(TicketPurchase.count).to eq(0)
end
end