ActionItem791: re-implement contact-us without tasks

- add fields city and state to contact form - aceess_control plugin: filter members by role - stay on contact form after send message - validates format of email only if filled - remove phone and add name and fill fields if user logged in - mark contact fields to translation

ActionItem791: re-implement contact-us without tasks
- add fields city and state to contact form - aceess_control plugin: filter members by role - stay on contact form after send message - validates format of email only if filled - remove phone and add name and fill fields if user logged in - mark contact fields to translation
Joenio Costa · Antonio Terceiro
1 parent 3d351025
Showing 21 changed files with 394 additions and 74 deletions Show diff stats
app/controllers/public/contact_controller.rb
app/models/contact.rb
app/models/profile.rb
app/views/contact/new.rhtml
app/views/contact/sender/mail.rhtml
app/views/tasks/_contact.rhtml
public/stylesheets/controller_contact.css
test/functional/contact_controller_test.rb
test/functional/tasks_controller_test.rb
test/unit/contact_sender_test.rb
test/unit/contact_test.rb
test/unit/profile_test.rb
vendor/plugins/access_control/lib/acts_as_accessible.rb
vendor/plugins/access_control/test/acts_as_accessor_test.rb
vendor/plugins/active_record_tableless/MIT-LICENSE
vendor/plugins/active_record_tableless/README
vendor/plugins/active_record_tableless/Rakefile
vendor/plugins/active_record_tableless/init.rb
vendor/plugins/active_record_tableless/lib/active_record/tableless.rb
vendor/plugins/active_record_tableless/tasks/active_record_tableless_tasks.rake
@@ -3,14 +3,24 @@ class ContactController &lt; PublicController
   needs_profile
   def new
-    @contact = Contact.new(params[:contact])
+    @contact
     if request.post?
-      if @contact.save
+      @contact = Contact.new(params[:contact])
+      @contact.dest = profile
+      @contact.city = City.exists?(params[:city]) ? City.find(params[:city]).name : _('Missing')
+      @contact.state = State.exists?(params[:state]) ? State.find(params[:state]).name : _('Missing')
+      if @contact.deliver
         flash[:notice] = _('Contact successfully sent')
-        redirect_to :controller => 'profile', :profile => profile.identifier
+        redirect_to :action => 'new'
       else
         flash[:notice] = _('Contact not sent')
       end
+    else
+      if logged_in?
+        @contact = Contact.new(:name => user.name, :email => user.email)
+      else
+        @contact = Contact.new
+      end
     end
   end
-class Contact < Task
+class Contact < ActiveRecord::Base #WithoutTable
+  tableless :columns => [
+    [:name, :string],
+    [:subject, :string],
+    [:message, :string],
+    [:email, :string],
+    [:state, :string],
+    [:city, :string]
+  ]
+  attr_accessor :dest
-  validates_presence_of :target_id, :subject, :email, :message
-  validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT
+  N_('Subject'); N_('Message'); N_('City and state'); N_('e-Mail'); N_('Name')
-  acts_as_having_settings :field => :data
-  settings_items :subject, :message, :city_and_state, :email, :phone
+  validates_presence_of :subject, :email, :message, :name
+  validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|o| !o.email.blank?})
-  def description
-    _('%s sent a new message') % (requestor ? requestor.name : _('Someone'))
+  def deliver
+    Contact::Sender.deliver_mail(self)
+  end
+
+  class Sender < ActionMailer::Base
+    def mail(contact)
+      emails = [contact.dest.contact_email] + contact.dest.admins.map{|i| i.email}
+      recipients emails
+      from "#{contact.name} <#{contact.email}>"
+      subject contact.subject
+      body :name => contact.name,
+        :email => contact.email,
+        :city => contact.city,
+        :state => contact.state,
+        :message => contact.message,
+        :environment => contact.dest.environment.name,
+        :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
+    end
   end
 end
@@ -514,4 +514,8 @@ class Profile &lt; ActiveRecord::Base
     !self.articles.count(:conditions => {:type => 'Blog'}).zero?
   end
