Download as
Browse Code »

Commit d3284d42bd5e2dcac61de961f43cb0a7ea739720

Authored by Rodrigo Souto
1 parent a46ca8c8
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

rails3: fix folder tests 

PS: still failing test because xss_terminate is stripping html comments
now.
Showing 1 changed file with 8 additions and 8 deletions   Show diff stats
test/unit/folder_test.rb
  Diff comments   View file @d3284d4
@@ -31,8 +31,8 @@ class FolderTest < ActiveSupport::TestCase @@ -31,8 +31,8 @@ class FolderTest < ActiveSupport::TestCase
31 should 'have images that are only images or other folders' do 31 should 'have images that are only images or other folders' do
32 p = create_user('test_user').person 32 p = create_user('test_user').person
33 f = fast_create(Folder, :profile_id => p.id) 33 f = fast_create(Folder, :profile_id => p.id)
34 - file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :parent => f, :profile => p)  
35 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 34 + file = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :parent => f, :profile => p)
  35 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
36 folder = fast_create(Folder, :profile_id => p.id, :parent_id => f.id) 36 folder = fast_create(Folder, :profile_id => p.id, :parent_id => f.id)
37 37
38 assert_equivalent [folder, image], f.images 38 assert_equivalent [folder, image], f.images
@@ -42,7 +42,7 @@ class FolderTest < ActiveSupport::TestCase @@ -42,7 +42,7 @@ class FolderTest < ActiveSupport::TestCase
42 p = create_user('test_user').person 42 p = create_user('test_user').person
43 f = fast_create(Folder, :profile_id => p.id) 43 f = fast_create(Folder, :profile_id => p.id)
44 folder1 = fast_create(Folder, :name => 'b', :profile_id => p.id, :parent_id => f.id) 44 folder1 = fast_create(Folder, :name => 'b', :profile_id => p.id, :parent_id => f.id)
45 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 45 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
46 folder2 = fast_create(Folder, :name => 'c', :profile_id => p.id, :parent_id => f.id) 46 folder2 = fast_create(Folder, :name => 'c', :profile_id => p.id, :parent_id => f.id)
47 folder3 = fast_create(Folder, :name => 'a', :profile_id => p.id, :parent_id => f.id) 47 folder3 = fast_create(Folder, :name => 'a', :profile_id => p.id, :parent_id => f.id)
48 48
@@ -53,7 +53,7 @@ class FolderTest < ActiveSupport::TestCase @@ -53,7 +53,7 @@ class FolderTest < ActiveSupport::TestCase
53 p = create_user('test_user').person 53 p = create_user('test_user').person
54 f = fast_create(Folder, :profile_id => p.id) 54 f = fast_create(Folder, :profile_id => p.id)
55 folder = fast_create(Folder, :profile_id => p.id, :parent_id => f.id) 55 folder = fast_create(Folder, :profile_id => p.id, :parent_id => f.id)
56 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 56 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
57 57
58 assert_equal [image], f.images.paginate(:page => 2, :per_page => 1) 58 assert_equal [image], f.images.paginate(:page => 2, :per_page => 1)
59 end 59 end
@@ -62,7 +62,7 @@ class FolderTest < ActiveSupport::TestCase @@ -62,7 +62,7 @@ class FolderTest < ActiveSupport::TestCase
62 c = fast_create(Community) 62 c = fast_create(Community)
63 folder = fast_create(Folder, :profile_id => c.id) 63 folder = fast_create(Folder, :profile_id => c.id)
64 f = fast_create(Folder, :name => 'folder', :profile_id => c.id, :parent_id => folder.id) 64 f = fast_create(Folder, :name => 'folder', :profile_id => c.id, :parent_id => folder.id)
65 - u = UploadedFile.create!(:profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => folder) 65 + u = create(UploadedFile, :profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => folder)
66 older_t = fast_create(TinyMceArticle, :name => 'old news', :profile_id => c.id, :parent_id => folder.id) 66 older_t = fast_create(TinyMceArticle, :name => 'old news', :profile_id => c.id, :parent_id => folder.id)
67 t = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => folder.id) 67 t = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => folder.id)
68 t_in_f = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => f.id) 68 t_in_f = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => f.id)
@@ -90,11 +90,11 @@ class FolderTest < ActiveSupport::TestCase @@ -90,11 +90,11 @@ class FolderTest < ActiveSupport::TestCase
90 90
91 should 'return published images as images' do 91 should 'return published images as images' do
92 person = create_user('test_user').person 92 person = create_user('test_user').person
93 - image = UploadedFile.create!(:profile => person, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) 93 + image = create(UploadedFile, :profile => person, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
94 94
95 community = fast_create(Community) 95 community = fast_create(Community)
96 folder = fast_create(Folder, :profile_id => community.id) 96 folder = fast_create(Folder, :profile_id => community.id)
97 - a = ApproveArticle.create!(:article => image, :target => community, :requestor => person, :article_parent => folder) 97 + a = create(ApproveArticle, :article => image, :target => community, :requestor => person, :article_parent => folder)
98 a.finish 98 a.finish
99 99
100 assert_includes folder.images(true), community.articles.find_by_name('rails.png') 100 assert_includes folder.images(true), community.articles.find_by_name('rails.png')
@@ -137,7 +137,7 @@ class FolderTest < ActiveSupport::TestCase @@ -137,7 +137,7 @@ class FolderTest < ActiveSupport::TestCase
137 folder.parent = Blog.new 137 folder.parent = Blog.new
138 folder.valid? 138 folder.valid?
139 139
140 - assert folder.errors.on(:parent) 140 + assert folder.errors[:parent].present?
141 end 141 end
142 142
143 should 'accept uploads' do 143 should 'accept uploads' do