0
@@ -14,13 +14,13 @@ class Admin::UsersController < Admin::BaseController
0
 
0
   def create
0
     @user = User.new params[:user]
0
-    if @user.save
0
-      flash[:notice] = "User created."
0
-      redirect_to :action => 'index'
0
-    else
0
-      flash[:error] = "Save failed."
0
-      render :action => 'new'
0
-    end
0
+    @user.save!
0
+    @user.sites << site
0
+    flash[:notice] = "User created."
0
+    redirect_to :action => 'index'
0
+  rescue ActiveRecord::RecordInvalid
0
+    flash[:error] = "Save failed."
0
+    render :action => 'new'
0
   end
0
 
0
   def update

0
@@ -44,7 +44,7 @@ class Site < ActiveRecord::Base
0
   has_many  :assets, :as => :attachable, :order => 'created_at desc'
0
   has_many  :assets, :order => 'created_at desc', :conditions => 'parent_id is null'
0
 
0
-  has_many :memberships
0
+  has_many :memberships, :dependent => :destroy
0
   has_many :members, :through => :memberships, :source => :user
0
   has_many :admins,  :through => :memberships, :source => :user, :conditions => ['memberships.admin = ? or users.admin = ?', true, true]
0
 

0
@@ -3,7 +3,7 @@ class User < UserAuth
0
   has_many :articles
0
   acts_as_paranoid
0
 
0
-  has_many :memberships
0
+  has_many :memberships, :dependent => :destroy
0
   has_many :sites, :through => :memberships, :order => 'title, host'
0
 
0
   def self.find_admins(*args)

0
@@ -39,10 +39,13 @@ class Admin::UsersControllerTest < Test::Unit::TestCase
0
   def test_should_create_user
0
     login_as :quentin
0
     assert_difference User, :count do
0
-      post :create, :user => { :login => 'bob', :email => 'foo', :password => 'testy', :password_confirmation => 'testy', :admin => true }
0
-      assert_equal assigns(:user), User.authenticate_for(sites(:first), 'bob', 'testy')
0
-      assert_redirected_to :action => 'index'
0
-      assert flash[:notice]
0
+      assert_difference Membership, :count do
0
+        post :create, :user => { :login => 'bob', :email => 'foo', :password => 'testy', :password_confirmation => 'testy', :admin => true }
0
+        assert_models_equal [sites(:first)], assigns(:user).sites
0
+        assert_equal assigns(:user), User.authenticate_for(sites(:first), 'bob', 'testy')
0
+        assert_redirected_to :action => 'index'
0
+        assert flash[:notice]
0
+      end
0
     end
0
   end
0