+  def admins
+    self.members_by_role(Profile::Roles.admin)
+  end
+
 end
@@ -4,13 +4,11 @@
 <% labelled_form_for :contact, @contact do |f| %>
-  <%= hidden_field_tag 'contact[target_id]', profile.id %>
-  <%= hidden_field_tag 'contact[requestor_id]', (logged_in? ? current_user.person.id : nil) %>
-  <%= required f.text_field(:subject) %>
-  <%= required f.text_field(:email) %>
-  <%= f.text_field :city_and_state %>
-  <%= f.text_field :phone %>
-  <%= required f.text_area(:message, :rows => 5) %>
+  <%= f.text_field :name %>
+  <%= f.text_field :email %>
+  <%= labelled_form_field _('City and state'), select_city(true) %>
+  <%= f.text_field :subject %>
+  <%= f.text_area :message, :rows => 10, :cols => 60 %>
   <%= submit_button(:send, _('Send')) %>
@@ -0,0 +1,12 @@
+<%= _('Name: %s') % @name  %>
+<%= _('e-Mail: %s') % @email %>
+<%= _('City and state: %s-%s') % [@city, @state] %>
+
+<%= _('Message:') %>
+--
+
+<%= @message %>
+
+--
+<%= _('%s environment system') % @environment %>
+<%= @url %>
@@ -1,18 +0,0 @@
-<h2><%= task.description %></h2>
-
-<% form_for('task', task, :url => { :action => 'close', :id => task.id}) do |f| %>
-
-  <%= hidden_field_tag(:decision, :finish) %>
-  <table>
-    <% %w[ subject email phone city_and_state message ].each do |field| %>
-      <% if task.respond_to?(field) and !task.send(field).nil? and !task.send(field).empty? %>
-        <tr> <td><strong><%= _(field.humanize) %></strong></td> <td><%= task.send(field) %></td> </tr>
-      <% end %>
-    <% end %>
-  </table>
-
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Ok!')) %>
-  <% end %>
-
-<% end %>
@@ -0,0 +1,6 @@
+/*** SELECT CITY ***/
+
+#content .select_state_for_origin,
+#content .select_city_for_origin {
+  display: inline;
+}
@@ -43,33 +43,30 @@ class ContactControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'textarea', :attributes => { :name => 'contact[message]' }
   end
-  should 'add hidden field with target_id' do
-    get :new, :profile => enterprise.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'contact[target_id]', :value => enterprise.id, :type => 'hidden' }
+  should 'redirect back to contact page after send contact' do
+    post :new, :profile => enterprise.identifier, :contact => {:name => 'john', :subject => 'Hi', :email => 'visitor@mail.invalid', :message => 'Hi, all'}
+    assert_response :redirect
+    assert_redirected_to :action => 'new'
   end
-  should 'add requestor id if logged in' do
+  should 'fill email if user logged in' do
     login_as(profile.identifier)
-    @controller.stubs(:current_user).returns(profile.user)
     get :new, :profile => enterprise.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'contact[requestor_id]', :value => profile.id }
+    assert_tag :tag => 'input', :attributes => {:name => 'contact[email]', :value => profile.email}
   end
-  should 'nil requestor id if not logged in' do
+  should 'fill name if user logged in' do
+    login_as(profile.identifier)
     get :new, :profile => enterprise.identifier
-    assert_tag :tag => 'input', :attributes => { :name => 'contact[requestor_id]', :value => nil }
-  end
-
-  should 'redirect to profile page after contact' do
-    post :new, :profile => enterprise.identifier, :contact => {:subject => 'Hi', :email => 'visitor@mail.invalid', :message => 'Hi, all', :target_id => enterprise.id}
-    assert_response :redirect
-    assert_redirected_to :controller => 'profile', :profile => enterprise.identifier
+    assert_tag :tag => 'input', :attributes => {:name => 'contact[name]', :value => profile.name}
   end
-  should 'be able to send contact' do
-    assert_difference Contact, :count do
-      post :new, :profile => enterprise.identifier, :contact => {:subject => 'Hi', :email => 'visitor@mail.invalid', :message => 'Hi, all', :target_id => enterprise.id}
-    end
+  should 'define city and state' do
+    City.stubs(:find).returns(City.new(:name => 'Camaçari'))
+    State.stubs(:find).returns(State.new(:name => 'Bahia'))
+    post :new, :profile => enterprise.identifier, :contact => {:name => 'john', :subject => 'Hi', :email => 'visitor@mail.invalid', :message => 'Hi, all', :state => 1, :city => 1}
+    assert_equal 'Camaçari', assigns(:contact).city
+    assert_equal 'Bahia', assigns(:contact).state
   end
 end
@@ -152,15 +152,4 @@ class TasksControllerTest &lt; Test::Unit::TestCase
      assert_equal f, assigns(:ticket).target
   end
-  should 'list enterprise contacts' do
-    ent = Enterprise.create!(:identifier => 'contact_test_enterprise', :name => 'Test contact enteprise')
-    task = Contact.create!(:subject => 'test', :target_id => profile.id, :email => 'visitor@invalid.com', :message => 'Hi, all')
-
-    login_as(profile.identifier)
-    get :index, :profile => ent.identifier
-
-    assert_includes assigns(:tasks), task
-    assert_tag :tag => 'li', :attributes => { :class => 'task-Contact' }, :content => 'Someone sent a new message'
-  end
-
 end
@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ContactSenderTest < Test::Unit::TestCase
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  CHARSET = "utf-8"
+
+  def setup
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+
+    @expected = TMail::Mail.new
+    @expected.set_content_type "text", "plain", { "charset" => CHARSET }
+  end
+
+  should 'be able to deliver mail' do
+    ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
+    ent.contact_email = 'contact@invalid.com'
+    c = Contact.new(:dest => ent, :subject => 'hi molly')
+    response = Contact::Sender.deliver_mail(c)
+    assert_equal c.email, response.from
+    assert_equal c.subject, response.subject
+  end
+
+  should 'deliver mail to contact_email' do
+    ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
+    ent.contact_email = 'contact@invalid.com'
+    c = Contact.new(:dest => ent)
+    response = Contact::Sender.deliver_mail(c)
+    assert_includes response.to, c.dest.contact_email
+  end
+ 
+  should 'deliver mail to admins of enterprise' do
+    admin = create_user('admin_test').person
+    ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
+    ent.contact_email = 'contact@invalid.com'
+    ent.add_admin(admin)
+    assert ent.save!
+    c = Contact.new(:dest => ent)
+    response = Contact::Sender.deliver_mail(c)
+    assert_includes response.to, admin.email
+  end
+
+  private
+
+    def read_fixture(action)
+      IO.readlines("#{FIXTURES_PATH}/mail_sender/#{action}")
+    end
+
+    def encode(subject)
+      quoted_printable(subject, CHARSET)
+    end
+
+end
@@ -2,24 +2,39 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class ContactTest < ActiveSupport::TestCase
-  should 'have serialized data' do
-    t = Contact.new
-    t.data[:test] = 'test'
-
-    assert_equal({:test => 'test'}, t.data)
-  end
-
   should 'validates required fields' do
     contact = Contact.new
     assert !contact.valid?
+
     contact.subject = 'Hi'
     assert !contact.valid?
+
+    contact.name = 'john'
+    assert !contact.valid?
+
     contact.email = 'visitor@invalid.com'
     assert !contact.valid?
+
     contact.message = 'Hi, all'
-    assert !contact.valid?
-    contact.target = create_user('contact_user_test').person
-    assert contact.save!
+    assert contact.valid?
+  end
+
+  should 'validates format of email only if not empty' do
+    contact = Contact.new
+    contact.valid?
+    assert_equal "Email can't be blank", contact.errors[:email]
+  end
+
+  should 'inicialize fields on instanciate' do
+    assert_nothing_raised ArgumentError do
+      Contact.new(:name => 'john', :email => 'contact@invalid.com')
+    end
+  end
+
+  should 'deliver message' do
+    ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
+    c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
+    assert c.deliver
   end
 end
