| @@ -162,7 +162,8 class WikiController < ApplicationController | |||||
| 162 |
|
162 | |||
| 163 | def preview |
|
163 | def preview | |
| 164 | page = @wiki.find_page(params[:page]) |
|
164 | page = @wiki.find_page(params[:page]) | |
| 165 | return render_403 unless editable?(page) |
|
165 | # page is nil when previewing a new page | |
|
|
166 | return render_403 unless page.nil? || editable?(page) | |||
| 166 | @attachements = page.attachments if page |
|
167 | @attachements = page.attachments if page | |
| 167 | @text = params[:content][:text] |
|
168 | @text = params[:content][:text] | |
| 168 | render :partial => 'common/preview' |
|
169 | render :partial => 'common/preview' | |
| @@ -86,6 +86,17 class WikiControllerTest < Test::Unit::TestCase | |||||
| 86 | assert_tag :tag => 'strong', :content => /previewed text/ |
|
86 | assert_tag :tag => 'strong', :content => /previewed text/ | |
| 87 | end |
|
87 | end | |
| 88 |
|
88 | |||
|
|
89 | def test_preview_new_page | |||
|
|
90 | @request.session[:user_id] = 2 | |||
|
|
91 | xhr :post, :preview, :id => 1, :page => 'New page', | |||
|
|
92 | :content => { :text => 'h1. New page', | |||
|
|
93 | :comments => '', | |||
|
|
94 | :version => 0 } | |||
|
|
95 | assert_response :success | |||
|
|
96 | assert_template 'common/_preview' | |||
|
|
97 | assert_tag :tag => 'h1', :content => /New page/ | |||
|
|
98 | end | |||
|
|
99 | ||||
| 89 | def test_history |
|
100 | def test_history | |
| 90 | get :history, :id => 1, :page => 'CookBook_documentation' |
|
101 | get :history, :id => 1, :page => 'CookBook_documentation' | |
| 91 | assert_response :success |
|
102 | assert_response :success | |
General Comments 0
You need to be logged in to leave comments.
Login now