Download as
Browse Code »

Commit 3d76539d2ff554dc23824e71b3475c1356eea5f1

Authored by Rodrigo Souto
Committed by Joenio Costa
1 parent 16d7dc3c
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

Raising 'not found' page while accessing an unexistent topic in a section 

(ActionItem1397)
Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/doc_section.rb
  Diff comments   View file @3d76539
@@ -5,7 +5,12 @@ class DocSection < DocItem @@ -5,7 +5,12 @@ class DocSection < DocItem
5 end 5 end
6 6
7 def find(id) 7 def find(id)
8 - items.find {|item| item.id == id } 8 + topic = items.find {|item| item.id == id }
  9 + if topic
  10 + topic
  11 + else
  12 + raise DocItem::NotFound
  13 + end
9 end 14 end
10 15
11 def self.all(language = 'en', force = false) 16 def self.all(language = 'en', force = false)
test/unit/doc_section_test.rb
  Diff comments   View file @3d76539
@@ -97,4 +97,12 @@ class DocSectionTest < ActiveSupport::TestCase @@ -97,4 +97,12 @@ class DocSectionTest < ActiveSupport::TestCase
97 end 97 end
98 end 98 end
99 99
  100 + should 'raise DocTopic::NotFound when trying to find an unexisting topic inside a section' do
  101 + section = DocSection.all.first
  102 + assert_raise DocItem::NotFound do
  103 + section.find('unexisting')
  104 + end
  105 + end
  106 +
  107 +
100 end 108 end