@@ -1112,6 +1112,14 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_nil p.blog
   end
+  should 'list admins' do
+    c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile')
+    p = create_user('mytestuser').person
+    c.add_admin(p)
+
+    assert_equal [p], c.admins
+  end
+
   private
   def assert_invalid_identifier(id)
@@ -27,6 +27,9 @@ class ActiveRecord::Base
     def members
       role_assignments.map(&:accessor).uniq
     end
+    def members_by_role(role)
+      role_assignments.select{|i| i.role.key == role.key}.map(&:accessor).uniq
+    end
     def roles
       Role.find(:all).select do |r| 
@@ -55,4 +55,13 @@ class ActAsAccessorTest &lt; Test::Unit::TestCase
     assert !a.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([role, a, res]) 
     assert !a.remove_role(role, res)
   end
+
+  def test_get_members_by_role
+    res = AccessControlTestResource.create!(:name => 'bla')
+    a = AccessControlTestAccessor.create!(:name => 'ze')
+    role = Role.create!(:name => 'another_content_author', :permissions => ['bli'])
+    assert a.add_role(role, res)
+    assert_equal [a], a.members_by_role(role)
+  end
+
 end
@@ -0,0 +1,20 @@
+Copyright (c) 2008 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,30 @@
+ActiveRecordTableless
+=====================
+
+Rails plugin allowing ActiveRecord models to be used with validations but 
+without being backed by a database table.
+
+
+Install
+=======
+
+script/plugin install git://github.com/robinsp/active_record_tableless.git
+
+
+Example
+=======
+
+class TablelessModel < ActiveRecord::Base
+  tableless :columns => [
+                [:email, :string],
+                [:password, :string],
+                [:password_confirmation] 
+            ]
+  
+  validates_presence_of     :email, :password, :password_confirmation
+  validates_confirmation_of :password
+  
+end
+
+
+Copyright (c) 2008 [name of plugin creator], released under the MIT license
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the active_record_tableless plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the active_record_tableless plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ActiveRecordTableless'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
@@ -0,0 +1,2 @@
+# Include hook code here
+ActiveRecord::Base.send(:include, ActiveRecord::Tableless)
 \ No newline at end of file
