From 04376c286daee0165f6544ecdafaa645aa7695c0 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 22 Dec 2012 15:51:24 +0100
Subject: moving the js for view definitions into separate files

This way we get syntax highlighting and so on.
---
 users/app/designs/user/by_email_alias.js    |  8 ++++++++
 users/app/designs/user/by_email_or_alias.js | 11 +++++++++++
 users/app/models/user.rb                    | 29 +----------------------------
 3 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100644 users/app/designs/user/by_email_alias.js
 create mode 100644 users/app/designs/user/by_email_or_alias.js

(limited to 'users')

diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js
new file mode 100644
index 0000000..51eb976
--- /dev/null
+++ b/users/app/designs/user/by_email_alias.js
@@ -0,0 +1,8 @@
+function(doc) {
+  if (doc.type != 'User') {
+    return;
+  }
+  doc.email_aliases.forEach(function(alias){
+    emit(alias.email, doc);
+  });
+}
diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js
new file mode 100644
index 0000000..2f1e569
--- /dev/null
+++ b/users/app/designs/user/by_email_or_alias.js
@@ -0,0 +1,11 @@
+function(doc) {
+  if (doc.type != 'User') {
+    return;
+  }
+  if (doc.email) {
+    emit(doc.email, doc);
+  }
+  doc.email_aliases.forEach(function(alias){
+    emit(alias.email, doc);
+  });
+}
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 2a8a57b..1798ea4 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -46,37 +46,10 @@ class User < CouchRest::Model::Base
   timestamps!
 
   design do
+    load_views(Rails.root.join('users', 'app', 'designs', 'user'))
     view :by_login
     view :by_created_at
     view :by_email
-
-    view :by_email_alias,
-      :map => <<-EOJS
-    function(doc) {
-      if (doc.type != 'User') {
-        return;
-      }
-      doc.email_aliases.forEach(function(alias){
-        emit(alias.email, doc);
-      });
-    }
-    EOJS
-
-    view :by_email_or_alias,
-      :map => <<-EOJS
-    function(doc) {
-      if (doc.type != 'User') {
-        return;
-      }
-      if (doc.email) {
-        emit(doc.email, doc);
-      }
-      doc.email_aliases.forEach(function(alias){
-        emit(alias.email, doc);
-      });
-    }
-    EOJS
-
   end
 
   class << self
-- 
cgit v1.2.3


From fbb8c7b654a05bc2983a476df9a5b9c376096f41 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sun, 6 Jan 2013 18:21:38 +0100
Subject: views only emit 1 as value now, doc can be included

---
 users/app/designs/user/by_email_alias.js    | 2 +-
 users/app/designs/user/by_email_or_alias.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'users')

diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js
index 51eb976..508a002 100644
--- a/users/app/designs/user/by_email_alias.js
+++ b/users/app/designs/user/by_email_alias.js
@@ -3,6 +3,6 @@ function(doc) {
     return;
   }
   doc.email_aliases.forEach(function(alias){
-    emit(alias.email, doc);
+    emit(alias.email, 1);
   });
 }
diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js
index 2f1e569..71fd0ea 100644
--- a/users/app/designs/user/by_email_or_alias.js
+++ b/users/app/designs/user/by_email_or_alias.js
@@ -3,9 +3,9 @@ function(doc) {
     return;
   }
   if (doc.email) {
-    emit(doc.email, doc);
+    emit(doc.email, 1);
   }
   doc.email_aliases.forEach(function(alias){
-    emit(alias.email, doc);
+    emit(alias.email, 1);
   });
 }
-- 
cgit v1.2.3


From 2599c7bac06ee55d58e492a47e09ee163e9582ba Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Tue, 8 Jan 2013 13:20:34 -0800
Subject: Adding show view for users.

---
 users/app/controllers/users_controller.rb |  2 +-
 users/app/helpers/users_helper.rb         |  6 ++++++
 users/app/models/user.rb                  |  4 ++++
 users/app/views/users/_user.html.haml     |  2 +-
 users/app/views/users/show.html.haml      | 32 +++++++++++++++++++++++++++++++
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 users/app/views/users/show.html.haml

