From 5aaea40fc80ac735a51d3140f60296644c527d1f Mon Sep 17 00:00:00 2001 From: echarp Date: Thu, 25 Sep 2014 19:14:16 +0200 Subject: [PATCH] Bundle update --- Gemfile.lock | 18 +++++++++--------- test/fixtures/events.yml | 6 +++--- test/models/event_test.rb | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 84e87589..404817a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GIT remote: git://github.com/gregbell/active_admin.git - revision: 930d34cd224272687613dcf1db4cf5b1347f1098 + revision: 40ac6655d67eece5f43f72ff6137db1ba34aa711 specs: activeadmin (1.0.0.pre) arbre (~> 1.0, >= 1.0.2) bourbon coffee-rails - formtastic (~> 2.3) + formtastic (~> 3.0) inherited_resources (~> 1.4.1) jquery-rails jquery-ui-rails (~> 5.0) @@ -112,12 +112,12 @@ GEM eventmachine (1.0.3) execjs (2.2.1) fastercsv (1.5.5) - ffi (1.9.3) + ffi (1.9.4) font-awesome-rails (4.2.0.0) railties (>= 3.2, < 5.0) formatador (0.2.5) - formtastic (2.3.1) - actionpack (>= 3.0) + formtastic (3.0.0) + actionpack (>= 3.2.13) fssm (0.2.10) geocoder (1.2.5) guard (2.6.1) @@ -132,7 +132,7 @@ GEM guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-livereload (2.3.0) + guard-livereload (2.3.1) em-websocket (~> 0.5) guard (~> 2.0) multi_json (~> 1.8) @@ -229,7 +229,7 @@ GEM thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.3.2) - ransack (1.3.0) + ransack (1.4.1) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) @@ -270,9 +270,9 @@ GEM sexp_processor (4.4.4) simple_calendar (1.1.5) rails (>= 3.0) - simplecov (0.9.0) + simplecov (0.9.1) docile (~> 1.1.0) - multi_json + multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) slim (2.0.3) diff --git a/test/fixtures/events.yml b/test/fixtures/events.yml index 5886ee9a..1c5c2ff4 100644 --- a/test/fixtures/events.yml +++ b/test/fixtures/events.yml @@ -4,7 +4,7 @@ one: title: MyString description: MyText start_time: <%= 2.hours.from_now %> - end_time: <%= 2.hours.from_now %> + end_time: <%= 3.hours.from_now %> city: city_one.name related_region: region_one locality: 1 @@ -23,7 +23,7 @@ two: title: MyString description: MyText start_time: 2013-12-28 16:04:56 - end_time: 2013-12-28 16:04:56 + end_time: 2013-12-28 17:04:56 city: city_two.name related_region: region_two locality: 1 @@ -42,7 +42,7 @@ proposed: title: MyString description: MyText start_time: 2013-12-28 16:04:56 - end_time: 2013-12-28 16:04:56 + end_time: 2013-12-28 17:04:56 city: city_two.name related_region: region_two locality: 1 diff --git a/test/models/event_test.rb b/test/models/event_test.rb index 41e85d20..c3664a21 100644 --- a/test/models/event_test.rb +++ b/test/models/event_test.rb @@ -22,7 +22,7 @@ class EventTest < ActiveSupport::TestCase @event = Event.new( title: 'hello world', start_time: Time.new, - end_time: Time.new + 1, + end_time: Time.new + 1.hour, description: 'et hop!', city: City.first, related_region: Region.first, @@ -41,7 +41,7 @@ class EventTest < ActiveSupport::TestCase @event = Event.new( title: 'hello world', start_time: Time.new, - end_time: Time.new + 1, + end_time: Time.new + 1.hour, description: 'et hop!', city: City.first, related_region: Region.first, @@ -70,7 +70,7 @@ class EventTest < ActiveSupport::TestCase @event = Event.new( title: 'hello world', start_time: Time.new, - end_time: Time.new + 1, + end_time: Time.new + 1.hour, description: 'et hop!', city: City.first, related_region: Region.first, @@ -107,7 +107,7 @@ class EventTest < ActiveSupport::TestCase # Change address to ensure geo data is reset @event.address = 'hello world' - assert @event.valid? + assert @event.valid?, @event.errors.messages assert @event.save assert_nil @event.latitude assert_nil @event.longitude