1 files changed, 27 insertions, 17 deletions
diff --git a/spec/fake_app.rb b/spec/fake_app.rb
index 37df9e2..f7db07f 100644
--- a/spec/fake_app.rb
+++ b/spec/fake_app.rb
@@ -2,6 +2,14 @@ require 'active_record'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 
+require "cancan"
+require "cancan/ability"
+require "cancan/controller_resource"
+require "cancan/controller_additions"
+
+require 'devise'
+require 'devise/orm/active_record'
+
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
 ActiveRecord::Base.establish_connection('test')
@@ -13,10 +21,7 @@ app.config.session_store :cookie_store, :key => "_myapp_session"
 app.config.active_support.deprecation = :log
 app.initialize!
 
-# routes
-app.routes.draw do
-  devise_for :users
-end
+require 'devise_config'
 
 # models
 class User < ActiveRecord::Base
@@ -27,20 +32,11 @@ class User < ActiveRecord::Base
   has_inboxes
 end
 
-# controllers
-class ApplicationController < ActionController::Base
-  before_filter :assign_unread_discussions
-  
-  private
-  
-  def assign_unread_discussions
-    @unread_discussions_count = Discussion.unread_for(current_user).count if user_signed_in?
-  end
+# routes
+app.routes.draw do
+  devise_for :users
 end
 
-# helpers
-Object.const_set(:ApplicationHelper, Module.new)
-
 #migrations
 ActiveRecord::Base.silence do
   ActiveRecord::Migration.verbose = false
@@ -84,4 +80,18 @@ ActiveRecord::Base.silence do
       t.datetime "updated_at"
     end
   end
-end
-\ No newline at end of file
+end
+
+# controllers
+class ApplicationController < ActionController::Base
+  before_filter :assign_unread_discussions
+  
+  private
+  
+  def assign_unread_discussions
+    @unread_discussions_count = Discussion.unread_for(current_user).count if user_signed_in?
+  end
+end
+
+# helpers
+Object.const_set(:ApplicationHelper, Module.new)
+\ No newline at end of file