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

Merge pull request #1047 from differentreality/xml_export

Browse source 
XML export fix tests. Add not nil room for scheduled events.
This commit is contained in:
Henne Vogelsang 2016-06-22 12:33:43 +02:00 • committed by GitHub
commit c49606c815
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/program.rb
View file

@ -27,7 +27,7 @@ class Program < ActiveRecord::Base
end end
def scheduled def scheduled
where.not(start_time: nil) where.not(start_time: nil).where.not(room: nil)
end end
def highlights def highlights

4
spec/controllers/conference_controller_spec.rb
View file

@ -1,7 +1,9 @@
require 'spec_helper' require 'spec_helper'
describe ConferenceController do describe ConferenceController do
let(:conference) { create(:full_conference, splashpage: create(:splashpage, public: true)) } let(:conference) { create(:conference, splashpage: create(:splashpage, public: true), venue: create(:venue)) }
let!(:cfp) { create(:cfp, program: conference.program) }
let(:room) { create(:room, venue: conference.venue) }
describe 'GET #index' do describe 'GET #index' do
it 'Response code is 200' do it 'Response code is 200' do