ActionItem9: adding tests and minor refactoring in account_controller

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@192 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem9: adding tests and minor refactoring in account_controller
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@192 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent a0b41878
Showing 4 changed files with 41 additions and 11 deletions Show diff stats
app/controllers/account_controller.rb
app/helpers/application_helper.rb
test/integration/enable_disable_features_test.rb
test/integration/login_to_the_application_test.rb
@@ -23,14 +23,16 @@ class AccountController &lt; ApplicationController
   end
   def signup
-    @user = User.new(params[:user])
-    return unless request.post?
-    @user.save!
-    self.current_user = @user
-    redirect_back_or_default(:controller => '/account', :action => 'index')
-    flash[:notice] = _("Thanks for signing up!")
-  rescue ActiveRecord::RecordInvalid
-    render :action => 'signup'
+    begin
+      @user = User.new(params[:user])
+      return unless request.post?
+      @user.save!
+      self.current_user = @user
+      redirect_back_or_default(:controller => '/account', :action => 'index')
+      flash[:notice] = _("Thanks for signing up!")
+    rescue ActiveRecord::RecordInvalid
+      render :action => 'signup'
+    end
   end
   def logout
@@ -92,13 +92,29 @@ module ApplicationHelper
   end
   def header
-    virtual_community_identification + (logged_in? ? user_links : login_box)
+    virtual_community_identification + login_or_register_or_logout
+  end
+
+  def login_or_register_or_logout
+    if logged_in?
+      user_links + logout_box
+    else
+      login_box + register_box
+    end
   end
   def login_box
     content_tag('div', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box')
   end
+  def register_box
+    content_tag('div', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box')
+  end
+
+  def logout_box
+    content_tag('div', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box')
+  end
+
   # FIXME
   def footer
     'nothing in the footer yet'
 require "#{File.dirname(__FILE__)}/../test_helper"
 class EnableDisableFeaturesTest < ActionController::IntegrationTest
-  fixtures :virtual_communities, :users, :profiles
+  fixtures :domains, :virtual_communities, :users, :profiles
   def test_enable_features
     uses_host 'anhetegua.net'
@@ -3,17 +3,29 @@ require &quot;#{File.dirname(__FILE__)}/../test_helper&quot;
 class LoginToTheApplicationTest < ActionController::IntegrationTest
   fixtures :users, :virtual_communities, :profiles
-  def test_anonymous_sees_login_box
+  def test_anonymous_user_logins_to_application
     get '/'
     assert_tag :tag => 'div', :attributes => { :id => 'login_box' }
     assert_no_tag :tag => 'div', :attributes => { :id => 'user_links'  }
+    assert_no_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
+
+    get '/account/login'
+    assert_response :success
+
+    login('ze', 'test')
+
+    assert_no_tag :tag => 'div', :attributes => { :id => 'login_box' }
+    assert_tag :tag => 'div', :attributes => { :id => 'user_links'  }
+    assert_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
   end
   def test_logged_in_does_not_see_login_box
     login('ze', 'test')
     get '/'
     assert_no_tag :tag => 'div', :attributes => { :id => 'login_box' }
+    assert_no_tag :tag => 'div', :attributes => { :id => 'register_box' }
     assert_tag :tag => 'div', :attributes => { :id => 'user_links'  }
+    assert_tag :tag => 'div', :attributes => { :id => 'logout_box'  }
   end
 end
	@@ -92,13 +92,29 @@ module ApplicationHelper		@@ -92,13 +92,29 @@ module ApplicationHelper
92	end	92	end
93		93
94	def header	94	def header
95	- virtual_community_identification + (logged_in? ? user_links : login_box)	95	+ virtual_community_identification + login_or_register_or_logout
		96	+ end
		97	+
		98	+ def login_or_register_or_logout
		99	+ if logged_in?
		100	+ user_links + logout_box
		101	+ else
		102	+ login_box + register_box
		103	+ end
96	end	104	end
97		105
98	def login_box	106	def login_box
99	content_tag('div', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box')	107	content_tag('div', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box')
100	end	108	end
101		109
		110	+ def register_box
		111	+ content_tag('div', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box')
		112	+ end
		113	+
		114	+ def logout_box
		115	+ content_tag('div', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box')
		116	+ end
		117	+
102	# FIXME	118	# FIXME
103	def footer	119	def footer
104	'nothing in the footer yet'	120	'nothing in the footer yet'
1	require "#{File.dirname(__FILE__)}/../test_helper"	1	require "#{File.dirname(__FILE__)}/../test_helper"
2		2
3	class EnableDisableFeaturesTest < ActionController::IntegrationTest	3	class EnableDisableFeaturesTest < ActionController::IntegrationTest
4	- fixtures :virtual_communities, :users, :profiles	4	+ fixtures :domains, :virtual_communities, :users, :profiles
5		5
6	def test_enable_features	6	def test_enable_features
7	uses_host 'anhetegua.net'	7	uses_host 'anhetegua.net'