Download as
Browse Code »

Commit 0eae07c1ea839236bd2f36c86466a339812864bd

Authored by Rodrigo Souto
1 parent d3284d42
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 gallery test 

PS: still failing test because xss_terminate is stripping html comments
now.
Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
test/unit/gallery_test.rb
  Diff comments   View file @0eae07c
@@ -39,8 +39,8 @@ class GalleryTest < ActiveSupport::TestCase @@ -39,8 +39,8 @@ class GalleryTest < ActiveSupport::TestCase
39 should 'have images that are only images or other galleries' do 39 should 'have images that are only images or other galleries' do
40 p = create_user('test_user').person 40 p = create_user('test_user').person
41 f = fast_create(Gallery, :profile_id => p.id) 41 f = fast_create(Gallery, :profile_id => p.id)
42 - file = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :parent => f, :profile => p)  
43 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 42 + file = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'), :parent => f, :profile => p)
  43 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
44 gallery = fast_create(Gallery, :profile_id => p.id, :parent_id => f.id) 44 gallery = fast_create(Gallery, :profile_id => p.id, :parent_id => f.id)
45 45
46 assert_equivalent [gallery, image], f.images 46 assert_equivalent [gallery, image], f.images
@@ -50,7 +50,7 @@ class GalleryTest < ActiveSupport::TestCase @@ -50,7 +50,7 @@ class GalleryTest < ActiveSupport::TestCase
50 p = create_user('test_user').person 50 p = create_user('test_user').person
51 f = fast_create(Gallery, :profile_id => p.id) 51 f = fast_create(Gallery, :profile_id => p.id)
52 gallery1 = fast_create(Gallery, :name => 'b', :profile_id => p.id, :parent_id => f.id) 52 gallery1 = fast_create(Gallery, :name => 'b', :profile_id => p.id, :parent_id => f.id)
53 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 53 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
54 gallery2 = fast_create(Gallery, :name => 'c', :profile_id => p.id, :parent_id => f.id) 54 gallery2 = fast_create(Gallery, :name => 'c', :profile_id => p.id, :parent_id => f.id)
55 gallery3 = fast_create(Gallery, :name => 'a', :profile_id => p.id, :parent_id => f.id) 55 gallery3 = fast_create(Gallery, :name => 'a', :profile_id => p.id, :parent_id => f.id)
56 56
@@ -61,7 +61,7 @@ class GalleryTest < ActiveSupport::TestCase @@ -61,7 +61,7 @@ class GalleryTest < ActiveSupport::TestCase
61 p = create_user('test_user').person 61 p = create_user('test_user').person
62 f = fast_create(Gallery, :profile_id => p.id) 62 f = fast_create(Gallery, :profile_id => p.id)
63 gallery = fast_create(Gallery, :profile_id => p.id, :parent_id => f.id) 63 gallery = fast_create(Gallery, :profile_id => p.id, :parent_id => f.id)
64 - image = UploadedFile.create!(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p) 64 + image = create(UploadedFile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => f, :profile => p)
65 65
66 assert_equal [image], f.images.paginate(:page => 2, :per_page => 1) 66 assert_equal [image], f.images.paginate(:page => 2, :per_page => 1)
67 end 67 end
@@ -70,7 +70,7 @@ class GalleryTest < ActiveSupport::TestCase @@ -70,7 +70,7 @@ class GalleryTest < ActiveSupport::TestCase
70 c = fast_create(Community) 70 c = fast_create(Community)
71 gallery = fast_create(Gallery, :profile_id => c.id) 71 gallery = fast_create(Gallery, :profile_id => c.id)
72 f = fast_create(Gallery, :name => 'gallery', :profile_id => c.id, :parent_id => gallery.id) 72 f = fast_create(Gallery, :name => 'gallery', :profile_id => c.id, :parent_id => gallery.id)
73 - u = UploadedFile.create!(:profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery) 73 + u = create(UploadedFile, :profile => c, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery)
74 older_t = fast_create(TinyMceArticle, :name => 'old news', :profile_id => c.id, :parent_id => gallery.id) 74 older_t = fast_create(TinyMceArticle, :name => 'old news', :profile_id => c.id, :parent_id => gallery.id)
75 t = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => gallery.id) 75 t = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => gallery.id)
76 t_in_f = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => f.id) 76 t_in_f = fast_create(TinyMceArticle, :name => 'news', :profile_id => c.id, :parent_id => f.id)
@@ -98,12 +98,12 @@ class GalleryTest < ActiveSupport::TestCase @@ -98,12 +98,12 @@ class GalleryTest < ActiveSupport::TestCase
98 98
99 should 'return published images as images' do 99 should 'return published images as images' do
100 p = create_user('test_user').person 100 p = create_user('test_user').person
101 - i = UploadedFile.create!(:profile => p, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')) 101 + i = create(UploadedFile, :profile => p, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
102 102
103 c = fast_create(Community) 103 c = fast_create(Community)
104 gallery = fast_create(Gallery, :profile_id => c.id) 104 gallery = fast_create(Gallery, :profile_id => c.id)
105 105
106 - a = ApproveArticle.create!(:article => i, :target => c, :requestor => p, :article_parent => gallery) 106 + a = create(ApproveArticle, :article => i, :target => c, :requestor => p, :article_parent => gallery)
107 a.finish 107 a.finish
108 108
109 assert_includes gallery.images(true), c.articles.find_by_name('rails.png') 109 assert_includes gallery.images(true), c.articles.find_by_name('rails.png')