ActionItem1125: only authenticated users can enable enterprises

* moved box "enterprise activation" to control panel * require login to activate enterprise

ActionItem1125: only authenticated users can enable enterprises
* moved box "enterprise activation" to control panel * require login to activate enterprise
Daniela Feitosa · Antonio Terceiro
1 parent e090a2b4
Showing 7 changed files with 119 additions and 127 deletions Show diff stats
app/controllers/public/account_controller.rb
app/views/account/activation_question.rhtml
app/views/home/index.rhtml
app/views/profile_editor/index.rhtml
test/functional/account_controller_test.rb
test/functional/home_controller_test.rb
test/functional/profile_editor_controller_test.rb
@@ -4,6 +4,8 @@ class AccountController &lt; ApplicationController
   require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
+  before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
+
   # say something nice, you goof!  something sweet.
   def index
     unless logged_in?
@@ -181,22 +183,6 @@ class AccountController &lt; ApplicationController
   def accept_terms
     @enterprise = load_enterprise
     @question = @enterprise.question
-
-    if @enterprise.enabled
-      render :action => 'already_activated'
-      return
-    end
-
-    @question = @enterprise.question
-    if !@question || @enterprise.blocked?
-      render :action => 'blocked'
-      return
-    end
-  end
-
-  def accept_terms
-    @enterprise = load_enterprise
-    @question = @enterprise.question
     if !@question || @enterprise.blocked?
       render :action => 'blocked'
       return
@@ -212,7 +198,6 @@ class AccountController &lt; ApplicationController
     @question = @enterprise.question
     return unless check_answer
     return unless check_acceptance_of_terms
-    load_user
     activation = load_enterprise_activation
     if activation && user
@@ -253,18 +238,6 @@ class AccountController &lt; ApplicationController
     @cannot_redirect = true
   end
-  def load_user
-    unless logged_in?
-      no_redirect
-      if params[:new_user]
-        signup
-      else
-        login
-      end
-    end
-    true
-  end
-
   def check_answer
     unless answer_correct
       @enterprise.block
@@ -28,7 +28,7 @@
   <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
-  <p><%= _("This is a question to know if you is really part of this enterprise. Pay atention because you has only one chance to answer rigth and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+  <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
   <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>
@@ -47,18 +47,6 @@
   <%= environment.description %>
 <% end %>
-<% if environment.enabled?('enterprise_activation') %>
-
-    <div id='activation_enterprise'>
-    <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
-      <p><strong><%= __('Activate your enterprise') %></strong></p>
-      <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
-      <%= submit_button(:ok, _('Activate')) %>
-    <% end %>
-  </div>
-
-<% end %>
-
 <% if environment.enabled?('search_in_home') %>
   <div id='home-search' style='text-align: center'>
     <% form_tag :controller => 'search', :action => 'index' do %>
@@ -60,8 +60,19 @@
   <% end %>
   <%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
-
 <% end %>
+  <% if environment.enabled?('enterprise_activation') %>
+
+      <div id='activation_enterprise'>
+      <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
+        <p><strong><%= __('Activate your enterprise') %></strong></p>
+        <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %> </p>
+        <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
+        <%= submit_button(:ok, _('Activate')) %>
+      <% end %>
+    </div>
+
+  <% end %>
 </div>
@@ -332,7 +332,16 @@ class AccountControllerTest &lt; Test::Unit::TestCase
 #                              #
 ################################
+  should 'require login for validation question' do
+    get :activation_question, :enterprise_code => 'some_code'
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
   should 'report invalid enterprise code on signup' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     EnterpriseActivation.expects(:find_by_code).with('some_invalid_code').returns(nil).at_least_once
     get :activation_question, :enterprise_code => 'some_invalid_code'
@@ -341,6 +350,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'report enterprise already enabled' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :cnpj => '0'*14, :enabled => true)
     task = mock
     task.expects(:enterprise).returns(ent).at_least_once
@@ -352,6 +364,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'load enterprise from code on for validation question' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent')
     task = mock
@@ -364,6 +379,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'block enterprises that do not have foundation_year or cnpj' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :enabled => false)
     task = mock
@@ -376,6 +394,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'show form to those enterprises that have foundation year' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
     task = mock
