Merge branch 'stoa-invitation' into stoa-profile-info

Conflicts: plugins/stoa/lib/stoa_plugin.rb plugins/stoa/public/style.css

Merge branch 'stoa-invitation' into stoa-profile-info
Conflicts: plugins/stoa/lib/stoa_plugin.rb plugins/stoa/public/style.css
Rodrigo Souto
2 parents 0b4c072d 197473bb
Showing 15 changed files with 215 additions and 21 deletions Show diff stats
app/models/environment.rb
app/views/friends/index.rhtml
lib/noosfero/plugin.rb
plugins/stoa/lib/ext/person.rb
plugins/stoa/lib/stoa_plugin.rb
plugins/stoa/public/images/control-panel/invite-friends.gif
plugins/stoa/public/images/control-panel/invite-friends.png
plugins/stoa/public/javascripts/signup_complement.js
plugins/stoa/public/style.css
plugins/stoa/test/functional/account_controller_test.rb
plugins/stoa/test/functional/invite_controller_test.rb
plugins/stoa/test/unit/person.rb
plugins/stoa/test/unit/usp_user.rb
test/functional/friends_controller_test.rb
test/unit/environment_test.rb
@@ -258,7 +258,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def enable_plugin(plugin)
-    self.enabled_plugins += [plugin]
+    self.enabled_plugins += [plugin.to_s]
     self.enabled_plugins.uniq!
     self.save!
   end
@@ -269,7 +269,7 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def disable_plugin(plugin)
-    self.enabled_plugins.delete(plugin)
+    self.enabled_plugins.delete(plugin.to_s)
     self.save!
   end
  
@@ -278,6 +278,10 @@ class Environment &lt; ActiveRecord::Base
     self.settings["#{feature}_enabled".to_sym] == true
   end
  
+  def plugin_enabled?(plugin)
+    enabled_plugins.include?(plugin.to_s)
+  end
+
   # enables the features identified by <tt>features</tt>, which is expected to
   # be an Enumarable object containing the identifiers of the desired features.
   # Passing <tt>nil</tt> is the same as passing an empty Array.
@@ -14,7 +14,9 @@
     <% button_bar do %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
       <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+      <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+        <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+      <% end %>
     <% end %>
   <% end %>
  
@@ -43,7 +45,9 @@
   <% button_bar do %>
     <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
-    <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+    <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
+      <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
+    <% end %>
   <% end %>
 <% end %>
  
@@ -244,4 +244,10 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Removes the invite friend button from the friends controller
+  # returns = boolean
+  def remove_invite_friends_button
+    nil
+  end
+
 end
 require_dependency 'person'
  
 class Person
-  validates_uniqueness_of :usp_id
+  validates_uniqueness_of :usp_id, :allow_nil => true
+  settings_items :invitation_code
+  validate :usp_id_or_invitation, :if => lambda { |person| person.environment && person.environment.plugin_enabled?(StoaPlugin)}
+
+  def usp_id_or_invitation
+    if usp_id.blank? && (invitation_code.blank? || !invitation_task)
+      errors.add(:usp_id, "can't register without usp_id or invitation")
+    end
+  end
+
+  def invitation_task
+    Task.pending.find(:first, :conditions => {:code => invitation_code}) ||
+    Task.finished.find(:first, :conditions => {:code => invitation_code, :target_id => id})
+  end
 end
@@ -20,6 +20,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   def signup_extra_contents
     lambda {
       required(labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', '', :id => 'usp_id_field'))) +
+      content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it in if you have one.'), :id => 'usp-id-balloon') +
       content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))), :id => 'signup-birth-date', :style => 'display: none') +
       content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))), :id => 'signup-cpf', :style => 'display:none') +
       javascript_include_tag('../plugins/stoa/javascripts/jquery.observe_field', '../plugins/stoa/javascripts/signup_complement')
@@ -28,8 +29,10 @@ class StoaPlugin &lt; Noosfero::Plugin
  
   def account_controller_filters
     block = lambda do
+      params[:profile_data] ||= {}
+      params[:profile_data][:invitation_code] = params[:invitation_code]
       if request.post?
-        if !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
+        if !params[:invitation_code] && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
           @person = Person.new
           @person.errors.add(:usp_id, _(' validation failed'))
           render :action => :signup
