Merge branch 'master' of github.com:diaspora/diaspora_rails

spec/controllers/users_controller_spec.rb

@@ -1,4 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
  
 describe UsersController do
+  before do
+  render_views
+  end
 end  

spec/models/user_spec.rb

@@ -7,5 +7,14 @@ describe User do
     u.real_name = "John Smith"
     u.valid?.should be true
   end
+  it "should create a valid user with the factory" do
+    u = Factory.build(:user)
+    u.valid?.should be true
+  end
+  it "should be a person" do
+    n = Person.count
+    Factory.create(:user)
+    Person.count.should == n+1
+  end
 
 end

spec/spec_helper.rb

@@ -38,5 +38,5 @@ Rspec.configure do |config|
   # 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.
-  config.use_transactional_fixtures = true
+#  config.use_transactional_fixtures = true
 end