Download as
Browse Code »

Commit 6c8063ab31cfcb38e0c1dfcd6e38293d04079bbc

Authored by Antonio Terceiro
1 parent 8d0004fb
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1049: fixing tests

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/models/article_block.rb
  Diff comments   View file @6c8063a
... ... @@ -17,7 +17,7 @@ class ArticleBlock < Block
17 17 end
18 18  
19 19 def article_id= value
20   - self.settings[:article_id] = value.to_i
  20 + self.settings[:article_id] = value.blank? ? nil : value.to_i
21 21 end
22 22  
23 23 def article(reload = false)
... ...
test/functional/profile_controller_test.rb
  Diff comments   View file @6c8063a
... ... @@ -135,7 +135,7 @@ class ProfileControllerTest < Test::Unit::TestCase
135 135 should 'show friends link to person' do
136 136 person = create_user('person_1').person
137 137 get :index, :profile => person.identifier
138   - assert_tag :tag => 'a', :content => 'Friends', :attributes => { :href => /profile\/#{person.identifier}\/friends$/ }
  138 + assert_tag :tag => 'a', :content => /Friends/, :attributes => { :href => /profile\/#{person.identifier}\/friends$/ }
139 139 end
140 140  
141 141 should 'not show homepage and feed automatically created on recent content' do
... ... @@ -336,7 +336,7 @@ class ProfileControllerTest < Test::Unit::TestCase
336 336 login_as 'tusr1'
337 337  
338 338 get :index, :profile => 'tusr2'
339   - assert_tag :content => /t2@t2.com/
  339 + assert_tag :content => /t2.*t2.com/
340 340 end
341 341  
342 342 should 'not show e-mail for non friends on profile page' do
... ...