Download as
Browse Code »

Commit ed778922b32c16a74a5fdd68b5b182a6da6ef43f

Authored by AntonioTerceiro
1 parent 6d5d8056
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem519: making tests reference the new login button 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2343 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 30 additions and 12 deletions   Show diff stats
test/integration/login_to_the_application_test.rb
  Diff comments   View file @ed77892
@@ -5,15 +5,16 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest @@ -5,15 +5,16 @@ class LoginToTheApplicationTest < ActionController::IntegrationTest
5 5
6 def test_anonymous_user_logins_to_application 6 def test_anonymous_user_logins_to_application
7 get '/' 7 get '/'
8 - assert_tag :tag => 'a', :attributes => { :href => '/account/login_popup' }  
9 - assert_no_tag :tag => 'a', :attributes => { :href => '/account/logout' } 8 +
  9 + assert_can_login
  10 + assert_cannot_logout
10 11
11 get '/account/login_popup' 12 get '/account/login_popup'
12 assert_response :success 13 assert_response :success
13 14
14 login('ze', 'test') 15 login('ze', 'test')
15 - assert_no_tag :tag => 'a', :attributes => { :href => '/account/login_popup' }  
16 - assert_tag :tag => 'a', :attributes => { :href => '/account/logout' } 16 + assert_cannot_login
  17 + assert_can_logout
17 18
18 end 19 end
19 20
test/integration/user_registers_at_the_application_test.rb
  Diff comments   View file @ed77892
@@ -5,10 +5,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest @@ -5,10 +5,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
5 5
6 def test_successfull_registration 6 def test_successfull_registration
7 get '/' 7 get '/'
8 - assert_tag :tag => 'a', :attributes => { :href => '/account/login_popup' }  
9 -  
10 - get '/account/login_popup'  
11 - assert_tag :tag => 'a', :attributes => { :href => '/account/signup'} 8 + assert_can_login
  9 + assert_can_signup
12 10
13 get '/account/signup' 11 get '/account/signup'
14 assert_response :success 12 assert_response :success
@@ -28,10 +26,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest @@ -28,10 +26,8 @@ class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
28 assert User.find_by_login('ze') # just to make sure that 'ze' already exists 26 assert User.find_by_login('ze') # just to make sure that 'ze' already exists
29 27
30 get '/' 28 get '/'
31 - assert_tag :tag => 'a', :attributes => { :href => '/account/login_popup'}  
32 -  
33 - get '/account/login_popup'  
34 - assert_tag :tag => 'a', :attributes => { :href => '/account/signup'} 29 + assert_can_login
  30 + assert_can_signup
35 31
36 get '/account/signup' 32 get '/account/signup'
37 assert_response :success 33 assert_response :success
test/test_helper.rb
  Diff comments   View file @ed77892
@@ -214,6 +214,27 @@ class Test::Unit::TestCase @@ -214,6 +214,27 @@ class Test::Unit::TestCase
214 end 214 end
215 215
216 class ActionController::IntegrationTest 216 class ActionController::IntegrationTest
  217 + def assert_can_login
  218 + assert_tag :tag => 'a', :attributes => { :id => 'link_login' }
  219 + end
  220 +
  221 + def assert_can_signup
  222 + assert_tag :tag => 'a', :attributes => { :href => '/account/signup'}
  223 + end
  224 +
  225 + def assert_cannot_logout
  226 + assert_no_tag :tag => 'a', :attributes => { :href => '/account/logout' }
  227 + end
  228 +
  229 + def assert_cannot_login
  230 + assert_no_tag :tag => 'a', :attributes => { :id => 'link_login' }
  231 + end
  232 +
  233 + def assert_can_logout
  234 + assert_tag :tag => 'a', :attributes => { :href => '/account/logout' }
  235 + end
  236 +
  237 +
217 def login(username, password) 238 def login(username, password)
218 post '/account/login', :user => { :login => username, :password => password } 239 post '/account/login', :user => { :login => username, :password => password }
219 assert_response :redirect 240 assert_response :redirect