@@ -43,4 +46,21 @@ class StoaPlugin &lt; Noosfero::Plugin
       :block => block }]
   end
  
+  def invite_controller_filters
+    [{ :type => 'before_filter',
+      :method_name => 'check_usp_id_existence',
+      :block => lambda {render_access_denied if profile.usp_id.blank?} }]
+  end
+
+  def control_panel_buttons
+    { :title => _('Invite friends'),
+      :icon => 'invite-friends',
+      :url => {:controller => 'invite',
+               :action => 'select_address_book'} } if !context.profile.usp_id.blank?
+  end
+
+  def remove_invite_friends_button
+    true
+  end
+
 end
@@ -23,14 +23,22 @@ jQuery(&quot;#usp_id_field&quot;).observe_field(1, function(){
           });
       }
       else {
-        jQuery('#signup-form .submit').attr('disabled', true);
+        jQuery(me).removeClass('checking');
+        if(me.value) {
+          jQuery('#signup-form .submit').attr('disabled', true);
+          jQuery(me).addClass('invalid');
+        }
+        else {
+          jQuery('#signup-form .submit').attr('disabled', false);
+          jQuery(me).removeClass('invalid');
+          jQuery(me).removeClass('validated');
+        }
         jQuery('#signup-birth-date').hide();
         jQuery('#signup-cpf').hide();
-        jQuery(me).removeClass('checking').addClass('invalid');
       }
       if(data.error) displayValidationUspIdError(data.error);
     }
-);
+  );
 });
  
 function displayValidationUspIdError(error){
@@ -39,3 +47,8 @@ function displayValidationUspIdError(error){
     width:  "70%" });
 }
  
+jQuery('#usp_id_field').focus(function() {
+  jQuery('#usp-id-balloon').fadeIn('slow');
+});
+
+jQuery('#usp_id_field').blur(function() { jQuery('#usp-id-balloon').fadeOut('slow'); });
@@ -10,3 +10,22 @@
 	cursor: default;
 }
  
+.controller-profile_editor a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.png)}
+.controller-profile_editor .msie6 a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.gif)}
+
+#signup-form small#usp-id-balloon {
+  display: none;
+  width: 142px;
+  height: 69px;
+  color: #FFFFFF;
+  font-weight: bold;
+  font-size: 11px;
+  padding: 5px 10px 45px 10px;
+  margin: 0;
+  line-height: 1.5em;
+  background: transparent url(/images/orange-balloon.png) bottom center no-repeat;
+  position: absolute;
+  z-index: 2;
+  right: 20px;
+  bottom: 110px;
+}
@@ -38,4 +38,9 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_nil assigns(:person).errors[:usp_id]
   end
  
+  should 'inlude invitation_code param in the person\'s attributes' do
+    get :signup, :invitation_code => 12345678
+    assert assigns(:person).invitation_code == '12345678'
+  end
+
 end
