Merge branch 'feature/users-change-passwords' into develop

9 files changed, 66 insertions, 14 deletions

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 82d2eac..ecab53b 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -15,4 +15,14 @@ class UsersController < ApplicationController
     @user = e.document
     respond_with(@user, :location => new_user_path)
   end
+
+  def edit
+    @user = current_user
+  end
+
+  def update
+    @user = current_user
+    @user.update(params[:user])
+    respond_with(@user, :location => edit_user_path(@user))
+  end
 end
diff --git a/users/app/views/sessions/_nav.html.haml b/users/app/views/sessions/_nav.html.haml
index b738504..dab865e 100644
--- a/users/app/views/sessions/_nav.html.haml
+++ b/users/app/views/sessions/_nav.html.haml
@@ -1,6 +1,6 @@
 - if logged_in?
   %li
-    = 'logged in as ' + current_user.login
+    = link_to current_user.login, edit_user_path(current_user)
   %li
     = link_to t(:logout), logout_path
   - if admin?
diff --git a/users/app/views/users/_form.html.haml b/users/app/views/users/_form.html.haml
new file mode 100644
index 0000000..8914241
--- /dev/null
+++ b/users/app/views/users/_form.html.haml
@@ -0,0 +1,8 @@
+= simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
+  %legend
+    = @user.new_record? ? t(:signup_message) : t(:edit_settings)
+  = f.input :login, :input_html => { :id => :srp_username }
+  = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
+  = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
+  = f.button :submit, :class => 'btn-primary' 
+  = link_to t(:cancel), root_url, :class => :btn
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
new file mode 100644
index 0000000..8298443
--- /dev/null
+++ b/users/app/views/users/edit.html.haml
@@ -0,0 +1,3 @@
+.span8.offset2
+  %h2=t :settings
+  = render 'form'
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index be14c52..c1c4208 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -1,9 +1,3 @@
 .span8.offset2
   %h2=t :signup
-  = simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
-    %legend=t :signup_message
-    = f.input :login, :input_html => { :id => :srp_username }
-    = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
-    = f.button :submit, :value => t(:signup), :class => 'btn-primary' 
-    = link_to t(:cancel), root_url, :class => :btn
+  = render 'form'
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 522c40c..1d144b4 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -5,6 +5,6 @@ Rails.application.routes.draw do
   resources :sessions, :only => [:new, :create, :update, :destroy]
 
   get "signup" => "users#new", :as => "signup"
-  resources :users, :only => [:new, :create]
+  resources :users
 
 end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1cb28a6..4318928 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
+  include StubRecordHelper
+
   test "should get new" do
     get :new
     assert_equal User, assigns(:user).class
@@ -8,11 +10,9 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should create new user" do
-    params = User.valid_attributes_hash
-    user = stub params.merge(:id => 123)
-    params.stringify_keys!
-    User.expects(:create!).with(params).returns(user)
-    post :create, :user => params
+    user = stub_record User
+    User.expects(:create!).with(user.params).returns(user)
+    post :create, :user => user.params
     assert_nil session[:user_id]
     assert_response :redirect
     assert_redirected_to root_url
@@ -30,4 +30,20 @@ class UsersControllerTest < ActionController::TestCase
     assert_redirected_to new_user_path
   end
 
+  test "should get edit view" do
+    user = stub_record User
+    login user
+    get :edit, :id => user.id
+    assert_equal user, assigns[:user]
+  end
+
+  test "should process updated params" do
+    user = stub_record User
+    user.expects(:update).with(user.params).returns(user)
+    login user
+    post :update, :user => user.params, :id => user.id
+    assert_equal user, assigns[:user]
+    assert_response :redirect
+    assert_redirected_to edit_user_path(user)
+  end
 end
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index f211597..0b73f5f 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -11,6 +11,9 @@ module AuthTestHelper
 
   def login(user = nil)
     @current_user = user || stub
+    unless @current_user.respond_to? :is_admin?
+      @current_user.stubs(:is_admin?).returns(false)
+    end
     request.env['warden'] = stub :user => @current_user
     return @current_user
   end
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
new file mode 100644
index 0000000..95b9d63
--- /dev/null
+++ b/users/test/support/stub_record_helper.rb
@@ -0,0 +1,18 @@
+module StubRecordHelper
+
+  # Create a stub that has the usual functions of a database record.
+  # It won't fail on rendering a form for example.
+  def stub_record(klass, params = {}, persisted = true)
+    if klass.respond_to?(:valid_attributes_hash)
+      params.reverse_merge!(klass.valid_attributes_hash)
+    end
+    params[:params] = params.stringify_keys
+    params.reverse_merge! :id => 123,
+      :class => klass,
+      :to_key => ['123'],
+      :new_record? => !persisted,
+      :persisted? => persisted
+    stub params
+  end
+
+end