Skip to content
Extraits de code Groupes Projets
Valider c9ed8b29 rédigé par echarp's avatar echarp
Parcourir les fichiers

The foreign key to table region is renamed to region_id

parent 510d2c81
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -20,14 +20,14 @@ class ModerationsControllerTest < ActionController::TestCase
test 'should preview event' do
patch :preview, id: @moderation, event: {
title: 'hello world',
related_region: regions(:region_one)
region: regions(:region_one)
}
end
test 'should edit event' do
put :update, id: @moderation, event: {
title: 'hello world',
related_region: regions(:region_one)
region: regions(:region_one)
}
assert_redirected_to :moderations
end
......
......@@ -6,7 +6,7 @@ one:
start_time: <%= 2.hours.from_now %>
end_time: <%= 3.hours.from_now %>
city: city_one.name
related_region: region_one
region: region_one
locality: 1
url: http://exemple.com
contact: test@example.com
......@@ -26,7 +26,7 @@ two:
start_time: 2013-12-28 16:04:56
end_time: 2013-12-28 17:04:56
city: city_two.name
related_region: region_two
region: region_two
locality: 1
url: http://exemple.com
contact: test2@example.com
......@@ -46,7 +46,7 @@ proposed:
start_time: 2013-12-28 16:04:56
end_time: 2013-12-28 17:04:56
city: city_two.name
related_region: region_two
region: region_two
locality: 1
url: http://exemple.com
contact: test2@example.com
......
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
related_region: region_one
region: region_one
city: Jolie ville
department: 1
name: MyString
url: MyString
two:
related_region: region_two
region: region_two
city: Jolie ville
department: 1
name: MyString
......
......@@ -13,7 +13,7 @@ class EventTest < ActiveSupport::TestCase
end_time: Time.new + 1.hour,
description: 'et hop!',
city: City.first,
related_region: Region.first,
region: Region.first,
url: 'http://example.com',
contact: 'contact@example.com',
submitter: 'submitter@example.com',
......@@ -33,7 +33,7 @@ class EventTest < ActiveSupport::TestCase
end_time: Time.new + 1.hour,
description: 'et hop!',
city: City.first,
related_region: Region.first,
region: Region.first,
url: 'http://example.com',
contact: 'contact@example.com',
tags: 'hello world'
......@@ -63,7 +63,7 @@ class EventTest < ActiveSupport::TestCase
end_time: Time.new + 1.hour,
description: 'et hop!',
city: City.first,
related_region: Region.first,
region: Region.first,
url: 'http://example.com',
contact: 'contact@example.com',
tags: 'hello world'
......@@ -114,7 +114,7 @@ class EventTest < ActiveSupport::TestCase
test 'full address' do
@event.address = 'hello'
@event.city = 'world'
@event.related_region.name = 'all'
@event.region.name = 'all'
assert_equal 'hello, world, all', @event.full_address
end
end
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter