Merge 5b3b054d0b into 05209260a4

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'conferences/index' do
   it 'renders _conference partial for each conference' do
-    allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
+    allow(view).to receive(:date_range_string).and_return('January 17 - 21 2014')
     assign(:current, [create(:conference), create(:conference)])
     render
     expect(view).to render_template(partial: '_conference_details', count: 2)

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

@@ -3,7 +3,7 @@ describe 'conferences/show.html.haml' do
   let!(:conference) { create(:full_conference) }
 
   before(:each) do
-    allow(view).to receive(:date_string).and_return('January 17 - 21 2014')
+    allow(view).to receive(:date_range_string).and_return('January 17 - 21 2014')
     assign :conference, conference
     render
   end