@@ -0,0 +1,56 @@
+module ActiveRecord
+  module Tableless
+    
+    def self.included(base)
+      # 'base' is assumed to be ActiveRecord::Base
+      base.extend(ClassMethods)
+    end
+    
+    module ClassMethods
+      def tableless( options = {} )
+        include ActiveRecord::Tableless::InstanceMethods
+        raise "No columns defined" unless options.has_key?(:columns) && !options[:columns].empty?
+        
+        self.extend(MetaMethods)
+        
+        for column_args in options[:columns]
+          column( *column_args )
+        end
+        
+      end
+    end
+    
+    module MetaMethods 
+      def columns()
+        @columns ||= []
+      end
+      
+      def column(name, sql_type = nil, default = nil, null = true)
+        columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+        reset_column_information
+      end
+      
+      # Do not reset @columns
+      def reset_column_information
+        generated_methods.each { |name| undef_method(name) }
+        @column_names = @columns_hash = @content_columns = @dynamic_methods_hash = @read_methods = nil
+      end
+    end
+    
+    module InstanceMethods 
+      def create_or_update
+        errors.empty?
+      end
+      
+      def saved!(with_id = 1)
+        self.id = with_id
+        
+        def self.new_record?
+          false
+        end
+      end
+      alias_method :exists!, :saved!
+    end
+    
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :active_record_tableless do
+#   # Task goes here
+# end
@@ -0,0 +1,75 @@
+require 'test/unit'
+require 'rubygems'
+require 'active_record'
+require File.dirname(__FILE__) + '/../lib/active_record/tableless'
+
+
+
+ActiveRecord::Base.establish_connection(  {
+  :adapter => 'sqlite3',
+  :database => ":memory:",
+  :timeout => 500
+  
+})
+
+ActiveRecord::Base.send(:include, ActiveRecord::Tableless)
+
+class TablelessModel < ActiveRecord::Base
+  tableless :columns => [
+                [:email, :string],
+                [:password, :string],
+                [:password_confirmation] ]
+  
+  validates_presence_of     :email, :password, :password_confirmation
+  validates_confirmation_of :password
+  
+end
+
+class ActiveRecordTablelessTest < Test::Unit::TestCase
+  
+  def setup
+    super
+    @valid_attributes = {
+      :email => "robin@bogus.com", 
+      :password => "password", 
+      :password_confirmation => "password"
+    }
+  end
+  
+  def test_create
+    assert TablelessModel.create(@valid_attributes).valid?
+  end
+  
+  def test_validations
+    # Just check a few validations to make sure we didn't break ActiveRecord::Validations::ClassMethods
+    assert_not_nil TablelessModel.create(@valid_attributes.merge(:email => "")).errors[:email]
+    assert_not_nil TablelessModel.create(@valid_attributes.merge(:password => "")).errors[:password]
+    assert_not_nil TablelessModel.create(@valid_attributes.merge(:password_confirmation => "")).errors[:password]
+  end
+  
+  def test_save
+    assert TablelessModel.new(@valid_attributes).save 
+    assert !TablelessModel.new(@valid_attributes.merge(:password => "no_match")).save 
+  end
+  
+  def test_valid?
+    assert TablelessModel.new(@valid_attributes).valid? 
+    assert !TablelessModel.new(@valid_attributes.merge(:password => "no_match")).valid? 
+  end
+  
+  
+  def test_exists!
+    m = TablelessModel.new(@valid_attributes)
+    
+    assert_nil m.id 
+    assert m.new_record?
+    
+    m.exists!
+    assert_equal 1, m.id 
+    assert !m.new_record?
+    
+    m.exists!(250)
+    assert_equal 250, m.id 
+    assert !m.new_record?
+  end
+end
1	-class Contact < Task	1	+class Contact < ActiveRecord::Base #WithoutTable
		2	+ tableless :columns => [
		3	+ [:name, :string],
		4	+ [:subject, :string],
		5	+ [:message, :string],
		6	+ [:email, :string],
		7	+ [:state, :string],
		8	+ [:city, :string]
		9	+ ]
		10	+ attr_accessor :dest
2		11
3	- validates_presence_of :target_id, :subject, :email, :message
4	- validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT	12	+ N_('Subject'); N_('Message'); N_('City and state'); N_('e-Mail'); N_('Name')
5		13
6	- acts_as_having_settings :field => :data
7	- settings_items :subject, :message, :city_and_state, :email, :phone	14	+ validates_presence_of :subject, :email, :message, :name
		15	+ validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {\|o\| !o.email.blank?})
8		16
9	- def description
10	- _('%s sent a new message') % (requestor ? requestor.name : _('Someone'))	17	+ def deliver
		18	+ Contact::Sender.deliver_mail(self)
		19	+ end
		20	+
		21	+ class Sender < ActionMailer::Base
		22	+ def mail(contact)
		23	+ emails = [contact.dest.contact_email] + contact.dest.admins.map{\|i\| i.email}
		24	+ recipients emails
		25	+ from "#{contact.name} <#{contact.email}>"
		26	+ subject contact.subject
		27	+ body :name => contact.name,
		28	+ :email => contact.email,
		29	+ :city => contact.city,
		30	+ :state => contact.state,
		31	+ :message => contact.message,
		32	+ :environment => contact.dest.environment.name,
		33	+ :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
		34	+ end
11	end	35	end
12		36
13	end	37	end
	@@ -514,4 +514,8 @@ class Profile < ActiveRecord::Base		@@ -514,4 +514,8 @@ class Profile < ActiveRecord::Base
514	!self.articles.count(:conditions => {:type => 'Blog'}).zero?	514	!self.articles.count(:conditions => {:type => 'Blog'}).zero?
515	end	515	end
516		516
		517	+ def admins
		518	+ self.members_by_role(Profile::Roles.admin)
		519	+ end
		520	+
