diff --git a/.travis.yml b/.travis.yml index 8376812..0d41268 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,13 @@ addons: code_climate: repo_token: b3db5b7df9a0a1d0fd3503e72d7431ffbfa172492c2840d590ccb2fafd9172d3 rvm: - - 2.1.3 + - 2.1.2 env: - - MYSQL_USERNAME=travis APP_SECRET=2d3a08dfea079fe45bcb7f830b010eda -before_install: - - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16" - - sleep 5 + - MYSQL_USERNAME=travis + - APP_SECRET=2d3a08dfea079fe45bcb7f830b010eda +before_script: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start script: - RAILS_ENV=test bundle exec rake db:create db:migrate db:test:prepare - RAILS_ENV=test bundle exec rspec spec diff --git a/Gemfile b/Gemfile index fd44e33..3a53b48 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -ruby '2.1.3' +ruby '2.2.1' gem 'dotenv-rails', '~> 0.10.0' gem 'rails', '~> 3.2.19' diff --git a/app/models/gather.rb b/app/models/gather.rb index 21507a2..44b774f 100644 --- a/app/models/gather.rb +++ b/app/models/gather.rb @@ -70,8 +70,8 @@ class Gather < ActiveRecord::Base def self.player_count_for_game(name) game = self.find_game(name) - if game && players = game.gathers.ordered.first.gatherers - players.size + if game && (players = game.gathers.ordered.first.gatherers.count) + players else 0 end diff --git a/app/services/google_calendar.rb b/app/services/google_calendar.rb index 96cc92b..21f350f 100644 --- a/app/services/google_calendar.rb +++ b/app/services/google_calendar.rb @@ -98,11 +98,11 @@ class GoogleCalendar end def start - Time.use_zone(@timezone_offset) { Time.zone.parse(@entry["start"]["dateTime"]) } + @entry["start"]["dateTime"].to_datetime.in_time_zone(@timezone_offset) end def end - Time.use_zone(@timezone_offset) { Time.zone.parse(@entry["end"]["dateTime"]) } + @entry["end"]["dateTime"].to_datetime.in_time_zone(@timezone_offset) end def formatted_summary