@@ -388,6 +409,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'show form to those enterprises that have cnpj' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :cnpj => '0'*14, :enabled => false)
     task = mock
@@ -400,6 +424,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'block those who are blocked' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => '1998', :enabled => false)
     ent.block
@@ -412,7 +439,37 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_template 'blocked'
   end
+  should 'put hidden field with enterprise code for answering question' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
+    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
+
+    task = mock
+    task.expects(:enterprise).returns(ent).at_least_once
+    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
+
+    get :activation_question, :enterprise_code => '0123456789'
+
+    assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}
+  end
+
+  should 'require login for accept terms' do
+    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
+
+    task = mock
+    task.expects(:enterprise).returns(ent).never
+    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).never
+
+    post :accept_terms, :enterprise_code => '0123456789', :answer => '1998'
+
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
   should 'block those who failed to answer the question' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
     task = mock
@@ -429,6 +486,9 @@ class AccountControllerTest &lt; Test::Unit::TestCase
   end
   should 'show terms of use for enterprise owners' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     env = Environment.default
     env.terms_of_enterprise_use = 'Some terms'
     env.save!
@@ -443,32 +503,37 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'div', :content => 'Some terms'
   end
-  should 'not activate if user does not accept terms' do
+  should 'block who is blocked but directly arrive in the second step' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
-    p = create_user('test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com').person
-    login_as(p.identifier)
+    ent.block
+    ent.save
-    task = EnterpriseActivation.create!(:enterprise => ent)
+    task = mock
+    task.expects(:enterprise).returns(ent).at_least_once
     EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => false
-    ent.reload
+    get :accept_terms, :enterprise_code => '0123456789', :answer => 1998
-    assert !ent.enabled
-    assert_not_includes ent.members, p
+    assert_template 'blocked'
   end
-  should 'ask for login or singup if not logged in' do
+  should 'require login to activate enterprise' do
+    env = Environment.default
+    env.terms_of_use = 'some terms'
+    env.save!
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
     task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
+    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).never
     post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
-    assert_template 'activate_enterprise'
+    assert_redirected_to :controller => 'account', :action => 'login'
   end
-  should 'activate enterprise and make logged user admin' do
+  should 'not activate if user does not accept terms' do
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
     p = create_user('test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com').person
     login_as(p.identifier)
@@ -476,78 +541,32 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     task = EnterpriseActivation.create!(:enterprise => ent)
     EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
-    ent.reload
-
-    assert ent.enabled
-    assert_includes ent.members, p
-  end
-
-  should 'not activate enterprise for inexistent user' do
-    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-
-    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true, :user => { :login => 'inexistent_user', :password => 'inexistent_password' }
+    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => false
     ent.reload
     assert !ent.enabled
+    assert_not_includes ent.members, p
   end
-  should 'activate enterprise and make unlogged user admin' do
+  should 'activate enterprise and make logged user admin' do
     ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
     p = create_user('test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com').person
+    login_as(p.identifier)
     task = EnterpriseActivation.create!(:enterprise => ent)
     EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true, :user => { :login => 'test_user', :password => 'blih' }
+    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true
     ent.reload
     assert ent.enabled
     assert_includes ent.members, p
   end
-  should 'activate enterprise, create user and make admin' do
-    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
-
-    task = EnterpriseActivation.create!(:enterprise => ent)
-    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-
-    post :activate_enterprise, :enterprise_code => '0123456789', :answer => '1998', :terms_accepted => true, :new_user => true, :user => { :login => 'test_user', :password => 'blih', :password_confirmation => 'blih', :email => 'test@noosfero.com' }, :profile_data => person_data
-    ent.reload
-
-    assert ent.enabled
-    assert_includes ent.members.map(&:identifier), 'test_user'
-  end
-
-  should 'put hidden field with enterprise code for answering question' do
-    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-
-    get :activation_question, :enterprise_code => '0123456789'
-
-    assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'enterprise_code', :value => '0123456789'}
-  end
-
-  should 'block who is blocked but directly arrive in the second step' do
-    ent = Enterprise.create!(:name => 'test enterprise', :identifier => 'test_ent', :foundation_year => 1998, :enabled => false)
-    ent.block
-    ent.save
-
-    task = mock
-    task.expects(:enterprise).returns(ent).at_least_once
-    EnterpriseActivation.expects(:find_by_code).with('0123456789').returns(task).at_least_once
-
-    get :accept_terms, :enterprise_code => '0123456789', :answer => 1998
-
-    assert_template 'blocked'
-  end
-
   should 'load terms of use for users when creating new users as activate enterprise' do
