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