(limited to 'users')

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 79de630..eb93fcb 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@ class UsersController < ApplicationController
 
   skip_before_filter :verify_authenticity_token, :only => [:create]
 
-  before_filter :fetch_user, :only => [:edit, :update, :destroy]
+  before_filter :fetch_user, :only => [:show, :edit, :update, :destroy]
   before_filter :set_anchor, :only => [:edit, :update]
   before_filter :authorize_admin, :only => [:index]
 
diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb
index 45ca0e9..5f68085 100644
--- a/users/app/helpers/users_helper.rb
+++ b/users/app/helpers/users_helper.rb
@@ -30,4 +30,10 @@ module UsersHelper
     classes.compact
   end
 
+  def user_field(field)
+    value = @user.send(field)
+    value = value.to_s(:long) if field.end_with? '_at'
+    value || 'not set'
+  end
+
 end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 1798ea4..4b6b06c 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -100,6 +100,10 @@ class User < CouchRest::Model::Base
     email_aliases.build(attrs.values.first) if attrs
   end
 
+  def most_recent_tickets(count=3)
+    Ticket.for_user(self).limit(count) #defaults to having most recent updated first
+  end
+
   protected
 
   ##
diff --git a/users/app/views/users/_user.html.haml b/users/app/views/users/_user.html.haml
index 7db0041..ca03d34 100644
--- a/users/app/views/users/_user.html.haml
+++ b/users/app/views/users/_user.html.haml
@@ -1,5 +1,5 @@
 %tr
-  %td= user.login
+  %td= link_to user.login, user
   %td= time_ago_in_words(user.created_at) + " ago"
   %td
     = link_to edit_user_path(user), :class => "btn btn-mini btn-primary" do
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
new file mode 100644
index 0000000..9df029e
--- /dev/null
+++ b/users/app/views/users/show.html.haml
@@ -0,0 +1,32 @@
+.span8.offset1
+  %h2= @user.login
+  %dl.offset1
+    - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
+    - fields.each do |field|
+      %dt
+        = field.titleize
+      %dd
+        = user_field(field)
+    %dt
+      =t :email_aliases
+    %dd
+      - aliases = @user.email_aliases
+      - if aliases.empty?
+        none set
+      - else
+        %ul.unstyled
+          - aliases.each do |al|
+            %li
+              = al.email
+    %dt
+      =t :most_recently_updated_tickets
+    %dd
+      %ul
+        - @user.most_recent_tickets.each do |ticket|
+          %li
+            = link_to ticket.title, ticket
+            %small
+              updated:
+              = ticket.updated_at.to_s(:long)
+
+
-- 
cgit v1.2.3


From d81bf00ecd8bdfcddf50e4881428c917253326fe Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Thu, 10 Jan 2013 11:06:09 -0800
Subject: Add test for showing user.

---
 users/test/functional/users_controller_test.rb | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1fa1462..1f6c868 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -9,12 +9,31 @@ class UsersControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "failed show without login" do
+    user = find_record User
+    get :show, :id => user.id
+    assert_response :redirect
+    assert_redirected_to login_path
+  end
+
+  test "user can see user" do
+    user = find_record User,
+      :email => nil,
+      :email_forward => nil,
+      :email_aliases => [],
+      :created_at => Time.now,
+      :updated_at => Time.now,
+      :most_recent_tickets => []
+    login user
+    get :show, :id => user.id
+    assert_response :success
+  end
+
   test "should create new user" do
     user = stub_record User
     User.expects(:create).with(user.params).returns(user)
 
     post :create, :user => user.params, :format => :json
-
     assert_nil session[:user_id]
     assert_json_response user
     assert_response :success
-- 
cgit v1.2.3


From 1623f51cc003f7de92f7192bba5ca88dfb2a92f6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 11 Jan 2013 10:23:51 +0100
Subject: basic dummy data for users

---
 users/app/models/user.rb |  6 +++---
 users/test/factories.rb  | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 users/test/factories.rb

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 1798ea4..8474d16 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -18,8 +18,8 @@ class User < CouchRest::Model::Base
     :if => :serverside?
 
   validates :login,
