Download as
Browse Code »

Commit 3fc5784bf2193ad81ccc068014461dbbfc550379

Authored by Daniela Feitosa
Committed by Rafael Martins
1 parent 511a0c1b
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

Fixed unit and functionals

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @3fc5784
@@ -114,6 +114,7 @@ class Article < ActiveRecord::Base @@ -114,6 +114,7 @@ class Article < ActiveRecord::Base
114 ids.uniq.each do |item| 114 ids.uniq.each do |item|
115 add_category(Category.find(item)) unless item.to_i.zero? 115 add_category(Category.find(item)) unless item.to_i.zero?
116 end 116 end
  117 + self.categories(true)
117 end 118 end
118 119
119 after_create :create_pending_categorizations 120 after_create :create_pending_categorizations
test/functional/enterprise_registration_controller_test.rb
  Diff comments   View file @3fc5784
@@ -52,7 +52,7 @@ all_fixtures @@ -52,7 +52,7 @@ all_fixtures
52 env = Environment.default 52 env = Environment.default
53 env.organization_approval_method = :none 53 env.organization_approval_method = :none
54 env.save 54 env.save
55 - region = fast_create(Region) 55 + region = fast_create(Region, {}, :search => true)
56 56
57 data = { :name => 'My new enterprise', :identifier => 'mynew', :region => region } 57 data = { :name => 'My new enterprise', :identifier => 'mynew', :region => region }
58 create_enterprise = CreateEnterprise.new(data) 58 create_enterprise = CreateEnterprise.new(data)
test/unit/article_test.rb
  Diff comments   View file @3fc5784
@@ -1562,10 +1562,10 @@ class ArticleTest < ActiveSupport::TestCase @@ -1562,10 +1562,10 @@ class ArticleTest < ActiveSupport::TestCase
1562 end 1562 end
1563 1563
1564 should 'survive to a invalid src attribute while looking for images in body' do 1564 should 'survive to a invalid src attribute while looking for images in body' do
1565 - domain = Environment.default.domains.first.name 1565 + domain = Environment.default.domains.first || Domain.new(:name => 'localhost')
1566 article = Article.new(:body => "An article with invalid src in img tag <img src='path with spaces.png' />", :profile => @profile) 1566 article = Article.new(:body => "An article with invalid src in img tag <img src='path with spaces.png' />", :profile => @profile)
1567 assert_nothing_raised URI::InvalidURIError do 1567 assert_nothing_raised URI::InvalidURIError do
1568 - assert_equal ["http://#{domain}/path%20with%20spaces.png"], article.body_images_paths 1568 + assert_equal ["http://#{domain.name}/path%20with%20spaces.png"], article.body_images_paths
1569 end 1569 end
1570 end 1570 end
1571 1571