@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller'
+
+# Re-raise errors caught by the controller.
+class InviteController; def rescue_action(e) raise e end; end
+
+class InviteControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = InviteController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    environment = Environment.default
+    environment.enabled_plugins = ['StoaPlugin']
+    environment.save!
+  end
+
+  should 'not enable access to invitation if the user has not an usp_id' do
+    Task.create!(:code => 12345678)
+    person_without_usp_id = User.create!(:login => 'user-without', :email => 'user-without@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:invitation_code => 12345678}).person
+
+    login_as(person_without_usp_id.identifier)
+    get :select_address_book, :profile => person_without_usp_id.identifier
+    assert_response 403
+    get :select_friends, :profile => person_without_usp_id.identifier
+    assert_response 403
+  end
+
+  should 'enable access to invitation if the user has an usp_id' do
+    person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
+
+    login_as(person_with_usp_id.identifier)
+    get :select_address_book, :profile => person_with_usp_id.identifier
+    assert_response 200
+    get :select_friends, :profile => person_with_usp_id.identifier, :contact_list => ContactList.create.id
+    assert_response 200
+  end
+
+end
+
@@ -2,16 +2,64 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
  
 class StoaPlugin::Person < ActiveSupport::TestCase
  
+  def setup
+    @environment = Environment.default
+    @environment.enable_plugin(StoaPlugin)
+  end
+
+  attr_reader :environment
+
   should 'validates uniqueness of usp_id' do
-    usp_id = 12345678
-    person = create_user('some-person').person
-    person.usp_id = usp_id
-    person.save!
-    another_person = Person.new(:name => "Another person", :identifier => 'another-person', :usp_id => usp_id)
+    usp_id = 87654321
+    fast_create(Person, :usp_id => usp_id)
+    another_person = Person.new(:usp_id => usp_id)
+    another_person.valid?
  
-    assert !another_person.valid?
     assert another_person.errors.invalid?(:usp_id)
   end
  
+  should 'allow nil usp_id only if person has an invitation_code' do
+    person = Person.new(:environment => environment)
+    person.valid?
+    assert person.errors.invalid?(:usp_id)
+
+    Task.create!(:code => 12345678)
+    person.invitation_code = 12345678
+    person.valid?
+
+    assert !person.errors.invalid?(:usp_id)
+  end
+
+  should 'allow multiple nil usp_id' do
+    fast_create(Person)
+    Task.create!(:code => 87654321)
+    person = Person.new(:invitation_code => 87654321)
+    person.valid?
+
+    assert !person.errors.invalid?(:usp_id)
+  end
+
+  should 'not allow person to be saved with a finished invitation that is not his own' do
+    t = Task.create!(:code => 87654321, :target_id => 1)
+    t.finish
+    person = Person.new(:environment => environment, :invitation_code => 87654321)
+    person.valid?
+
+    assert person.errors.invalid?(:usp_id)
+  end
+
+  should 'allow person to be saved with a finished invitation if it is his own' do
+    t = Task.create!(:code => 87654321)
+    user = User.new(:login => 'some-person', :email => 'some-person@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:environment => environment, :invitation_code => 87654321})
+    user.save!
+    person = user.person
+    t.target_id = person.id
+    t.finish
+
+    person.valid?
+    assert !person.errors.invalid?(:usp_id)
+  end
+
+
 end
  
@@ -8,6 +8,7 @@ class StoaPlugin::UspUserTest &lt; ActiveSupport::TestCase
     @db = Tempfile.new('stoa-test')
     configs = ActiveRecord::Base.configurations['stoa'] = {:adapter => 'sqlite3', :database => @db.path}
     ActiveRecord::Base.establish_connection(:stoa)
+    ActiveRecord::Schema.verbose = false
     ActiveRecord::Schema.create_table "pessoa" do |t|
       t.integer  "codpes"
       t.text     "numcpf"
@@ -57,4 +57,24 @@ class FriendsControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :content => 'Find people', :attributes => { :href => '/assets/people' }
   end
  
+  should 'not display invite friends button if any plugin tells not to' do
+    class Plugin1 < Noosfero::Plugin
+      def remove_invite_friends_button
+        true
+      end
+    end
+    class Plugin2 < Noosfero::Plugin
+      def remove_invite_friends_button
+        false
+      end
+    end
+
+    e = profile.environment
+    e.enable_plugin(Plugin1.name)
+    e.enable_plugin(Plugin2.name)
+
+    get :index, :profile => 'testuser'
+    assert_no_tag :tag => 'a', :attributes => { :href => "/profile/testuser/invite/friends" }
+  end
+
 end
@@ -1187,17 +1187,18 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !environment.errors.invalid?(:reports_lower_bound)
   end
  
-  should 'be able to enable or disable a plugin' do
+  should 'be able to enable or disable a plugin with the class or class name' do
+    class Plugin
+    end
     environment = Environment.default
-    plugin = 'Plugin'
  
-    environment.enable_plugin(plugin)
+    environment.enable_plugin(Plugin)
     environment.reload
-    assert_includes environment.enabled_plugins, plugin
+    assert environment.plugin_enabled?(Plugin.to_s)
  
-    environment.disable_plugin(plugin)
+    environment.disable_plugin(Plugin.to_s)
     environment.reload
-    assert_not_includes environment.enabled_plugins, plugin
+    assert !environment.plugin_enabled?(Plugin)
   end
  
   should 'have production costs' do
...	...	@@ -258,7 +258,7 @@ class Environment < ActiveRecord::Base
258	258	end
259	259
260	260	def enable_plugin(plugin)
261		- self.enabled_plugins += [plugin]
	261	+ self.enabled_plugins += [plugin.to_s]
262	262	self.enabled_plugins.uniq!
263	263	self.save!
264	264	end
...	...	@@ -269,7 +269,7 @@ class Environment < ActiveRecord::Base
269	269	end
270	270
271	271	def disable_plugin(plugin)
272		- self.enabled_plugins.delete(plugin)
	272	+ self.enabled_plugins.delete(plugin.to_s)
273	273	self.save!
274	274	end
275	275
...	...	@@ -278,6 +278,10 @@ class Environment < ActiveRecord::Base
278	278	self.settings["#{feature}_enabled".to_sym] == true
279	279	end
280	280
	281	+ def plugin_enabled?(plugin)
	282	+ enabled_plugins.include?(plugin.to_s)
	283	+ end
	284	+
281	285	# enables the features identified by <tt>features</tt>, which is expected to
282	286	# be an Enumarable object containing the identifiers of the desired features.
283	287	# Passing <tt>nil</tt> is the same as passing an empty Array.
...	...
...	...	@@ -14,7 +14,9 @@
14	14	<% button_bar do %>
15	15	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
16	16	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
17		- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
	17	+ <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
	18	+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
	19	+ <% end %>
18	20	<% end %>
19	21	<% end %>
20	22
...	...	@@ -43,7 +45,9 @@
43	45	<% button_bar do %>
44	46	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
45	47	<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
46		- <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
	48	+ <% if !@plugins.dispatch(:remove_invite_friends_button).include?(true) %>
	49	+ <%= button(:search, _('Invite people from my e-mail contacts'), :controller => 'invite', :action => 'select_address_book') %>
	50	+ <% end %>
47	51	<% end %>
48	52	<% end %>
49	53
...	...
...	...	@@ -244,4 +244,10 @@ class Noosfero::Plugin
244	244	nil
245	245	end
246	246
	247	+ # -> Removes the invite friend button from the friends controller
	248	+ # returns = boolean
	249	+ def remove_invite_friends_button
	250	+ nil
	251	+ end
	252	+
247	253	end
...	...
1	1	require_dependency 'person'
2	2
3	3	class Person
4		- validates_uniqueness_of :usp_id
	4	+ validates_uniqueness_of :usp_id, :allow_nil => true
	5	+ settings_items :invitation_code
	6	+ validate :usp_id_or_invitation, :if => lambda { \|person\| person.environment && person.environment.plugin_enabled?(StoaPlugin)}
	7	+
	8	+ def usp_id_or_invitation
	9	+ if usp_id.blank? && (invitation_code.blank? \|\| !invitation_task)
	10	+ errors.add(:usp_id, "can't register without usp_id or invitation")
	11	+ end
	12	+ end
	13	+
	14	+ def invitation_task
	15	+ Task.pending.find(:first, :conditions => {:code => invitation_code}) \|\|
	16	+ Task.finished.find(:first, :conditions => {:code => invitation_code, :target_id => id})
	17	+ end
5	18	end
...	...
...	...	@@ -20,6 +20,7 @@ class StoaPlugin < Noosfero::Plugin
20	20	def signup_extra_contents
21	21	lambda {
22	22	required(labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', '', :id => 'usp_id_field'))) +
	23	+ content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it in if you have one.'), :id => 'usp-id-balloon') +
23	24	content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))), :id => 'signup-birth-date', :style => 'display: none') +
24	25	content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))), :id => 'signup-cpf', :style => 'display:none') +
25	26	javascript_include_tag('../plugins/stoa/javascripts/jquery.observe_field', '../plugins/stoa/javascripts/signup_complement')
...	...	@@ -28,8 +29,10 @@ class StoaPlugin < Noosfero::Plugin
28	29
29	30	def account_controller_filters
30	31	block = lambda do
	32	+ params[:profile_data] \|\|= {}
	33	+ params[:profile_data][:invitation_code] = params[:invitation_code]
