Download as
Browse Code »

Commit c4afac0b8977c1e4d693c9f4e78a990b678dc977

Authored by Victor Costa
1 parent 793f7219
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

context_content: fix tests 

Return children ordered by name to improve visualization and avoid test randomness.
Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
plugins/context_content/lib/context_content_plugin/context_content_block.rb
  Diff comments   View file @c4afac0
... ... @@ -58,7 +58,7 @@ class ContextContentPlugin::ContextContentBlock < Block
58 58 def contents(page, p=1)
59 59 return @children unless @children.blank?
60 60 if page
61   - @children = page.children.with_types(types).paginate(:per_page => limit, :page => p)
  61 + @children = page.children.with_types(types).order(:name).paginate(:per_page => limit, :page => p)
62 62 (@children.blank? && show_parent_content) ? contents(page.parent, p) : @children
63 63 else
64 64 nil
... ...
plugins/context_content/test/unit/context_content_block_test.rb
  Diff comments   View file @c4afac0
... ... @@ -51,18 +51,18 @@ class ContextContentBlockTest < ActiveSupport::TestCase
51 51 should 'show contents for next page' do
52 52 @block.limit = 2
53 53 folder = fast_create(Folder)
54   - article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
55   - article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
56   - article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
  54 + article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
  55 + article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
  56 + article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
57 57 assert_equal [article3], @block.contents(folder, 2)
58 58 end
59 59  
60 60 should 'show parent contents for next page' do
61 61 @block.limit = 2
62 62 folder = fast_create(Folder)
63   - article1 = fast_create(TinyMceArticle, :parent_id => folder.id)
64   - article2 = fast_create(TinyMceArticle, :parent_id => folder.id)
65   - article3 = fast_create(TinyMceArticle, :parent_id => folder.id)
  63 + article1 = fast_create(TinyMceArticle, :name => 'article 1', :parent_id => folder.id)
  64 + article2 = fast_create(TinyMceArticle, :name => 'article 2', :parent_id => folder.id)
  65 + article3 = fast_create(TinyMceArticle, :name => 'article 3', :parent_id => folder.id)
66 66 assert_equal [article3], @block.contents(article1, 2)
67 67 end
68 68  
... ...