517	end	521	end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+<%= _('Name: %s') % @name %>
	2	+<%= _('e-Mail: %s') % @email %>
	3	+<%= _('City and state: %s-%s') % [@city, @state] %>
	4	+
	5	+<%= _('Message:') %>
	6	+--
	7	+
	8	+<%= @message %>
	9	+
	10	+--
	11	+<%= _('%s environment system') % @environment %>
	12	+<%= @url %>
	@@ -1,18 +0,0 @@	@@ -1,18 +0,0 @@
1	-<h2><%= task.description %></h2>
2	-
3	-<% form_for('task', task, :url => { :action => 'close', :id => task.id}) do \|f\| %>
4	-
5	- <%= hidden_field_tag(:decision, :finish) %>
6	- <table>
7	- <% %w[ subject email phone city_and_state message ].each do \|field\| %>
8	- <% if task.respond_to?(field) and !task.send(field).nil? and !task.send(field).empty? %>
9	- <tr> <td><strong><%= _(field.humanize) %></strong></td> <td><%= task.send(field) %></td> </tr>
10	- <% end %>
11	- <% end %>
12	- </table>
13	-
14	- <% button_bar do %>
15	- <%= submit_button(:ok, _('Ok!')) %>
16	- <% end %>
17	-
18	-<% end %>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+/* SELECT CITY */
	2	+
	3	+#content .select_state_for_origin,
	4	+#content .select_city_for_origin {
	5	+ display: inline;
	6	+}
	@@ -152,15 +152,4 @@ class TasksControllerTest < Test::Unit::TestCase		@@ -152,15 +152,4 @@ class TasksControllerTest < Test::Unit::TestCase
152	assert_equal f, assigns(:ticket).target	152	assert_equal f, assigns(:ticket).target
153	end	153	end
154		154
155	- should 'list enterprise contacts' do
156	- ent = Enterprise.create!(:identifier => 'contact_test_enterprise', :name => 'Test contact enteprise')
157	- task = Contact.create!(:subject => 'test', :target_id => profile.id, :email => 'visitor@invalid.com', :message => 'Hi, all')
158	-
159	- login_as(profile.identifier)
160	- get :index, :profile => ent.identifier
161	-
162	- assert_includes assigns(:tasks), task
163	- assert_tag :tag => 'li', :attributes => { :class => 'task-Contact' }, :content => 'Someone sent a new message'
164	- end
165	-
166	end	155	end
@@ -0,0 +1,54 @@		@@ -0,0 +1,54 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class ContactSenderTest < Test::Unit::TestCase
	4	+ FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
	5	+ CHARSET = "utf-8"
	6	+
	7	+ def setup
	8	+ ActionMailer::Base.delivery_method = :test
	9	+ ActionMailer::Base.perform_deliveries = true
	10	+ ActionMailer::Base.deliveries = []
	11	+
	12	+ @expected = TMail::Mail.new
	13	+ @expected.set_content_type "text", "plain", { "charset" => CHARSET }
	14	+ end
	15	+
	16	+ should 'be able to deliver mail' do
	17	+ ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
	18	+ ent.contact_email = 'contact@invalid.com'
	19	+ c = Contact.new(:dest => ent, :subject => 'hi molly')
	20	+ response = Contact::Sender.deliver_mail(c)
	21	+ assert_equal c.email, response.from
	22	+ assert_equal c.subject, response.subject
	23	+ end
	24	+
	25	+ should 'deliver mail to contact_email' do
	26	+ ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
	27	+ ent.contact_email = 'contact@invalid.com'
	28	+ c = Contact.new(:dest => ent)
	29	+ response = Contact::Sender.deliver_mail(c)
	30	+ assert_includes response.to, c.dest.contact_email
	31	+ end
	32	+
	33	+ should 'deliver mail to admins of enterprise' do
	34	+ admin = create_user('admin_test').person
	35	+ ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
	36	+ ent.contact_email = 'contact@invalid.com'
	37	+ ent.add_admin(admin)
	38	+ assert ent.save!
	39	+ c = Contact.new(:dest => ent)
	40	+ response = Contact::Sender.deliver_mail(c)
	41	+ assert_includes response.to, admin.email
	42	+ end
	43	+
	44	+ private
	45	+
	46	+ def read_fixture(action)
	47	+ IO.readlines("#{FIXTURES_PATH}/mail_sender/#{action}")
	48	+ end
	49	+
	50	+ def encode(subject)
	51	+ quoted_printable(subject, CHARSET)
	52	+ end
	53	+
	54	+end
	@@ -2,24 +2,39 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -2,24 +2,39 @@ require File.dirname(__FILE__) + '/../test_helper'