31	34	if request.post?
32		- if !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
	35	+ if !params[:invitation_code] && !StoaPlugin::UspUser.matches?(params[:profile_data][:usp_id], params[:confirmation_field], params[params[:confirmation_field]])
33	36	@person = Person.new
34	37	@person.errors.add(:usp_id, _(' validation failed'))
35	38	render :action => :signup
...	...	@@ -43,4 +46,21 @@ class StoaPlugin < Noosfero::Plugin
43	46	:block => block }]
44	47	end
45	48
	49	+ def invite_controller_filters
	50	+ [{ :type => 'before_filter',
	51	+ :method_name => 'check_usp_id_existence',
	52	+ :block => lambda {render_access_denied if profile.usp_id.blank?} }]
	53	+ end
	54	+
	55	+ def control_panel_buttons
	56	+ { :title => _('Invite friends'),
	57	+ :icon => 'invite-friends',
	58	+ :url => {:controller => 'invite',
	59	+ :action => 'select_address_book'} } if !context.profile.usp_id.blank?
	60	+ end
	61	+
	62	+ def remove_invite_friends_button
	63	+ true
	64	+ end
	65	+
46	66	end
...	...
...	...	@@ -23,14 +23,22 @@ jQuery("#usp_id_field").observe_field(1, function(){
23	23	});
24	24	}
25	25	else {
26		- jQuery('#signup-form .submit').attr('disabled', true);
	26	+ jQuery(me).removeClass('checking');
	27	+ if(me.value) {
	28	+ jQuery('#signup-form .submit').attr('disabled', true);
	29	+ jQuery(me).addClass('invalid');
	30	+ }
	31	+ else {
	32	+ jQuery('#signup-form .submit').attr('disabled', false);
	33	+ jQuery(me).removeClass('invalid');
	34	+ jQuery(me).removeClass('validated');
	35	+ }
27	36	jQuery('#signup-birth-date').hide();
28	37	jQuery('#signup-cpf').hide();
29		- jQuery(me).removeClass('checking').addClass('invalid');
30	38	}
31	39	if(data.error) displayValidationUspIdError(data.error);
32	40	}
33		-);
	41	+ );
