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

spec/views/admin/conferences/edit.html.haml_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe 'admin/conference/edit' do
+describe 'admin/conferences/edit' do
 
   it 'renders conference details which are editable' do
     @conference = create(:conference, title: 'openSUSE')
     assign :conference, @conference
-    render template: 'admin/conference/edit.html.haml'
+    render template: 'admin/conferences/edit.html.haml'
     expect(rendered).to have_selector("input[value='openSUSE']")
   end
 end

spec/views/admin/conferences/index.html.haml_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'admin/conference/index' do
+describe 'admin/conferences/index' do
   let(:conference) { create(:conference, title: 'openSUSE Conference 2016') }
   let(:second_conference) { create(:conference) }
 
   it 'renders all conference names with links' do
     assign(:conferences, [conference, second_conference])
-    render
+    render template: 'admin/conferences/index.html.haml'
     expect(rendered).to include('openSUSE Conference 2016')
     expect(rendered).to include(CGI.escapeHTML(second_conference.title))
   end

spec/views/admin/conferences/new.html.haml_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe 'admin/conference/new' do
+describe 'admin/conferences/new' do
   let(:conference) { build(:conference) }
 
   it 'renders the new template for the conference' do
     assign(:conference, Conference.new)
-    render
+    render template: 'admin/conferences/new.html.haml'
     expect(rendered).to include('Basic Information')
     assign(:conference, conference)
     render

spec/views/admin/conferences/show.html.haml_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe 'admin/conference/show' do
+describe 'admin/conferences/show' do
 
   it 'renders conference dashboard' do
     conference = create(:conference, title: 'openSUSE')
     assign :conference, conference
     assign :program, conference.program
     assign :conference_progress, conference.get_status
-    render
+    render template: 'admin/conferences/show.html.haml'
     expect(rendered).to include("Dashboard for #{conference.title}")
   end
 end

spec/views/conferences/index.html.haml_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'conference/index' do
+describe 'conferences/index' do
   it 'renders _conference partial for each conference' do
     allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
     assign(:current, [create(:conference), create(:conference)])

spec/views/conferences/show.html.haml_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-describe 'conference/show.html.haml' do
+describe 'conferences/show.html.haml' do
   let!(:conference) { create(:full_conference) }
 
   before(:each) do
@@ -13,11 +13,11 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders program partial' do
-    expect(view).to render_template(partial: 'conference/_schedule_splashpage')
+    expect(view).to render_template(partial: 'conferences/_schedule_splashpage')
   end
 
   it 'renders registration partial' do
-    expect(view).to render_template(partial: 'conference/_registration')
+    expect(view).to render_template(partial: 'conferences/_registration')
   end
 
   it 'renders call_for_paper partial' do
@@ -25,7 +25,7 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders sponsors partial' do
-    expect(view).to render_template(partial: 'conference/_sponsors')
+    expect(view).to render_template(partial: 'conferences/_sponsors')
     expect(rendered).to match(conference.contact.email)
     expect(rendered).to match(conference.sponsors.first.website_url)
     expect(rendered).to match(CGI.escapeHTML(conference.sponsors.first.description))
@@ -33,7 +33,7 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders social media partial' do
-    expect(view).to render_template('conference/_social_media')
+    expect(view).to render_template('conferences/_social_media')
     expect(rendered).to match(conference.contact.facebook)
     expect(rendered).to match(conference.contact.googleplus)
     expect(rendered).to match(conference.contact.instagram)
@@ -41,7 +41,7 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders venue partial' do
-    expect(view).to render_template(partial: 'conference/_venue')
+    expect(view).to render_template(partial: 'conferences/_venue')
     expect(rendered).to match(CGI.escapeHTML(conference.venue.name))
     expect(rendered).to match(conference.venue.street)
     expect(rendered).to match(conference.venue.website)
@@ -49,7 +49,7 @@ describe 'conference/show.html.haml' do
   end
 
   it 'renders lodging partial' do
-    expect(view).to render_template(partial: 'conference/_lodging')
+    expect(view).to render_template(partial: 'conferences/_lodging')
     expect(rendered).to match(CGI.escapeHTML(conference.lodgings.first.name))
     expect(rendered).to match(CGI.escapeHTML(conference.lodgings.first.description))
     # FIXME: Lodging without image doesn't show link