2		2
3	class ContactTest < ActiveSupport::TestCase	3	class ContactTest < ActiveSupport::TestCase
4		4
5	- should 'have serialized data' do
6	- t = Contact.new
7	- t.data[:test] = 'test'
8	-
9	- assert_equal({:test => 'test'}, t.data)
10	- end
11	-
12	should 'validates required fields' do	5	should 'validates required fields' do
13	contact = Contact.new	6	contact = Contact.new
14	assert !contact.valid?	7	assert !contact.valid?
		8	+
15	contact.subject = 'Hi'	9	contact.subject = 'Hi'
16	assert !contact.valid?	10	assert !contact.valid?
		11	+
		12	+ contact.name = 'john'
		13	+ assert !contact.valid?
		14	+
17	contact.email = 'visitor@invalid.com'	15	contact.email = 'visitor@invalid.com'
18	assert !contact.valid?	16	assert !contact.valid?
		17	+
19	contact.message = 'Hi, all'	18	contact.message = 'Hi, all'
20	- assert !contact.valid?
21	- contact.target = create_user('contact_user_test').person
22	- assert contact.save!	19	+ assert contact.valid?
		20	+ end
		21	+
		22	+ should 'validates format of email only if not empty' do
		23	+ contact = Contact.new
		24	+ contact.valid?
		25	+ assert_equal "Email can't be blank", contact.errors[:email]
		26	+ end
		27	+
		28	+ should 'inicialize fields on instanciate' do
		29	+ assert_nothing_raised ArgumentError do
		30	+ Contact.new(:name => 'john', :email => 'contact@invalid.com')
		31	+ end
		32	+ end
		33	+
		34	+ should 'deliver message' do
		35	+ ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default)
		36	+ c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent)
		37	+ assert c.deliver
23	end	38	end
24		39
25	end	40	end
	@@ -1112,6 +1112,14 @@ class ProfileTest < Test::Unit::TestCase		@@ -1112,6 +1112,14 @@ class ProfileTest < Test::Unit::TestCase
1112	assert_nil p.blog	1112	assert_nil p.blog
1113	end	1113	end
1114		1114
		1115	+ should 'list admins' do
		1116	+ c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile')
		1117	+ p = create_user('mytestuser').person
		1118	+ c.add_admin(p)
		1119	+
		1120	+ assert_equal [p], c.admins
		1121	+ end
		1122	+
1115	private	1123	private
1116		1124
1117	def assert_invalid_identifier(id)	1125	def assert_invalid_identifier(id)
	@@ -55,4 +55,13 @@ class ActAsAccessorTest < Test::Unit::TestCase		@@ -55,4 +55,13 @@ class ActAsAccessorTest < Test::Unit::TestCase
55	assert !a.role_assignments.map{\|ra\|[ra.role, ra.accessor, ra.resource]}.include?([role, a, res])	55	assert !a.role_assignments.map{\|ra\|[ra.role, ra.accessor, ra.resource]}.include?([role, a, res])
56	assert !a.remove_role(role, res)	56	assert !a.remove_role(role, res)
57	end	57	end
		58	+
		59	+ def test_get_members_by_role
		60	+ res = AccessControlTestResource.create!(:name => 'bla')
		61	+ a = AccessControlTestAccessor.create!(:name => 'ze')
		62	+ role = Role.create!(:name => 'another_content_author', :permissions => ['bli'])
		63	+ assert a.add_role(role, res)
		64	+ assert_equal [a], a.members_by_role(role)
		65	+ end
		66	+
58	end	67	end