Download as
Browse Code »

Commit 16d7dc3ca439e34dfd8c6119c4b11bfcbf6e3ee4

Authored by Daniela Feitosa
Committed by Joenio Costa
1 parent 6e67250f
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Adding parameter to use theme images on documentation 

(ActionItem1410)
Showing 2 changed files with 11 additions and 2 deletions   Show diff stats
app/views/doc/topic.html.erb
  Diff comments   View file @16d7dc3
1 <%= render :partial => 'toc' %> 1 <%= render :partial => 'toc' %>
2 -<%= display_doc @topic.html %> 2 +<%= display_doc @topic.html(environment.theme) %>
test/functional/doc_controller_test.rb
  Diff comments   View file @16d7dc3
1 -require 'test_helper' 1 +require File.dirname(__FILE__) + '/../test_helper'
2 2
3 class DocControllerTest < ActionController::TestCase 3 class DocControllerTest < ActionController::TestCase
4 4
@@ -40,6 +40,15 @@ class DocControllerTest &lt; ActionController::TestCase @@ -40,6 +40,15 @@ class DocControllerTest &lt; ActionController::TestCase
40 assert_equal 'pt', assigns(:topic).language 40 assert_equal 'pt', assigns(:topic).language
41 end 41 end
42 42
  43 + should 'use environment theme' do
  44 + e = Environment.default
  45 + e.theme = 'test-theme'
  46 + e.save
  47 +
  48 + DocTopic.any_instance.expects(:html).with('test-theme')
  49 + get :topic, :section => 'user', :topic => 'accepting-friends'
  50 + end
  51 +
43 should 'bail out gracefully for unexisting sections or topics' do 52 should 'bail out gracefully for unexisting sections or topics' do
44 assert_nothing_raised do 53 assert_nothing_raised do
45 get :section, :section => 'something-very-unlikely' 54 get :section, :section => 'something-very-unlikely'