From bb731aec003a4626fec110577f14bb64fcdf46db Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Tue, 2 Sep 2014 23:28:23 +0300 Subject: [PATCH 1/2] tickets controller fix message --- app/controllers/ticket_purchases_controller.rb | 6 +++--- spec/features/ticket_purchases_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/ticket_purchases_controller.rb b/app/controllers/ticket_purchases_controller.rb index 5f548d88..40059e69 100644 --- a/app/controllers/ticket_purchases_controller.rb +++ b/app/controllers/ticket_purchases_controller.rb @@ -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 diff --git a/spec/features/ticket_purchases_spec.rb b/spec/features/ticket_purchases_spec.rb index 64cc4f31..ae782f9e 100644 --- a/spec/features/ticket_purchases_spec.rb +++ b/spec/features/ticket_purchases_spec.rb @@ -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 From 46aed52c851fa3763cb6b9bb6efa83df29eb3dd8 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Wed, 3 Sep 2014 00:18:45 +0300 Subject: [PATCH 2/2] commercials --- app/controllers/admin/commercials_controller.rb | 4 ++-- app/controllers/commercials_controller.rb | 4 ++-- spec/features/commercials_spec.rb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/commercials_controller.rb b/app/controllers/admin/commercials_controller.rb index 2a41b2dc..b5deddcb 100644 --- a/app/controllers/admin/commercials_controller.rb +++ b/app/controllers/admin/commercials_controller.rb @@ -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 diff --git a/app/controllers/commercials_controller.rb b/app/controllers/commercials_controller.rb index 38bd2eb7..d107cb9c 100644 --- a/app/controllers/commercials_controller.rb +++ b/app/controllers/commercials_controller.rb @@ -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 diff --git a/spec/features/commercials_spec.rb b/spec/features/commercials_spec.rb index 249bc28f..9c77b771 100644 --- a/spec/features/commercials_spec.rb +++ b/spec/features/commercials_spec.rb @@ -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