app/views/email_addresses/_email_address.html.erb app/views/email_addresses/_form.html.erb app/views/email_addresses/_standard.html.erb app/views/email_addresses/edit.html.erb app/views/email_addresses/index.html.erb app/views/email_addresses/new.html.erb app/views/email_addresses/show.html.erb app/views/users/_footer.html.erb app/views/users/_header.html.erb app/views/users/_standard.html.erb @@ -1,2 +1,91 @@ class EmailAddressesController < ApplicationController + before_filter :staff_or_admin_required + before_filter :setup + + def index + @key = params[:key] + @max = params[:max].to_i + @max = 10 if @max < 1 + @page = params[:page].blank? ? nil : params[:page].to_i + @email_addresses = EmailAddress.paginate( + :per_page=>@max, :page=>@page, :order=>EmailAddress.default_order, + :include=>EmailAddress.default_include, + :conditions=>EmailAddress.search_conditions( + {:item=>@user, :u=>current_user, :key=>@key}) + ) + @page_title += 'Email Addresses' + @page_title += ": ‘#{@key}’" unless @key.blank? + @page_title += " (#{@page})" if @page and @page > 1 + end + + def show + @email_address = EmailAddress.find(params[:id]) + @page_title += "Email Address #{@email_address.id}" + rescue ActiveRecord::RecordNotFound + missing + end + + def new + pre_new + end + + def create + pre_new + @email_address.save! + flash[:notice] = 'Email Address saved.' + redirect_to :action=>'show', :id=>@email_address + rescue ActiveRecord::RecordInvalid + render :action=>:new + end + + def edit + @email_address = EmailAddress.find(params[:id]) + @page_title += "Edit Email Address #{@email_address.id}" + rescue ActiveRecord::RecordNotFound + missing + end + + def update + @email_address = EmailAddress.find(params[:id]) + if params[:email_address] && params[:email_address].size > 0 + @email_address.update_attributes!(params[:email_address]) + flash[:notice] = 'Email Address updated.' + redirect_to :action=>'show', :id=>@email_address + else + # no changes to save, back to edit form + render :action=>:edit + end + rescue ActiveRecord::RecordInvalid + render :action=>:edit + rescue ActiveRecord::RecordNotFound + missing + end + + def destroy + @email_address = EmailAddress.find(params[:id]) + @email_address.destroy + flash[:notice] = "The email address ‘#{@email_address.email}’ has been permanently removed." + redirect_to :action=>:index + rescue ActiveRecord::RecordNotFound + missing + end + + protected + + def setup + if params[:user_id].blank? + @user = nil + else + @user = User.find(params[:user_id]) # rescue ActiveRecord::RecordNotFound + end + @section = 'contacts' + @page_title = @user.nil? ? '' : "#{@user.title}: " + end + + def pre_new + @email_address = EmailAddress.new(params[:email_address]) + @email_address.user = @user + @page_title += "New Email Address" + end + end app/controllers/email_addresses_controller.rb @@ -18,7 +18,7 @@ class MembershipsController < ApplicationController def show @membership = @group.memberships.find(params[:id]) - @page_title = "#{@group.name} Membership for #{member_name(@membership)}" + @page_title = "#{@group.name} Membership for #{h(@membership.member_name(current_user))}" rescue ActiveRecord::RecordNotFound missing end @@ -51,7 +51,7 @@ class MembershipsController < ApplicationController def edit @membership = Membership.find(params[:id]) - @page_title = "Edit Membership for #{member_name(@membership)}" + @page_title = "Edit Membership for #{h(@membership.member_name(current_user))}" rescue ActiveRecord::RecordNotFound missing end @@ -62,7 +62,7 @@ class MembershipsController < ApplicationController # can’t update - was caught in edit else if params[:membership] && params[:membership].size > 0 && @membership.update_attributes(params[:membership]) - flash[:notice] = "Updated membership information for #{member_name(@membership)}." + flash[:notice] = "Updated membership information for #{h(@membership.member_name(current_user))}." redirect_to group_membership_path(@group, @membership) else # failed to save, back to edit form @@ -74,7 +74,7 @@ class MembershipsController < ApplicationController def destroy @membership = Membership.find(params[:id], :include=>:user) @membership.destroy - flash[:notice] = "The membership for ‘#{member_name(@membership)}’ has been permanently removed." + flash[:notice] = "The membership for ‘#{h(@membership.member_name(current_user))}’ has been permanently removed." redirect_to group_memberships_path(@group) rescue ActiveRecord::RecordNotFound missing @@ -140,20 +140,7 @@ class MembershipsController < ApplicationController render :action=>:bulk end end - - - def member_name(membership) - name = "member #{membership.id}" - if membership.user - name = h(membership.user.display_name_for_admin( - membership.group.has_access_to?(:admin, current_user) - )) - elsif membership.group.has_access_to?(:admin, current_user) and !(membership.email_address.name.blank?) - name = h(membership.email_address.name) - end - name - end - + protected app/controllers/memberships_controller.rb @@ -86,6 +86,33 @@ class EmailAddress < ActiveRecord::Base end end + # standard Wayground class methods for displayable items + def self.default_include + [:user] + end + def self.default_order(p={}) + (p[:recent].blank? ? '' : 'email_addresses.updated_at DESC, ') + + 'email_addresses.email' + end + # Returns a conditions array for find. + # p is a hash of parameters: + # - :key is a search restriction key + # - :u is the current_user to use to determine access to private items. + # - :item is the Item the message is attached to + # strs is a list of condition strings (with ‘?’ for params) to be joined by “AND” + # vals is a list of condition values to be appended to the result array (matching ‘?’ in the strs) + def self.search_conditions(p={}, strs=[], vals=[]) + unless p[:item].nil? + strs << 'email_addresses.user_id = ?' + vals << p[:item].id + end + unless p[:key].blank? + strs << '(email_addresses.email like ? OR email_addresses.name like ?)' + vals += ["%#{p[:key]}%"] * 2 + end + strs.size > 0 ? [strs.join(' AND ')] + vals : nil + end + # INSTANCE METHODS @@ -188,4 +215,25 @@ class EmailAddress < ActiveRecord::Base "#{self.name} <#{self.email}>" end end + + # standard Wayground instance methods for displayable items + def css_class(prefix='') + "#{prefix}contact" + end + def description + nil + end + def link + "/email_addresses/#{self.id}" + end + def title + if self.name.blank? + "Contact #{self.id}" + else + self.name + end + end + def title_prefix + nil + end end app/models/email_address.rb @@ -124,8 +124,8 @@ class Membership < ActiveRecord::Base end def make_active! - invited_at = nil - expires_at = nil if expired? + self.invited_at = nil + self.expires_at = nil if expired? clear_block! # saves end @@ -168,11 +168,11 @@ class Membership < ActiveRecord::Base end def expired? - !(expires_at.nil?) && (expires_at <= Time.current) + !(self.expires_at.nil?) && (self.expires_at <= Time.current) end def invited? - !(invited_at.nil?) + !(self.invited_at.nil?) end # s - a symbol or an array of symbols (which any of which matching will return true) @@ -180,18 +180,18 @@ class Membership < ActiveRecord::Base if s.is_a? Symbol s = [s] end - has_access = (is_admin or user == group.owner) + has_access = (self.is_admin or self.user == self.group.owner) unless has_access s.each do |sym| case sym when :self_join has_access ||= (!(active?) and (invited? or !(group.is_invite_only))) when :member_list - has_access ||= (active? and (can_manage_members or group.is_members_visible)) + has_access ||= (active? and (self.can_manage_members or self.group.is_members_visible)) when :manage_members - has_access ||= (active? and can_manage_members) + has_access ||= (active? and self.can_manage_members) when :inviting - has_access ||= (active? and can_invite) + has_access ||= (active? and self.can_invite) when :admin # covered by default has_access set when user is_admin or group.owner else @@ -203,10 +203,40 @@ class Membership < ActiveRecord::Base end def email - if email_address - email_address.email + if self.email_address + self.email_address.email else - user.email + self.user.email + end + end + + def name + if self.user + self.user.nickname + else + self.email_address.name + end + end + + def member_name(user=nil) + name = "member #{self.id}" + unless user.nil? + if self.user + name = self.user.display_name_for_admin( + self.group.has_access_to?(:admin, user) + ) + elsif self.group.has_access_to?(:admin, user) and !(self.email_address.name.blank?) + name = self.email_address.name + end + end + name + end + + def link + if self.user + self.user.link + else + self.email_address.link end end end app/models/membership.rb @@ -10,7 +10,7 @@ unless @group.nil? <%= render :partial=>'email_message', :collection=>@email_messages %> </tbody></table> -<%= will_paginate @events, :params=>params %> +<%= will_paginate @email_messages, :params=>params %> <% if @group.nil? app/views/email_messages/index.html.erb @@ -1,7 +1,7 @@ <% membership ||= @membership row_id ||= "membership_#{membership.id}" -member_name = controller.member_name(membership) +member_name = h membership.member_name(current_user) -%> <tr id="<%= row_id%>"<%= cycle '', ' class="alternate"' %>><td><% @@ -11,7 +11,11 @@ else %><img src="/icon/contact.png" alt="Member:" width="16" height="16" class="icon" title="Group Member" /><% end %></td> -<td><%= link_to member_name, group_membership_path(membership.group, membership) %></td> +<td><%= link_to member_name, group_membership_path(membership.group, membership) %><% +unless membership.title.blank? %> +(<%= h membership.title %>)<% +end +%></td> <td><%= link_to('<img src="/icon/edit.png" width="16" height="16" alt="Edit" class="diricon" />', edit_group_membership_path(membership.group, membership), app/views/memberships/_membership.html.erb @@ -5,7 +5,7 @@ subsection ||= @subsection || 'member' <div class="steps"> <h2><img src="/icon/edit_24.png" width="24" height="24" alt=" " class="icon" /> -Edit Membership for <%= controller.member_name(@membership) %></h2> +Edit Membership for <%= h @membership.member_name %></h2> <% #= error_messages_for :membership %> <div class="step_form"> app/views/memberships/edit.html.erb @@ -4,7 +4,7 @@ subsection ||= @subsection || 'member' %><%= render :partial=>'groups/header', :locals=>{:subsection=>subsection} %> <div><img src="/icon/contact.png" alt=" " width="16" height="16" class="icon" align="left" /> -<div style="float:left"><h2><%= link_to @membership.user.nickname, @membership.user.link %></h2> +<div style="float:left"><h2><%= link_to @membership.name, @membership.link %></h2> <% titles = [] titles << 'Group Owner' if @membership.user == @group.owner @@ -23,7 +23,7 @@ link_to('<img src="/icon/edit.png" width="16" height="16" alt=" " class="diricon ' alt=" " class="diricon" /> Remove Member', group_membership_path(@membership.group, @membership), {:method=>'delete', - :confirm=>"Are you sure you want to remove this member, #{@membership.user.nickname}, from the group “#{@membership.group.name}”?", + :confirm=>"Are you sure you want to remove this member, #{@membership.name}, from the group “#{@membership.group.name}”?", :href=>group_membership_path(@membership.group, @membership), :class=>'button', :title=>"remove this member from the group" } %><span class="separator">.</span><% @@ -34,6 +34,8 @@ User is blocked from accessing the group.</p> <% elsif @membership.invited? %><p style="clear:left"><img src="/icon/warning.png" alt=" " width="16" height="16" class="icon" /> User has been invited to, but has not yet joined, the group.</p> +<% else + %><p><br /></p> <% end %></div> app/views/memberships/show.html.erb @@ -47,6 +47,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :users, :collection=>{:activate=>:get, :account=>:get} do |users| users.resources :email_addresses end + map.resources :email_addresses # PAGES # special path: the home page config/routes.rb @@ -8,14 +8,31 @@ one: name: Extra Address For Login two: - user: admin + user: position: 2 email: extra-regular+test@wayground.ca activation_code: activated_at: 2009-02-04 14:59:26 is_blocked: false - name: Extra Address For Regular + name: + +searchable_email: + user: + position: 0 + email: keyword+test@wayground.ca + activation_code: + activated_at: 2009-02-04 14:59:26 + is_blocked: false + name: +searchable_name: + user: + position: 0 + email: searchable+test@wayground.ca + activation_code: + activated_at: 2009-02-04 14:59:26 + is_blocked: false + name: Address has keyword login: user: login @@ -87,7 +104,7 @@ regular: activation_code: activated_at: <%= 1.day.ago.to_s(:db) %> is_blocked: false - name: + name: Regular another: user: another test/fixtures/email_addresses.yml @@ -16,9 +16,289 @@ class EmailAddressesControllerTest < ActionController::TestCase # users.resources :email_addresses #end assert_routing_for_resources 'email_addresses', [], ['user'], {}, {} + #map.resources :email_addresses + assert_routing_for_resources 'email_addresses' end # ACTIONS + # TODO: access restriction tests for email addresses controller + + # INDEX + test "index" do + #assert_efficient_sql do + get :index, {}, {:user=>users(:admin).id} + #end + assert_equal 10, assigns(:email_addresses).size + assert_nil assigns(:user) + assert_equal 'contacts', assigns(:section) + assert_equal 'Email Addresses', assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'index' + assert_select 'div#flash:empty' + assert_select 'div#content' do + # TODO: test html content for index + assigns(:email_addresses).each do |e| + assert_select "tr#email_address_#{e.id}" + end + end + end + test "index pagination" do + get :index, {:page=>"2"}, {:user=>users(:admin).id} + assert_equal 7, assigns(:email_addresses).size + assert_equal 'Email Addresses (2)', assigns(:page_title) + end + test "index search" do + get :index, {:key=>'keyword'}, {:user=>users(:admin).id} + assert_equal 2, assigns(:email_addresses).size + assert_equal 'contacts', assigns(:section) + assert_equal 'Email Addresses: ‘keyword’', assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + end + test "index for user" do + #assert_efficient_sql do + get :index, {:user_id=>email_addresses(:one).user.id}, {:user=>users(:admin).id} + #end + assert_equal email_addresses(:one).user, assigns(:user) + assert_equal 2, assigns(:email_addresses).size + assert_equal 'contacts', assigns(:section) + assert_equal("#{email_addresses(:one).user.title}: Email Addresses", + assigns(:page_title)) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'index' + assert_select 'div#flash:empty' + assert_select 'div#content' do + # TODO: test html content for index for user + assigns(:email_addresses).each do |e| + assert_select "tr#email_address_#{e.id}" + end + end + end + + # SHOW + test "show" do + assert_efficient_sql do + get :show, {:id=>email_addresses(:one).id}, {:user=>users(:admin).id} + end + assert_equal email_addresses(:one), assigns(:email_address) + assert_equal 'contacts', assigns(:section) + assert_equal("Email Address #{email_addresses(:one).id}", assigns(:page_title)) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'show' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select 'p', h(email_addresses(:one).to_s) + end + end + test "show invalid id" do + #assert_efficient_sql do + get :show, {:id=>'0'}, {:user=>users(:admin).id} + #end + assert_response :missing + assert_nil assigns(:email_address) + assert_nil flash[:notice] + assert flash[:error] + assert_template 'paths/missing' + end + test "show for user" do + assert_efficient_sql do + get :show, + {:user_id=>email_addresses(:one).user.id, :id=>email_addresses(:one).id}, + {:user=>users(:admin).id} + end + assert_equal email_addresses(:one).user, assigns(:user) + assert_equal email_addresses(:one), assigns(:email_address) + assert_equal 'contacts', assigns(:section) + assert_equal("#{email_addresses(:one).user.title}: Email Address #{email_addresses(:one).id}", + assigns(:page_title)) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'show' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select 'p', h(email_addresses(:one).to_s) + end + end + + # NEW + test "new" do + get :new, {}, {:user=>users(:admin).id} + assert assigns(:email_address) + assert_equal 'contacts', assigns(:section) + assert_equal 'New Email Address', assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'new' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action=#{email_addresses_path}]" do + assert_select 'input#email_address_name' + assert_select 'input#email_address_email' + end + end + end + + # CREATE + test "create" do + assert_difference(EmailAddress, :count, 1) do + post :create, {:email_address=>{:email=>'create+test@wayground.ca', + :name=>'Test Create Email Address'}}, + {:user=>users(:admin).id} + end + assert assigns(:email_address).is_a?(EmailAddress) + assert flash[:notice] + assert_response :redirect + assert_redirected_to({:action=>'show', :id=>assigns(:email_address)}) + # cleanup + assigns(:email_address).destroy + end + test "create no params" do + assert_difference(EmailAddress, :count, 0) do + post :create, {}, {:user=>users(:admin).id} + end + # this basically returns the same as a call to new, + # with the addition of a validation error list in the view + assert_validation_errors_on(assigns(:email_address), ['email']) + assert_equal 'contacts', assigns(:section) + assert_equal 'New Email Address', assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'new' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action=#{email_addresses_path}]" + end + end + test "create bad params" do + assert_difference(EmailAddress, :count, 0) do + post :create, {:email_address=>{:email=>'bad email', :name=>'Test Bad Params',}}, + {:user=>users(:admin).id} + end + # this basically returns the same as a call to new, + # with the addition of a validation error list in the view + assert_validation_errors_on(assigns(:email_address), ['email']) + assert_equal 'contacts', assigns(:section) + assert_equal 'New Email Address', assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'new' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action=#{email_addresses_path}]" + end + end + + # EDIT + test "edit" do + get :edit, {:id=>email_addresses(:one).id}, {:user=>users(:admin).id} + assert_equal email_addresses(:one), assigns(:email_address) + assert_equal 'contacts', assigns(:section) + assert_equal "Edit Email Address #{email_addresses(:one).id}", + assigns(:page_title) + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'edit' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action='#{email_addresses_path}/#{email_addresses(:one).id}']" do + assert_select 'input#email_address_name' + assert_select 'input#email_address_email' + end + end + end + + # UPDATE + test "update" do + put :update, {:id=>email_addresses(:two).id, + :email_address=>{:email=>'update-changes+email@wayground.ca', + :name=>'Changed Email by Update'} + }, + {:user=>users(:admin).id} + assert_equal email_addresses(:two), assigns(:email_address) + assert_equal 'Changed Email by Update', assigns(:email_address).name + assert_equal 'update-changes+email@wayground.ca', assigns(:email_address).email + assert flash[:notice] + assert_response :redirect + assert_redirected_to({:action=>'show', :id=>assigns(:email_address)}) + end + test "update invalid params" do + original_email = email_addresses(:two).email + put :update, {:id=>email_addresses(:two).id, + :email_address=>{:email=>'invalid email'}}, + {:user=>users(:admin).id} + assert_equal email_addresses(:two), assigns(:email_address) + assert_validation_errors_on(assigns(:email_address), ['email']) + # email_address was not updated + assert_equal original_email, email_addresses(:two).email + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'edit' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action='#{email_addresses_path}/#{email_addresses(:two).id}']" + end + end + test "update no params" do + original_email = email_addresses(:two).email + put :update, {:id=>email_addresses(:two).id, :email_address=>{}}, + {:user=>users(:admin).id} + assert_equal email_addresses(:two), assigns(:email_address) + # email_address was not updated + assert_equal original_email, email_addresses(:two).email + assert_nil flash[:notice] + assert_response :success + # view result + assert_template 'edit' + assert_select 'div#flash:empty' + assert_select 'div#content' do + assert_select "form[action='#{email_addresses_path}/#{email_addresses(:two).id}']" + end + end + + # DESTROY + test "destroy" do + # create a email_address to be destroyed + email_address = nil + assert_difference(EmailAddress, :count, 1) do + email_address = EmailAddress.new( + {:name=>'Delete Email Address', :email=>'delete+test@wayground.ca'}) + email_address.save! + end + # destroy the email_address (and it's thumbnail) + assert_difference(EmailAddress, :count, -1) do + delete :destroy, {:id=>email_address.id}, {:user=>users(:admin).id} + end + assert flash[:notice] + assert_response :redirect + assert_redirected_to email_addresses_path + end + test "destroy with invalid id" do + assert_difference(EmailAddress, :count, 0) do + delete :destroy, {:id=>'invalid'}, {:user=>users(:admin).id} + end + assert_nil assigns(:email_address) + assert_nil flash[:notice] + assert flash[:error] + assert_response :missing + assert_template 'paths/missing' + end + test "destroy with no id" do + assert_raise(ActionController::RoutingError) do + delete :destroy, {}, {:user=>users(:admin).id} + end + end end test/functional/email_addresses_controller_test.rb @@ -95,7 +95,10 @@ class MembershipsControllerTest < ActionController::TestCase assert_equal 'groups', assigns(:section) assert_equal groups(:membered_group), assigns(:group) assert assigns(:membership) - assert_equal("#{assigns(:group).name} Membership for #{assigns(:membership).user.nickname}", assigns(:page_title)) + assert_equal( + "#{assigns(:group).name} Membership for member #{assigns(:membership).id}", + assigns(:page_title) + ) assert_nil flash[:notice] # view result assert_template 'show' @@ -400,7 +403,7 @@ class MembershipsControllerTest < ActionController::TestCase assert_select 'div#flash:empty' assert_select 'div#content' do assert_select 'h1', assigns(:group).name - assert_select 'h2', "Edit Membership for #{assigns(:membership).user.fullname}" + assert_select 'h2', "Edit Membership for member #{assigns(:membership).id}" assert_select "form[action='#{group_membership_path(assigns(:group), assigns(:membership))}']" do assert_select 'input#membership_user_id', false, 'Edit form should not contain the user id' @@ -528,7 +531,7 @@ class MembershipsControllerTest < ActionController::TestCase assert_select 'div#flash:empty' assert_select 'div#content' do assert_select 'h1', assigns(:group).name - assert_select 'h2', "Edit Membership for #{assigns(:membership).user.fullname}" + assert_select 'h2', "Edit Membership for member #{assigns(:membership).id}" assert_select "form[action='#{group_membership_path(assigns(:group), assigns(:membership))}']" do assert_select 'input#membership_user_id', false, 'Edit form should not contain the user id' test/functional/memberships_controller_test.rb @@ -89,6 +89,43 @@ class EmailAddressTest < ActiveSupport::TestCase assert_nil u.email end + test "default include" do + assert_equal [:user], EmailAddress.default_include + end + + test "default order" do + assert_equal 'email_addresses.email', EmailAddress.default_order + end + test "default order with recent" do + assert_equal 'email_addresses.updated_at DESC, email_addresses.email', + EmailAddress.default_order({:recent=>true}) + end + + test "search conditions" do + assert_nil EmailAddress.search_conditions + end + test "search conditions with custom params" do + assert_equal ['a AND b',1,2], EmailMessage.search_conditions({}, ['a','b'], [1,2]) + end + test "search conditions with item" do + assert_equal(['email_addresses.user_id = ?', users(:login).id], + EmailAddress.search_conditions({:item=>users(:login)}) + ) + end + test "search conditions with key" do + assert_equal(['(email_addresses.email like ? OR email_addresses.name like ?)', + '%keyword%', '%keyword%'], + EmailAddress.search_conditions({:key=>'keyword'}) + ) + end + test "search conditions with all params" do + assert_equal ['a AND b AND email_addresses.user_id = ?' + + ' AND (email_addresses.email like ? OR email_addresses.name like ?)', + 1, 2, users(:login).id, '%keyword%', '%keyword%'], + EmailAddress.search_conditions( + {:item=>users(:login), :key=>'keyword'}, ['a','b'], [1,2]) + end + # INSTANCE METHODS @@ -265,4 +302,32 @@ class EmailAddressTest < ActiveSupport::TestCase e = EmailAddress.new(:email=>email, :name=>name) assert_equal "\"#{name}\" <#{email}>", e.to_s end + + test "css class" do + assert_equal 'contact', email_addresses(:login).css_class + end + test "css class with prefix" do + assert_equal 'dir-contact', email_addresses(:login).css_class('dir-') + end + + test "description" do + assert_nil email_addresses(:login).description + end + + test "link" do + assert_equal "/email_addresses/#{email_addresses(:login).id}", + email_addresses(:login).link + end + + test "title with name" do + assert_equal email_addresses(:one).name, email_addresses(:one).title + end + test "title with no name" do + assert_equal "Contact #{email_addresses(:two).id}", + email_addresses(:two).title + end + + test "title prefix" do + assert_nil email_addresses(:login).title_prefix + end end test/unit/email_address_test.rb @@ -8,7 +8,7 @@ class Membership < ActiveRecord::Base end class MembershipTest < ActiveSupport::TestCase - fixtures :memberships, :groups, :users, :locations + fixtures :memberships, :groups, :users, :email_addresses, :locations def test_membership_associations assert check_associations @@ -224,4 +224,37 @@ class MembershipTest < ActiveSupport::TestCase membership.email_address = addr assert_equal 'location-test@wayground.ca', membership.email end + + def test_membership_name + assert_equal 'Regular', memberships(:regular).name + end + def test_membership_name_with_no_user + m = Membership.new + m.email_address = email_addresses(:regular) + assert_equal 'Regular', m.name + end + + def test_membership_member_name + assert_equal "member #{memberships(:regular).id}", memberships(:regular).member_name + end + def test_membership_member_name_with_admin + assert_equal users(:regular).fullname, + memberships(:regular).member_name(users(:admin)) + end + def test_membership_member_name_with_admin_and_no_user + m = Membership.new + m.group = groups(:one) + m.email_address = email_addresses(:regular) + assert_equal 'Regular', m.member_name(users(:admin)) + end + + def test_membership_link + m = Membership.new + m.email_address = email_addresses(:regular) + assert_equal email_addresses(:regular).link, m.link + end + def test_membership_link_with_user + assert_equal users(:regular).link, memberships(:regular).link + end + end test/unit/membership_test.rb 4058ba4c8f9a893da62f355acde991f401e1245b Grant Neufeld grant@grantneufeld.ca http://github.com/grantneufeld/wayground/commit/7f6ec30bb897e0f5eace60f9642b1e04e0e709e7 7f6ec30bb897e0f5eace60f9642b1e04e0e709e7 2009-03-03T12:15:19-08:00 2009-03-03T12:15:19-08:00 email addresses controller - now working The email addresses controller now works (/email_addresses or /user/email_addresses). Made some fixes and additions to EmailAddress and Membership (including the memberships controllers and views) to get this working. Started implementing support for sub-sections for the users controller (like with the groups controller). Still need to put content in the views/users/ partial templates for header, footer and standard. 96fff2c5e90792c2e16bf71e04fdf3834dd51a7d Grant Neufeld grant@grantneufeld.ca