34	42	});
35	43
36	44	function displayValidationUspIdError(error){
...	...	@@ -39,3 +47,8 @@ function displayValidationUspIdError(error){
39	47	width: "70%" });
40	48	}
41	49
	50	+jQuery('#usp_id_field').focus(function() {
	51	+ jQuery('#usp-id-balloon').fadeIn('slow');
	52	+});
	53	+
	54	+jQuery('#usp_id_field').blur(function() { jQuery('#usp-id-balloon').fadeOut('slow'); });
...	...
...	...	@@ -10,3 +10,22 @@
10	10	cursor: default;
11	11	}
12	12
	13	+.controller-profile_editor a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.png)}
	14	+.controller-profile_editor .msie6 a.control-panel-invite-friends {background-image: url(../../plugins/stoa/images/control-panel/invite-friends.gif)}
	15	+
	16	+#signup-form small#usp-id-balloon {
	17	+ display: none;
	18	+ width: 142px;
	19	+ height: 69px;
	20	+ color: #FFFFFF;
	21	+ font-weight: bold;
	22	+ font-size: 11px;
	23	+ padding: 5px 10px 45px 10px;
	24	+ margin: 0;
	25	+ line-height: 1.5em;
	26	+ background: transparent url(/images/orange-balloon.png) bottom center no-repeat;
	27	+ position: absolute;
	28	+ z-index: 2;
	29	+ right: 20px;
	30	+ bottom: 110px;
	31	+}
...	...
...	...	@@ -38,4 +38,9 @@ class AccountControllerTest < ActionController::TestCase
38	38	assert_nil assigns(:person).errors[:usp_id]
39	39	end
40	40
	41	+ should 'inlude invitation_code param in the person\'s attributes' do
	42	+ get :signup, :invitation_code => 12345678
	43	+ assert assigns(:person).invitation_code == '12345678'
	44	+ end
	45	+
