From fd15a39f7a1c56c5e30c86a6cbd3e0a4e84a6261 Mon Sep 17 00:00:00 2001
From: Pavel Chipiga <pavel.chipiga@gmail.com>
Date: Tue, 14 Feb 2012 13:50:01 +0200
Subject: [PATCH] Fix cancan regsiter_requests specs. Temporary fix specs
 running bug through file rename. Refs #161

---
 config/initializers/gollum.rb       |  2 +-
 config/initializers/grit.rb         |  2 +-
 db/schema.rb                        |  5 ++---
 lib/{gollum.rb => gollum1.rb}       |  0
 lib/{grit.rb => grit1.rb}           |  0
 spec/factories/register_requests.rb | 13 ++++++++-----
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename lib/{gollum.rb => gollum1.rb} (100%)
 rename lib/{grit.rb => grit1.rb} (100%)

diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb
index d5c28225a..143ec1535 100644
--- a/config/initializers/gollum.rb
+++ b/config/initializers/gollum.rb
@@ -1 +1 @@
-require './lib/gollum'
+require './lib/gollum1'
diff --git a/config/initializers/grit.rb b/config/initializers/grit.rb
index 043d42d15..04420c3cb 100644
--- a/config/initializers/grit.rb
+++ b/config/initializers/grit.rb
@@ -1,3 +1,3 @@
 # -*- encoding : utf-8 -*-
 
-require './lib/grit'
+require './lib/grit1'
diff --git a/db/schema.rb b/db/schema.rb
index bf68d3b7c..75b6b173f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -98,12 +98,12 @@ ActiveRecord::Schema.define(:version => 20120210141153) do
   end
 
   create_table "comments", :force => true do |t|
+    t.string   "commentable_id"
     t.string   "commentable_type"
     t.integer  "user_id"
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.decimal  "commentable_id",   :precision => 50, :scale => 0
   end
 
   create_table "containers", :force => true do |t|
@@ -125,7 +125,6 @@ ActiveRecord::Schema.define(:version => 20120210141153) do
     t.string   "locked_by"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "queue"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
@@ -347,6 +346,7 @@ ActiveRecord::Schema.define(:version => 20120210141153) do
     t.string   "email",                                 :default => "",   :null => false
     t.string   "encrypted_password",     :limit => 128, :default => "",   :null => false
     t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -354,7 +354,6 @@ ActiveRecord::Schema.define(:version => 20120210141153) do
     t.string   "uname"
     t.string   "role"
     t.string   "language",                              :default => "en"
-    t.datetime "reset_password_sent_at"
     t.integer  "own_projects_count",                    :default => 0,    :null => false
   end
 
diff --git a/lib/gollum.rb b/lib/gollum1.rb
similarity index 100%
rename from lib/gollum.rb
rename to lib/gollum1.rb
diff --git a/lib/grit.rb b/lib/grit1.rb
similarity index 100%
rename from lib/grit.rb
rename to lib/grit1.rb
diff --git a/spec/factories/register_requests.rb b/spec/factories/register_requests.rb
index 7fd9c1446..96cc52d02 100644
--- a/spec/factories/register_requests.rb
+++ b/spec/factories/register_requests.rb
@@ -2,9 +2,12 @@
 
 FactoryGirl.define do
   factory :register_request do
-      name "MyString"
-      email "MyString"
-      token "MyString"
-      approved false
-    end
+    name "MyString"
+    email { Factory.next(:email) }
+    token "MyString"
+    interest "MyString"
+    more "MyText"
+    approved false
+    rejected false
+  end
 end