+    person = create_user('mylogin').person
+    login_as(person.identifier)
+
     env = Environment.default
     env.terms_of_use = 'some terms' 
     env.save!
@@ -22,24 +22,6 @@ all_fixtures
     assert_valid_xhtml
   end
-  should 'not display form for enterprise activation if disabled in environment' do
-    env = Environment.default
-    env.disable('enterprise_activation')
-    env.save!
-
-    get :index
-    assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
-  end
-
-  should 'display form for enterprise activation if enabled on environment' do
-    env = Environment.default
-    env.enable('enterprise_activation')
-    env.save!
-
-    get :index
-    assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
-  end
-
   should 'not display news from portal if disabled in environment' do
     env = Environment.default
     env.disable('use_portal_community')
@@ -694,4 +694,23 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
     assert_template 'edit'
   end
+  should 'not display form for enterprise activation if disabled in environment' do
+    env = Environment.default
+    env.disable('enterprise_activation')
+    env.save!
+
+    get :index, :profile => profile.identifier
+    assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
+  end
+
+  should 'display form for enterprise activation if enabled on environment' do
+    env = Environment.default
+    env.enable('enterprise_activation')
+    env.save!
+
+    get :index, :profile => profile.identifier
+    assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
+  end
+
+
 end
	@@ -4,6 +4,8 @@ class AccountController < ApplicationController		@@ -4,6 +4,8 @@ class AccountController < ApplicationController
4		4
5	require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]	5	require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
6		6
		7	+ before_filter :login_required, :only => [:activation_question, :accept_terms, :activate_enterprise]
		8	+
7	# say something nice, you goof! something sweet.	9	# say something nice, you goof! something sweet.
8	def index	10	def index
9	unless logged_in?	11	unless logged_in?
	@@ -181,22 +183,6 @@ class AccountController < ApplicationController		@@ -181,22 +183,6 @@ class AccountController < ApplicationController
181	def accept_terms	183	def accept_terms
182	@enterprise = load_enterprise	184	@enterprise = load_enterprise
183	@question = @enterprise.question	185	@question = @enterprise.question
184	-
185	- if @enterprise.enabled
186	- render :action => 'already_activated'
187	- return
188	- end
189	-
190	- @question = @enterprise.question
191	- if !@question \|\| @enterprise.blocked?
192	- render :action => 'blocked'
193	- return
194	- end
195	- end
196	-
197	- def accept_terms
198	- @enterprise = load_enterprise
199	- @question = @enterprise.question
200	if !@question \|\| @enterprise.blocked?	186	if !@question \|\| @enterprise.blocked?
201	render :action => 'blocked'	187	render :action => 'blocked'
202	return	188	return
	@@ -212,7 +198,6 @@ class AccountController < ApplicationController		@@ -212,7 +198,6 @@ class AccountController < ApplicationController
212	@question = @enterprise.question	198	@question = @enterprise.question
213	return unless check_answer	199	return unless check_answer
214	return unless check_acceptance_of_terms	200	return unless check_acceptance_of_terms
215	- load_user
216		201
217	activation = load_enterprise_activation	202	activation = load_enterprise_activation
218	if activation && user	203	if activation && user
	@@ -253,18 +238,6 @@ class AccountController < ApplicationController		@@ -253,18 +238,6 @@ class AccountController < ApplicationController
253	@cannot_redirect = true	238	@cannot_redirect = true
254	end	239	end
255		240
256	- def load_user
257	- unless logged_in?
258	- no_redirect
259	- if params[:new_user]
260	- signup
261	- else
262	- login
263	- end
264	- end
265	- true
266	- end
267	-
268	def check_answer	241	def check_answer
269	unless answer_correct	242	unless answer_correct
270	@enterprise.block	243	@enterprise.block
	@@ -28,7 +28,7 @@		@@ -28,7 +28,7 @@