41	46	end
...	...
...	...	@@ -0,0 +1,40 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/test_helper'
	2	+require File.dirname(__FILE__) + '/../../../../app/controllers/public/invite_controller'
	3	+
	4	+# Re-raise errors caught by the controller.
	5	+class InviteController; def rescue_action(e) raise e end; end
	6	+
	7	+class InviteControllerTest < ActionController::TestCase
	8	+
	9	+ def setup
	10	+ @controller = InviteController.new
	11	+ @request = ActionController::TestRequest.new
	12	+ @response = ActionController::TestResponse.new
	13	+ environment = Environment.default
	14	+ environment.enabled_plugins = ['StoaPlugin']
	15	+ environment.save!
	16	+ end
	17	+
	18	+ should 'not enable access to invitation if the user has not an usp_id' do
	19	+ Task.create!(:code => 12345678)
	20	+ person_without_usp_id = User.create!(:login => 'user-without', :email => 'user-without@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:invitation_code => 12345678}).person
	21	+
	22	+ login_as(person_without_usp_id.identifier)
	23	+ get :select_address_book, :profile => person_without_usp_id.identifier
	24	+ assert_response 403
	25	+ get :select_friends, :profile => person_without_usp_id.identifier
	26	+ assert_response 403
	27	+ end
	28	+
	29	+ should 'enable access to invitation if the user has an usp_id' do
	30	+ person_with_usp_id = User.create!(:login => 'user-with', :email => 'user-with@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:usp_id => 12345678}).person
	31	+
	32	+ login_as(person_with_usp_id.identifier)
	33	+ get :select_address_book, :profile => person_with_usp_id.identifier
	34	+ assert_response 200
	35	+ get :select_friends, :profile => person_with_usp_id.identifier, :contact_list => ContactList.create.id
	36	+ assert_response 200
	37	+ end
	38	+
	39	+end
	40	+
...	...
...	...	@@ -2,16 +2,64 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper'
2	2
3	3	class StoaPlugin::Person < ActiveSupport::TestCase
4	4
	5	+ def setup
	6	+ @environment = Environment.default
	7	+ @environment.enable_plugin(StoaPlugin)
	8	+ end
	9	+
	10	+ attr_reader :environment
	11	+
5	12	should 'validates uniqueness of usp_id' do
6		- usp_id = 12345678
7		- person = create_user('some-person').person
8		- person.usp_id = usp_id
9		- person.save!
10		- another_person = Person.new(:name => "Another person", :identifier => 'another-person', :usp_id => usp_id)
	13	+ usp_id = 87654321
	14	+ fast_create(Person, :usp_id => usp_id)
	15	+ another_person = Person.new(:usp_id => usp_id)
	16	+ another_person.valid?
11	17
12		- assert !another_person.valid?
13	18	assert another_person.errors.invalid?(:usp_id)
14	19	end
15	20
	21	+ should 'allow nil usp_id only if person has an invitation_code' do
	22	+ person = Person.new(:environment => environment)
	23	+ person.valid?
	24	+ assert person.errors.invalid?(:usp_id)
	25	+
	26	+ Task.create!(:code => 12345678)
	27	+ person.invitation_code = 12345678
	28	+ person.valid?
	29	+
	30	+ assert !person.errors.invalid?(:usp_id)
	31	+ end
	32	+
	33	+ should 'allow multiple nil usp_id' do
	34	+ fast_create(Person)
	35	+ Task.create!(:code => 87654321)
	36	+ person = Person.new(:invitation_code => 87654321)
	37	+ person.valid?
	38	+
	39	+ assert !person.errors.invalid?(:usp_id)
	40	+ end
	41	+
	42	+ should 'not allow person to be saved with a finished invitation that is not his own' do
	43	+ t = Task.create!(:code => 87654321, :target_id => 1)
	44	+ t.finish
	45	+ person = Person.new(:environment => environment, :invitation_code => 87654321)
	46	+ person.valid?
	47	+
	48	+ assert person.errors.invalid?(:usp_id)
	49	+ end
	50	+
	51	+ should 'allow person to be saved with a finished invitation if it is his own' do
	52	+ t = Task.create!(:code => 87654321)
	53	+ user = User.new(:login => 'some-person', :email => 'some-person@example.com', :password => 'test', :password_confirmation => 'test', :person_data => {:environment => environment, :invitation_code => 87654321})
	54	+ user.save!
	55	+ person = user.person
	56	+ t.target_id = person.id
	57	+ t.finish
	58	+
	59	+ person.valid?
	60	+ assert !person.errors.invalid?(:usp_id)
	61	+ end
	62	+
	63	+
16	64	end
17	65
...	...