From 1b00a314ae510c15e93ba7fde12c92f43d33559c Mon Sep 17 00:00:00 2001
From: bsag <butshesagirl@rousette.org.uk>
Date: Sun, 15 Jun 2008 10:38:58 +0100
Subject: [PATCH] Added patch by Eric to fix users_controller_test. Fixes #735.
 <http://dev.rousette.org.uk/ticket/735>

---
 db/schema.rb                             | 18 +++++++++---------
 test/functional/users_controller_test.rb |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 39376b7f..2d5c11ee 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,10 +12,10 @@
 ActiveRecord::Schema.define(:version => 38) do
 
   create_table "contexts", :force => true do |t|
-    t.string   "name",                                         :null => false
-    t.integer  "position",   :limit => 255, :default => 0
-    t.boolean  "hide",                      :default => false
-    t.integer  "user_id",                   :default => 1
+    t.string   "name",                          :null => false
+    t.integer  "position"
+    t.boolean  "hide",       :default => false
+    t.integer  "user_id",    :default => 1
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -75,11 +75,11 @@ ActiveRecord::Schema.define(:version => 38) do
   add_index "preferences", ["user_id"], :name => "index_preferences_on_user_id"
 
   create_table "projects", :force => true do |t|
-    t.string   "name",                                                    :null => false
-    t.integer  "position",           :limit => 255, :default => 0
-    t.integer  "user_id",                           :default => 1
+    t.string   "name",                                                   :null => false
+    t.integer  "position"
+    t.integer  "user_id",                          :default => 1
     t.text     "description"
-    t.string   "state",              :limit => 20,  :default => "active", :null => false
+    t.string   "state",              :limit => 20, :default => "active", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "default_context_id"
@@ -95,7 +95,7 @@ ActiveRecord::Schema.define(:version => 38) do
     t.datetime "updated_at"
   end
 
-  add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
 
   create_table "taggings", :force => true do |t|
     t.integer "taggable_id"
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index c9d854b8..009c5de6 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -38,7 +38,7 @@ class UsersControllerTest < Test::Rails::TestCase
   def test_destroy_user
     login_as :admin_user
     @no_users_before = User.find(:all).size
-    xhr :post, :destroy, :id => 3
+    xhr :post, :destroy, :id => users(:ldap_user).to_param
     assert_rjs :page, "user-3", :remove
     assert_equal @no_users_before-1, User.find(:all).size
   end