28		28
29	<p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>	29	<p> <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
30		30
31	- <p><%= _("This is a question to know if you is really part of this enterprise. Pay atention because you has only one chance to answer rigth and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>	31	+ <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
32		32
33	<%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>	33	<%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? _('What year your enterprise was founded?') : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer', :help => help=_('We need to be sure that this is your enterprise'))) %>
34		34
	@@ -47,18 +47,6 @@		@@ -47,18 +47,6 @@
47	<%= environment.description %>	47	<%= environment.description %>
48	<% end %>	48	<% end %>
49		49
50	-<% if environment.enabled?('enterprise_activation') %>
51	-
52	- <div id='activation_enterprise'>
53	- <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
54	- <p><strong><%= __('Activate your enterprise') %></strong></p>
55	- <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
56	- <%= submit_button(:ok, _('Activate')) %>
57	- <% end %>
58	- </div>
59	-
60	-<% end %>
61	-
62	<% if environment.enabled?('search_in_home') %>	50	<% if environment.enabled?('search_in_home') %>
63	<div id='home-search' style='text-align: center'>	51	<div id='home-search' style='text-align: center'>
64	<% form_tag :controller => 'search', :action => 'index' do %>	52	<% form_tag :controller => 'search', :action => 'index' do %>
	@@ -60,8 +60,19 @@		@@ -60,8 +60,19 @@
60	<% end %>	60	<% end %>
61		61
62	<%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>	62	<%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
63	-
64	<% end %>	63	<% end %>
65		64
		65	+ <% if environment.enabled?('enterprise_activation') %>
		66	+
		67	+ <div id='activation_enterprise'>
		68	+ <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
		69	+ <p><strong><%= __('Activate your enterprise') %></strong></p>
		70	+ <p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %> </p>
		71	+ <%= labelled_form_field(__('Enterprise activation code') + ':', text_field_tag('enterprise_code')) %>
		72	+ <%= submit_button(:ok, _('Activate')) %>
		73	+ <% end %>
		74	+ </div>
		75	+
		76	+ <% end %>
66		77
67	</div>	78	</div>
	@@ -22,24 +22,6 @@ all_fixtures		@@ -22,24 +22,6 @@ all_fixtures
22	assert_valid_xhtml	22	assert_valid_xhtml
23	end	23	end
24		24
25	- should 'not display form for enterprise activation if disabled in environment' do
26	- env = Environment.default
27	- env.disable('enterprise_activation')
28	- env.save!
29	-
30	- get :index
31	- assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
32	- end
33	-
34	- should 'display form for enterprise activation if enabled on environment' do
35	- env = Environment.default
36	- env.enable('enterprise_activation')
37	- env.save!
38	-
39	- get :index
40	- assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
41	- end
42	-
43	should 'not display news from portal if disabled in environment' do	25	should 'not display news from portal if disabled in environment' do
44	env = Environment.default	26	env = Environment.default
45	env.disable('use_portal_community')	27	env.disable('use_portal_community')
	@@ -694,4 +694,23 @@ class ProfileEditorControllerTest < Test::Unit::TestCase		@@ -694,4 +694,23 @@ class ProfileEditorControllerTest < Test::Unit::TestCase
694	assert_template 'edit'	694	assert_template 'edit'
695	end	695	end
696		696
		697	+ should 'not display form for enterprise activation if disabled in environment' do
		698	+ env = Environment.default
		699	+ env.disable('enterprise_activation')
		700	+ env.save!
		701	+
		702	+ get :index, :profile => profile.identifier
		703	+ assert_no_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
		704	+ end
		705	+
		706	+ should 'display form for enterprise activation if enabled on environment' do
		707	+ env = Environment.default
		708	+ env.enable('enterprise_activation')
		709	+ env.save!
		710	+
		711	+ get :index, :profile => profile.identifier
		712	+ assert_tag :tag => 'div', :attributes => { :id => 'activation_enterprise' }, :descendant => {:tag => 'form', :attributes => {:action => '/account/activation_question'}}
		713	+ end
		714	+
		715	+
697	end	716	end