-    :format => { :with => /\A[A-Za-z\d_]+\z/,
-      :message => "Only letters, digits and _ allowed" }
+    :format => { :with => /\A[A-Za-z\d_\.]+\z/,
+      :message => "Only letters, digits, . and _ allowed" }
 
   validates :password_salt, :password_verifier,
     :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
@@ -57,7 +57,7 @@ class User < CouchRest::Model::Base
 
     # valid set of attributes for testing
     def valid_attributes_hash
-      { :login => "me",
+      { :login => Faker::Name.first_name.downcase,
         :password_verifier => "1234ABCD",
         :password_salt => "4321AB" }
     end
diff --git a/users/test/factories.rb b/users/test/factories.rb
new file mode 100644
index 0000000..2802c7e
--- /dev/null
+++ b/users/test/factories.rb
@@ -0,0 +1,18 @@
+FactoryGirl.define do
+
+  factory :user do
+    login { Faker::Internet.user_name }
+    password_verifier "1234ABCD"
+    password_salt "4321AB"
+  end
+
+  factory :user_with_settings, :class => User do
+    login { Faker::Internet.user_name }
+    password_verifier "1234ABCD"
+    password_salt "4321AB"
+    email_forward { Faker::Internet.email }
+    email_aliases_attributes do
+      {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
+    end
+  end
+end
-- 
cgit v1.2.3


From 3cd3c261bdf02b2da5217fa1c469d30f9d92c9a3 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 14 Jan 2013 12:04:12 +0100
Subject: got users controller test to pass - tickets controller test next.

---
 users/app/models/user.rb                       | 12 ++-----
 users/test/factories.rb                        | 17 +++++-----
 users/test/functional/users_controller_test.rb | 43 +++++++++++++-------------
 users/test/support/stub_record_helper.rb       | 32 +++++++++----------
 users/test/unit/email_aliases_test.rb          |  8 ++---
 users/test/unit/email_test.rb                  |  9 ++----
 users/test/unit/user_test.rb                   | 17 +++++-----
 7 files changed, 61 insertions(+), 77 deletions(-)

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 8474d16..f20c6ac 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -54,17 +54,11 @@ class User < CouchRest::Model::Base
 
   class << self
     alias_method :find_by_param, :find
-
-    # valid set of attributes for testing
-    def valid_attributes_hash
-      { :login => Faker::Name.first_name.downcase,
-        :password_verifier => "1234ABCD",
-        :password_salt => "4321AB" }
-    end
-
   end
 
-  alias_method :to_param, :id
+  def to_param
+    self.id
+  end
 
   def to_json(options={})
     {
diff --git a/users/test/factories.rb b/users/test/factories.rb
index 2802c7e..6b094bd 100644
--- a/users/test/factories.rb
+++ b/users/test/factories.rb
@@ -4,15 +4,16 @@ FactoryGirl.define do
     login { Faker::Internet.user_name }
     password_verifier "1234ABCD"
     password_salt "4321AB"
-  end
 
-  factory :user_with_settings, :class => User do
-    login { Faker::Internet.user_name }
-    password_verifier "1234ABCD"
-    password_salt "4321AB"
-    email_forward { Faker::Internet.email }
-    email_aliases_attributes do
-      {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
+    factory :user_with_settings do
+      email_forward { Faker::Internet.email }
+      email_aliases_attributes do
+        {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
+      end
+    end
+
+    factory :admin_user do
+      is_admin? true
     end
   end
 end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1fa1462..8f1ee15 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -10,10 +10,11 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should create new user" do
-    user = stub_record User
-    User.expects(:create).with(user.params).returns(user)
+    user_attribs = record_attributes_for :user
+    user = User.new(user_attribs)
+    User.expects(:create).with(user_attribs).returns(user)
 
-    post :create, :user => user.params, :format => :json
+    post :create, :user => user_attribs, :format => :json
 
     assert_nil session[:user_id]
     assert_json_response user
@@ -21,23 +22,20 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "should redirect to signup form on failed attempt" do
-    params = User.valid_attributes_hash.slice(:login)
-    user = User.new(params)
-    params.stringify_keys!
+    user_attribs = record_attributes_for :user
+    user_attribs.slice!('login')
+    user = User.new(user_attribs)
     assert !user.valid?
-    User.expects(:create).with(params).returns(user)
+    User.expects(:create).with(user_attribs).returns(user)
 
-    post :create, :user => params, :format => :json
+    post :create, :user => user_attribs, :format => :json
 
     assert_json_error user.errors.messages
     assert_response 422
   end
 
   test "should get edit view" do
-    user = find_record User,
-      :email => nil,
-      :email_forward => nil,
-      :email_aliases => []
+    user = find_record :user
 
     login user
     get :edit, :id => user.id
@@ -46,14 +44,14 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "user can change settings" do
-    user = find_record User
-    user.expects(:attributes=).with(user.params)
+    user = find_record :user
+    changed_attribs = record_attributes_for :user_with_settings
+    user.expects(:attributes=).with(changed_attribs)
     user.expects(:changed?).returns(true)
     user.expects(:save).returns(true)
-    user.stubs(:email_aliases).returns([])
 
     login user
-    put :update, :user => user.params, :id => user.id, :format => :json
+    put :update, :user => changed_attribs, :id => user.id, :format => :json
 
     assert_equal user, assigns[:user]
     assert_response 204
@@ -61,14 +59,15 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "admin can update user" do
-    user = find_record User
-    user.expects(:attributes=).with(user.params)
+    user = find_record :user
+    changed_attribs = record_attributes_for :user_with_settings
+    user.expects(:attributes=).with(changed_attribs.stringify_keys)
     user.expects(:changed?).returns(true)
     user.expects(:save).returns(true)
     user.stubs(:email_aliases).returns([])
 
     login :is_admin? => true
-    put :update, :user => user.params, :id => user.id, :format => :json
+    put :update, :user => changed_attribs, :id => user.id, :format => :json
 
     assert_equal user, assigns[:user]
     assert_response 204
@@ -76,7 +75,7 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "admin can destroy user" do
-    user = find_record User
+    user = find_record :user
     user.expects(:destroy)
 
     login :is_admin? => true
@@ -87,7 +86,7 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "user can cancel account" do
-    user = find_record User
+    user = find_record :user
     user.expects(:destroy)
 
     login user
@@ -98,7 +97,7 @@ class UsersControllerTest < ActionController::TestCase
   end
 
   test "non-admin can't destroy user" do
-    user = stub_record User
+    user = find_record :user
 
     login
     delete :destroy, :id => user.id
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
index 1be419a..18db5ae 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/users/test/support/stub_record_helper.rb
@@ -4,10 +4,11 @@ module StubRecordHelper
   # return the record given.
   # If no record is given but a hash or nil will create a stub based on
   # that instead and returns the stub.
-  def find_record(klass, record_or_method_hash = {})
-    record = stub_record(klass, record_or_method_hash)
+  def find_record(factory)
+    record = stub_record factory
+    klass = record.class
     finder = klass.respond_to?(:find_by_param) ? :find_by_param : :find_by_id
-    klass.expects(finder).with(record.to_param).returns(record)
+    klass.expects(finder).with(record.to_param.to_s).returns(record)
     return record
   end
 
@@ -17,25 +18,24 @@ module StubRecordHelper
   # If the second parameter is a record we return the record itself.
   # This way you can build functions that either take a record or a
   # method hash to stub from. See find_record for an example.
-  def stub_record(klass, record_or_method_hash = {}, persisted = true)
+  def stub_record(factory, record_or_method_hash = {})
     if record_or_method_hash && !record_or_method_hash.is_a?(Hash)
       return record_or_method_hash
     end
-    stub record_params_for(klass, record_or_method_hash, persisted)
+    FactoryGirl.build_stubbed(factory).tap do |record|
+      record.stubs(record_or_method_hash) if record_or_method_hash.present?
+    end
   end
 
-  def record_params_for(klass, params = {}, persisted = true)
-    if klass.respond_to?(:valid_attributes_hash)
-      params.reverse_merge!(klass.valid_attributes_hash)
+  # returns deep stringified attributes so they can be compared to
+  # what the controller receives as params
+  def record_attributes_for(factory, attribs_hash = nil)
+    FactoryGirl.attributes_for(factory, attribs_hash).tap do |attribs|
+      attribs.keys.each do |key|
+        val = attribs.delete(key)
+        attribs[key.to_s] = val.is_a?(Hash) ? val.stringify_keys! : val
+      end
     end
-    params[:params] = params.stringify_keys
-    params.reverse_merge! :id => "A123",
-      :to_param => "A123",
-      :class => klass,
-      :to_key => ['123'],
-      :to_json => %Q({"stub":"#{klass.name}"}),
-      :new_record? => !persisted,
-      :persisted? => persisted
   end
 
 end
diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index 88f97f4..e3f060d 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -3,12 +3,8 @@ require 'test_helper'
 class EmailAliasTest < ActiveSupport::TestCase
 
   setup do
-    @attribs = User.valid_attributes_hash
-    User.find_by_login(@attribs[:login]).try(:destroy)
-    @user = User.new(@attribs)
-    @attribs.merge!(:login => "other_user")
-    User.find_by_login(@attribs[:login]).try(:destroy)
-    @other_user = User.create(@attribs)
+    @user = FactoryGirl.build :user
+    @other_user = FactoryGirl.build :user
     @alias = "valid_alias@#{APP_CONFIG[:domain]}"
     User.find_by_email_or_alias(@alias).try(:destroy)
   end
diff --git a/users/test/unit/email_test.rb b/users/test/unit/email_test.rb
index 060ced5..d7ef1f8 100644
--- a/users/test/unit/email_test.rb
+++ b/users/test/unit/email_test.rb
@@ -3,13 +3,8 @@ require 'test_helper'
 class EmailTest < ActiveSupport::TestCase
 
   setup do
-    # TODO build helper for this ... make_record(User)
-    @attribs = User.valid_attributes_hash
-    User.find_by_login(@attribs[:login]).try(:destroy)
-    @user = User.new(@attribs)
-    @attribs.merge!(:login => "other_user")
-    User.find_by_login(@attribs[:login]).try(:destroy)
-    @other_user = User.create(@attribs)
+    @user = FactoryGirl.build :user
+    @other_user = FactoryGirl.build :user
     @email_string = "valid_alias@#{APP_CONFIG[:domain]}"
     User.find_by_email_or_alias(@email_string).try(:destroy)
   end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 0c79f1f..917728b 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -4,9 +4,7 @@ class UserTest < ActiveSupport::TestCase
 
   include SRP::Util
   setup do
-    @attribs = User.valid_attributes_hash
-    User.find_by_login(@attribs[:login]).try(:destroy)
-    @user = User.new(@attribs)
+    @user = FactoryGirl.build(:user)
   end
 
   test "test set of attributes should be valid" do
@@ -49,13 +47,14 @@ class UserTest < ActiveSupport::TestCase
     assert_equal client_rnd, srp_session.aa
   end
 
-  test 'is user an admin' do
-    admin_login = APP_CONFIG['admins'].first
-    attribs = User.valid_attributes_hash
-    attribs[:login] = admin_login
-    admin_user = User.new(attribs)
-    assert admin_user.is_admin?
+  test 'normal user is no admin' do
     assert !@user.is_admin?
   end
 
+  test 'user with login in APP_CONFIG is an admin' do
+    admin_login = APP_CONFIG['admins'].first
+    @user.login = admin_login
+    assert @user.is_admin?
+  end
+
 end
-- 
cgit v1.2.3


From a9ef046a596b5876792b1cc4ab0d26b9b255c342 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 14 Jan 2013 16:24:25 +0100
Subject: tickets controller tests passing

---
 users/test/factories.rb                  |  1 +
 users/test/support/auth_test_helper.rb   |  6 +++---
 users/test/support/stub_record_helper.rb | 13 +++++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'users')

diff --git a/users/test/factories.rb b/users/test/factories.rb
index 6b094bd..4bf7e62 100644
--- a/users/test/factories.rb
+++ b/users/test/factories.rb
@@ -7,6 +7,7 @@ FactoryGirl.define do
 
     factory :user_with_settings do
       email_forward { Faker::Internet.email }
+      email { Faker::Internet.user_name + '@' + APP_CONFIG[:domain] }
       email_aliases_attributes do
         {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
       end
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index c9f5612..c0fcf3a 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -10,10 +10,10 @@ module AuthTestHelper
   end
 
   def login(user_or_method_hash = {})
-    @current_user = stub_record(User, user_or_method_hash)
-    unless @current_user.respond_to? :is_admin?
-      @current_user.stubs(:is_admin?).returns(false)
+    if user_or_method_hash.respond_to?(:reverse_merge)
+      user_or_method_hash.reverse_merge! :is_admin? => false
     end
+    @current_user = stub_record(:user, user_or_method_hash, true)
     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
index 18db5ae..168a827 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/users/test/support/stub_record_helper.rb
@@ -4,10 +4,11 @@ module StubRecordHelper
   # return the record given.
   # If no record is given but a hash or nil will create a stub based on
   # that instead and returns the stub.
-  def find_record(factory)
-    record = stub_record factory
+  def find_record(factory, attribs_hash = {})
+    attribs_hash.reverse_merge!(:id => Random.rand(10000).to_s)
+    record = stub_record factory, attribs_hash
     klass = record.class
-    finder = klass.respond_to?(:find_by_param) ? :find_by_param : :find_by_id
+    finder = klass.respond_to?(:find_by_param) ? :find_by_param : :find
     klass.expects(finder).with(record.to_param.to_s).returns(record)
     return record
   end
@@ -18,11 +19,15 @@ module StubRecordHelper
   # If the second parameter is a record we return the record itself.
   # This way you can build functions that either take a record or a
   # method hash to stub from. See find_record for an example.
-  def stub_record(factory, record_or_method_hash = {})
+  def stub_record(factory, record_or_method_hash = {}, persisted=false)
     if record_or_method_hash && !record_or_method_hash.is_a?(Hash)
       return record_or_method_hash
     end
     FactoryGirl.build_stubbed(factory).tap do |record|
+      if persisted or record.persisted?
+        record_or_method_hash.reverse_merge! :created_at => Time.now,
+          :updated_at => Time.now, :id => Random.rand(100000).to_s
+      end
       record.stubs(record_or_method_hash) if record_or_method_hash.present?
     end
   end
-- 
cgit v1.2.3


From 7b323c5dbd7171cf98f69ca159b5aa2174a5d069 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 14 Jan 2013 20:02:17 +0100
Subject: minor: further cleanup - try to leave no record behind

---
 users/test/integration/api/account_flow_test.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index 7636f2b..b9e2a4e 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -12,10 +12,6 @@ class AccountFlowTest < ActiveSupport::TestCase
     OUTER_APP
   end
 
-  def teardown
-    Warden.test_reset!
-  end
-
   def setup
     @login = "integration_test_user"
     User.find_by_login(@login).tap{|u| u.destroy if u}
@@ -31,7 +27,8 @@ class AccountFlowTest < ActiveSupport::TestCase
   end
 
   def teardown
-    @user.destroy if @user # make sure we can run this test again
+    @user.destroy if @user
+    Warden.test_reset!
   end
 
   # this test wraps the api and implements the interface the ruby-srp client.
-- 
cgit v1.2.3


From 8141876126aa25d713cf4b2c76c3ecff837c4ba7 Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Mon, 14 Jan 2013 12:39:59 -0800
Subject: Use partials for displaying details shown when viewing a user. Some
 of these partials have specific CSS for another use, so we will likely want
 to tweak this.

---
 users/app/models/user.rb                |  2 +-
 users/app/views/emails/_email.html.haml |  5 +++--
 users/app/views/users/show.html.haml    | 21 ++++++++-------------
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 42900ea..1e8ee0e 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -95,7 +95,7 @@ class User < CouchRest::Model::Base
   end
 
   def most_recent_tickets(count=3)
-    Ticket.for_user(self).limit(count) #defaults to having most recent updated first
+    Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
   end
 
   protected
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
index 3feb6f0..948d847 100644
--- a/users/app/views/emails/_email.html.haml
+++ b/users/app/views/emails/_email.html.haml
@@ -1,6 +1,7 @@
 - if email.valid?
   %li.pull-right
     %code= email
-    = link_to(user_email_alias_path(@user, email), :method => :delete) do
-      %i.icon-remove
+    - if params[:action] == 'edit'
+      = link_to(user_email_alias_path(@user, email), :method => :delete) do
+        %i.icon-remove
   .clearfix
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index 9df029e..2b59c66 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -1,5 +1,7 @@
 .span8.offset1
   %h2= @user.login
+  .small
+    = link_to 'edit', edit_user_path(@user)
   %dl.offset1
     - fields = ['login', 'email', 'created_at', 'updated_at', 'email_forward']
     - fields.each do |field|
@@ -14,19 +16,12 @@
       - if aliases.empty?
         none set
       - else
-        %ul.unstyled
-          - aliases.each do |al|
-            %li
-              = al.email
+        .pull-left
+          = render aliases
+    .clearfix
     %dt
       =t :most_recently_updated_tickets
     %dd
-      %ul
-        - @user.most_recent_tickets.each do |ticket|
-          %li
-            = link_to ticket.title, ticket
-            %small
-              updated:
-              = ticket.updated_at.to_s(:long)
-
-
+      %table
+        %tbody
+          = render @user.most_recent_tickets
\ No newline at end of file
-- 
cgit v1.2.3


From e7d36df945792b292732e25e879a90577050a6c1 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 15 Jan 2013 11:06:46 +0100
Subject: minor: put emails in unstyled ul and simplify

Just found out that render(@collection) returns nil for emtpy collections. So that is usefull for putting messages about the emtpy collection in an or clause.
---
 users/app/views/users/show.html.haml | 10 +++-------
 users/config/locales/en.yml          |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'users')

diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index 2b59c66..d8b51e9 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -12,16 +12,12 @@
     %dt
       =t :email_aliases
     %dd
-      - aliases = @user.email_aliases
-      - if aliases.empty?
-        none set
-      - else
-        .pull-left
-          = render aliases
+      %ul.pull-left.unstyled
+        = render(@user.email_aliases) || t(:none_set)
     .clearfix
     %dt
       =t :most_recently_updated_tickets
     %dd
       %table
         %tbody
-          = render @user.most_recent_tickets
\ No newline at end of file
+          = render @user.most_recent_tickets
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 3c71e7e..7aa23f1 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -1,4 +1,5 @@
 en:
+  none_set: "None set."
   signup: "Sign up"
   signup_message: "Please create an account."
   cancel: "Cancel"
-- 
cgit v1.2.3


From be8ee9fa669bc5554796be1fc99867fc99ba21bc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 15 Jan 2013 11:28:37 +0100
Subject: reverted simplification - not good to have 'none set' in a %ul

---
 users/app/views/users/show.html.haml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index d8b51e9..ec5cea6 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -12,8 +12,12 @@
     %dt
       =t :email_aliases
     %dd
-      %ul.pull-left.unstyled
-        = render(@user.email_aliases) || t(:none_set)
+      - aliases = @user.email_aliases
+      - if aliases.present?
+        %ul.pull-left.unstyled
+          = render aliases
+      - else
+        =t :none_set
     .clearfix
     %dt
       =t :most_recently_updated_tickets
-- 
cgit v1.2.3


From 9d53f7b2d1b34da6b6103e97bd6c931cedb23e9b Mon Sep 17 00:00:00 2001
From: jessib <jessib@leap.se>
Date: Tue, 15 Jan 2013 11:03:02 -0800
Subject: Show different ticket characteristics when viewing the users versus
 when listing the tickets. Give a message if a user has no tickets.

---
 users/app/views/users/show.html.haml | 12 ++++++++----
 users/config/locales/en.yml          |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'users')

diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index ec5cea6..a1eeccb 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -17,11 +17,15 @@
         %ul.pull-left.unstyled
           = render aliases
       - else
-        =t :none_set
+        =t :none
     .clearfix
     %dt
       =t :most_recently_updated_tickets
     %dd
-      %table
-        %tbody
-          = render @user.most_recent_tickets
+      - tix = @user.most_recent_tickets
+      - if tix.present?
+        %table
+          %tbody
+            = render @user.most_recent_tickets
+      - else
+        =t :none
\ No newline at end of file
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 7aa23f1..7a6ab90 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -1,5 +1,5 @@
 en:
-  none_set: "None set."
+  none: "None."
   signup: "Sign up"
   signup_message: "Please create an account."
   cancel: "Cancel"
-- 
cgit v1.2.3