Fix failing tests. Replace ruby to 2.1.1 in travis. Update travis config

This commit is contained in:
KalabiYau 2014-04-24 22:02:50 +02:00
parent eacdd9cfd6
commit a6031df9f2
4 changed files with 65 additions and 54 deletions

View file

@ -2,12 +2,12 @@
FactoryGirl.define do
factory :conference do
title "The dog and pony show"
short_title "dps14"
social_tag "dps14"
timezone "Amsterdam"
contact_email "admin@example.com"
start_date Date.today
end_date Date.tomorrow
title "The dog and pony show"
short_title "dps14"
social_tag "dps14"
timezone "Amsterdam"
contact_email "admin@example.com"
start_date Date.today
end_date Date.tomorrow
end
end