agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Bundle update

Browse Source
This commit is contained in:
echarp 2014-09-25 19:14:16 +02:00
parent 415bcc9ef6
commit 5aaea40fc8
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile.lock
View File

@ -1,12 +1,12 @@
GIT GIT
remote: git://github.com/gregbell/active_admin.git remote: git://github.com/gregbell/active_admin.git
revision: 930d34cd224272687613dcf1db4cf5b1347f1098 revision: 40ac6655d67eece5f43f72ff6137db1ba34aa711
specs: specs:
activeadmin (1.0.0.pre) activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2) arbre (~> 1.0, >= 1.0.2)
bourbon bourbon
coffee-rails coffee-rails
formtastic (~> 2.3) formtastic (~> 3.0)
inherited_resources (~> 1.4.1) inherited_resources (~> 1.4.1)
jquery-rails jquery-rails
jquery-ui-rails (~> 5.0) jquery-ui-rails (~> 5.0)
@ -112,12 +112,12 @@ GEM
eventmachine (1.0.3) eventmachine (1.0.3)
execjs (2.2.1) execjs (2.2.1)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.3) ffi (1.9.4)
font-awesome-rails (4.2.0.0) font-awesome-rails (4.2.0.0)
railties (>= 3.2, < 5.0) railties (>= 3.2, < 5.0)
formatador (0.2.5) formatador (0.2.5)
formtastic (2.3.1) formtastic (3.0.0)
actionpack (>= 3.0) actionpack (>= 3.2.13)
fssm (0.2.10) fssm (0.2.10)
geocoder (1.2.5) geocoder (1.2.5)
guard (2.6.1) guard (2.6.1)
@ -132,7 +132,7 @@ GEM
guard-bundler (2.0.0) guard-bundler (2.0.0)
bundler (~> 1.0) bundler (~> 1.0)
guard (~> 2.2) guard (~> 2.2)
guard-livereload (2.3.0) guard-livereload (2.3.1)
em-websocket (~> 0.5) em-websocket (~> 0.5)
guard (~> 2.0) guard (~> 2.0)
multi_json (~> 1.8) multi_json (~> 1.8)
@ -229,7 +229,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
rake (10.3.2) rake (10.3.2)
ransack (1.3.0) ransack (1.4.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -270,9 +270,9 @@ GEM
sexp_processor (4.4.4) sexp_processor (4.4.4)
simple_calendar (1.1.5) simple_calendar (1.1.5)
rails (>= 3.0) rails (>= 3.0)
simplecov (0.9.0) simplecov (0.9.1)
docile (~> 1.1.0) docile (~> 1.1.0)
multi_json multi_json (~> 1.0)
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
slim (2.0.3) slim (2.0.3)

6
test/fixtures/events.yml vendored
View File

@ -4,7 +4,7 @@ one:
title: MyString title: MyString
description: MyText description: MyText
start_time: <%= 2.hours.from_now %> start_time: <%= 2.hours.from_now %>
end_time: <%= 2.hours.from_now %> end_time: <%= 3.hours.from_now %>
city: city_one.name city: city_one.name
related_region: region_one related_region: region_one
locality: 1 locality: 1
@ -23,7 +23,7 @@ two:
title: MyString title: MyString
description: MyText description: MyText
start_time: 2013-12-28 16:04:56 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 city: city_two.name
related_region: region_two related_region: region_two
locality: 1 locality: 1
@ -42,7 +42,7 @@ proposed:
title: MyString title: MyString
description: MyText description: MyText
start_time: 2013-12-28 16:04:56 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 city: city_two.name
related_region: region_two related_region: region_two
locality: 1 locality: 1

8
test/models/event_test.rb
View File

@ -22,7 +22,7 @@ class EventTest < ActiveSupport::TestCase
@event = Event.new( @event = Event.new(
title: 'hello world', title: 'hello world',
start_time: Time.new, start_time: Time.new,
end_time: Time.new + 1, end_time: Time.new + 1.hour,
description: 'et hop!', description: 'et hop!',
city: City.first, city: City.first,
related_region: Region.first, related_region: Region.first,
@ -41,7 +41,7 @@ class EventTest < ActiveSupport::TestCase
@event = Event.new( @event = Event.new(
title: 'hello world', title: 'hello world',
start_time: Time.new, start_time: Time.new,
end_time: Time.new + 1, end_time: Time.new + 1.hour,
description: 'et hop!', description: 'et hop!',
city: City.first, city: City.first,
related_region: Region.first, related_region: Region.first,
@ -70,7 +70,7 @@ class EventTest < ActiveSupport::TestCase
@event = Event.new( @event = Event.new(
title: 'hello world', title: 'hello world',
start_time: Time.new, start_time: Time.new,
end_time: Time.new + 1, end_time: Time.new + 1.hour,
description: 'et hop!', description: 'et hop!',
city: City.first, city: City.first,
related_region: Region.first, related_region: Region.first,
@ -107,7 +107,7 @@ class EventTest < ActiveSupport::TestCase
# Change address to ensure geo data is reset # Change address to ensure geo data is reset
@event.address = 'hello world' @event.address = 'hello world'
assert @event.valid? assert @event.valid?, @event.errors.messages
assert @event.save assert @event.save
assert_nil @event.latitude assert_nil @event.latitude
assert_nil @event.longitude assert_nil @event.longitude