From d62665a19093969b17cac79c031e24e8478e380c Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Mon, 20 Jun 2016 21:05:08 +0300
Subject: [PATCH 1/2] XML export fix tests. Add not nil room for scheduled
 events.

---
 app/models/program.rb                          | 2 +-
 spec/controllers/conference_controller_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/program.rb b/app/models/program.rb
index 36df5829..1a5fd4aa 100644
--- a/app/models/program.rb
+++ b/app/models/program.rb
@@ -27,7 +27,7 @@ class Program < ActiveRecord::Base
     end
 
     def scheduled
-      where.not(start_time: nil)
+      where.not(start_time: nil).where.not(room: nil)
     end
 
     def highlights
diff --git a/spec/controllers/conference_controller_spec.rb b/spec/controllers/conference_controller_spec.rb
index 995cab08..1a766232 100644
--- a/spec/controllers/conference_controller_spec.rb
+++ b/spec/controllers/conference_controller_spec.rb
@@ -1,7 +1,9 @@
 require 'spec_helper'
 
 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
     it 'Response code is 200' do

From 51503fdff39a429829d2a5e50c23ef5ebc498147 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Wed, 22 Jun 2016 13:24:31 +0200
Subject: [PATCH 2/2] revision is deprecated, use branch in mina

---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 3e75ac0c..6bbc26f1 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -7,7 +7,7 @@ set :port, 2214
 set :user, 'osem'
 set :deploy_to, '/srv/www/vhosts/opensuse.org/events'
 set :repository, 'https://github.com/openSUSE/osem.git'
-set :revision, 'one'
+set :branch, 'one'
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.