mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-05-19 14:11:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

commercials

Browse Source
This commit is contained in:
Stella Rouzi
2014-09-03 00:18:45 +03:00
parent bb731aec00
commit 46aed52c85
3 changed files with 8 additions and 8 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

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