cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests for changes to user model

Browse source
This commit is contained in:
Tom Hughes 2010-05-06 22:11:55 +01:00
parent 3026da0cb0
commit 20cc601f85
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/fixtures/users.yml vendored
View file

@ -2,7 +2,7 @@
normal_user: normal_user:
id: 1 id: 1
email: test@openstreetmap.org email: test@openstreetmap.org
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2007-01-01 00:00:00" creation_time: "2007-01-01 00:00:00"
display_name: test display_name: test
@ -15,7 +15,7 @@ normal_user:
public_user: public_user:
id: 2 id: 2
email: test@example.com email: test@example.com
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2008-05-01 01:23:45" creation_time: "2008-05-01 01:23:45"
display_name: test2 display_name: test2
@ -28,7 +28,7 @@ public_user:
inactive_user: inactive_user:
id: 3 id: 3
email: inactive@openstreetmap.org email: inactive@openstreetmap.org
active: false status: pending
pass_crypt: <%= Digest::MD5::hexdigest('test2') %> pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
creation_time: "2008-07-01 02:23:45" creation_time: "2008-07-01 02:23:45"
display_name: Inactive User display_name: Inactive User
@ -41,7 +41,7 @@ inactive_user:
second_public_user: second_public_user:
id: 4 id: 4
email: public@OpenStreetMap.org email: public@OpenStreetMap.org
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2008-05-01 01:23:45" creation_time: "2008-05-01 01:23:45"
display_name: pulibc_test2 display_name: pulibc_test2
@ -54,7 +54,7 @@ second_public_user:
moderator_user: moderator_user:
id: 5 id: 5
email: moderator@example.com email: moderator@example.com
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2008-05-01 01:23:45" creation_time: "2008-05-01 01:23:45"
display_name: moderator display_name: moderator
@ -63,7 +63,7 @@ moderator_user:
administrator_user: administrator_user:
id: 6 id: 6
email: administrator@example.com email: administrator@example.com
active: true status: active
pass_crypt: <%= Digest::MD5.hexdigest('test') %> pass_crypt: <%= Digest::MD5.hexdigest('test') %>
creation_time: "2008-05-01 01:23:45" creation_time: "2008-05-01 01:23:45"
display_name: administrator display_name: administrator

5
test/unit/user_test.rb
View file

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
require File.dirname(__FILE__) + '/../test_helper' require File.dirname(__FILE__) + '/../test_helper'
class UserTest < ActiveSupport::TestCase class UserTest < ActiveSupport::TestCase
@ -18,7 +19,7 @@ class UserTest < ActiveSupport::TestCase
def test_unique_email def test_unique_email
new_user = User.new(:email => users(:normal_user).email, new_user = User.new(:email => users(:normal_user).email,
:active => 1, :status => "active",
:pass_crypt => Digest::MD5.hexdigest('test'), :pass_crypt => Digest::MD5.hexdigest('test'),
:display_name => "new user", :display_name => "new user",
:data_public => 1, :data_public => 1,
@ -29,7 +30,7 @@ class UserTest < ActiveSupport::TestCase
def test_unique_display_name def test_unique_display_name
new_user = User.new(:email => "tester@openstreetmap.org", new_user = User.new(:email => "tester@openstreetmap.org",
:active => 0, :status => "pending",
:pass_crypt => Digest::MD5.hexdigest('test'), :pass_crypt => Digest::MD5.hexdigest('test'),
:display_name => users(:normal_user).display_name, :display_name => users(:normal_user).display_name,
:data_public => 1, :data_public => 1,