From 9e591d8ccb264aec201020d537dbf2dca6e15bbf Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 2 Feb 2017 12:08:36 +0000 Subject: [PATCH] Add with_home_location trait for user factories. --- test/factories/user.rb | 5 +++++ test/models/user_test.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/factories/user.rb b/test/factories/user.rb index ccbb84f93..79b9a2a16 100644 --- a/test/factories/user.rb +++ b/test/factories/user.rb @@ -3,5 +3,10 @@ FactoryGirl.define do sequence(:email) { |n| "user#{n}@example.com" } sequence(:display_name) { |n| "User #{n}" } pass_crypt Digest::MD5.hexdigest("test") + + trait :with_home_location do + home_lat { rand(-90.0...90.0) } + home_lon { rand(-180.0...180.0) } + end end end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 6ecc8c796..5eacd98b9 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -240,7 +240,7 @@ class UserTest < ActiveSupport::TestCase end def test_delete - user = users(:normal_user) + user = create(:user, :with_home_location, :description => "foo") user.delete assert_equal "user_#{user.id}", user.display_name assert user.description.blank? @@ -253,7 +253,7 @@ class UserTest < ActiveSupport::TestCase end def test_to_xml - user = users(:normal_user) + user = build(:user, :with_home_location) xml = user.to_xml assert_select Nokogiri::XML::Document.parse(xml.to_s), "user" do assert_select "[display_name=?]", user.display_name @@ -263,7 +263,7 @@ class UserTest < ActiveSupport::TestCase end def test_to_xml_node - user = users(:normal_user) + user = build(:user, :with_home_location) xml = user.to_xml_node assert_select Nokogiri::XML::DocumentFragment.parse(xml.to_s), "user" do assert_select "[display_name=?]", user.display_name -- 2.43.2