From e1a0c2f365deba517057255d25bb48f57c72c1a6 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Sat, 12 Jun 2010 14:44:58 -0700
Subject: [PATCH] got rspec fully working

---
 Gemfile               | 4 ++--
 config/application.rb | 2 +-
 spec/spec_helper.rb   | 3 ++-
 spec/user_spec.rb     | 7 +++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 spec/user_spec.rb

diff --git a/Gemfile b/Gemfile
index 208bdf2dc..e0c464835 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem "bson_ext", "1.0.1"
 
 # Bundle gems for certain environments:
 #
-group :test do
+#group :test do
 	gem 'rspec-rails', ">= 2.0.0.beta.8"
 #   gem 'webrat'
-end
+#end
diff --git a/config/application.rb b/config/application.rb
index 9a128d658..2044abb07 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,7 +35,7 @@ module Diaspora
     # Configure generators values. Many other options are available, be sure to check the documentation.
      config.generators do |g|
        g.orm             :mongoid
-    #   g.template_engine :erb
+       g.template_engine :haml
        g.test_framework  :rspec
      end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a9fd9239a..b652dadd1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -19,7 +19,8 @@ Rspec.configure do |config|
   config.mock_with :rspec
 
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
+  
+  
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, comment the following line or assign false
   # instead of true.
diff --git a/spec/user_spec.rb b/spec/user_spec.rb
new file mode 100644
index 000000000..4521b8107
--- /dev/null
+++ b/spec/user_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'user login' do
+  it 'should be able for a user to create a new user' do
+    puts "foo"
+  end
+end