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

Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'

Browse source
This commit is contained in:
richiethomas 2016-09-14 22:42:04 -04:00
parent 0b6550d060
commit daf1f805bd
71 changed files with 225 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/models/email_settings_spec.rb
View file

@ -12,9 +12,9 @@ describe EmailSettings do
'conference' => conference.title,
'conference_start_date' => Date.new(2014, 05, 01),
'conference_end_date' => Date.new(2014, 05, 06),
'registrationlink' => 'http://localhost:3000/conference/goto/register',
'conference_splash_link' => 'http://localhost:3000/conference/goto',
'schedule_link' => 'http://localhost:3000/conference/goto/schedule',
'registrationlink' => 'http://localhost:3000/conferences/goto/register',
'conference_splash_link' => 'http://localhost:3000/conferences/goto',
'schedule_link' => 'http://localhost:3000/conferences/goto/schedule',
'cfp_end_date' => 'Unknown',
'cfp_start_date' => 'Unknown',
'venue' => 'Unknown',
@ -87,7 +87,7 @@ describe EmailSettings do
context 'conference has event' do
before do
event_hash = { 'eventtitle' => 'Talk about talks', 'proposalslink' => 'http://localhost:3000/conference/goto/program/proposal' }
event_hash = { 'eventtitle' => 'Talk about talks', 'proposalslink' => 'http://localhost:3000/conferences/goto/program/proposals' }
expected_hash.merge!(event_hash)
end