jro_apps/redmine Commit - r8667:001b255b081b

Ability to edit a wiki page's parent on the edit page (#6449)....

Jean-Philippe Lang -

r8667:001b255b081b

parent child

Context file:

r8667:001b255b081b

Collapse all files

app/controllers/wiki_controller.rb +5 -6

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'diff'
             # The WikiController follows the Rails REST controller pattern but with
             # a few differences
             #
             # * index - shows a list of WikiPages grouped by page or date
             # * new - not used
             # * create - not used
             # * show - will also show the form for creating a new wiki page
             # * edit - used to edit an existing or new page
             # * update - used to save a wiki page update to the database, including new pages
             # * destroy - normal
             #
             # Other member and collection methods are also used
             #
             # TODO: still being worked on
             class WikiController < ApplicationController
               default_search_scope :wiki_pages
               before_filter :find_wiki, :authorize
               before_filter :find_existing_or_new_page, :only => [:show, :edit, :update]
               before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
               helper :attachments
               include AttachmentsHelper
               helper :watchers
               include Redmine::Export::PDF
               # List of pages, sorted alphabetically and by parent (hierarchy)
               def index
                 load_pages_for_index
                 @pages_by_parent_id = @pages.group_by(&:parent_id)
               end
               # List of page, by last update
               def date_index
                 load_pages_for_index
                 @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
               end
               # display a page (in editing mode if it doesn't exist)
               def show
                 if @page.new_record?
                   if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
                     edit
                     render :action => 'edit'
                   else
                     render_404
                   end
                   return
                 end
                 if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
                   # Redirects user to the current version if he's not allowed to view previous versions
                   redirect_to :version => nil
                   return
                 end
                 @content = @page.content_for_version(params[:version])
                 if User.current.allowed_to?(:export_wiki_pages, @project)
                   if params[:format] == 'pdf'
                     send_data(wiki_page_to_pdf(@page, @project), :type => 'application/pdf', :filename => "#{@page.title}.pdf")
                     return
                   elsif params[:format] == 'html'
                     export = render_to_string :action => 'export', :layout => false
                     send_data(export, :type => 'text/html', :filename => "#{@page.title}.html")
                     return
                   elsif params[:format] == 'txt'
                     send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
                     return
                   end
                 end
                 @editable = editable?
                 @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
                   @content.current_version? &&
                   Redmine::WikiFormatting.supports_section_edit?
                 render :action => 'show'
               end
               # edit an existing page or a new one
               def edit
                 return render_403 unless editable?
                 if @page.new_record?
                   @page.content = WikiContent.new(:page => @page)
                   if params[:parent].present?
                     @page.parent = @page.wiki.find_page(params[:parent].to_s)
                   end
                 end
                 @content = @page.content_for_version(params[:version])
                 @content.text = initial_page_content(@page) if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 # To prevent StaleObjectError exception when reverting to a previous version
                 @content.version = @page.content.version
                 @text = @content.text
                 if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
                   render_404 if @text.blank?
                 end
               end
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               # Creates a new page or updates an existing one
               def update
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
+                @page.safe_attributes = params[:wiki_page]
                 @content = @page.content_for_version(params[:version])
                 @content.text = initial_page_content(@page) if @content.text.blank?
                 # don't keep previous comment
                 @content.comments = nil
                 if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
-                  # don't save if text wasn't changed
+                  # don't save content if text wasn't changed
+                  @page.save
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                   return
                 end
                 @content.comments = params[:content][:comments]
                 @text = params[:content][:text]
                 if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @section_hash = params[:section_hash]
                   @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)
                 else
                   @content.version = params[:content][:version]
                   @content.text = @text
                 end
                 @content.author = User.current
-                if @page.new_record? && params[:page]
+                @page.content = @content
-                  @page.parent_id = params[:page][:parent_id]
+                if @page.save
-                end
-                # if page is new @page.save will also save content, but not if page isn't a new record
-                if (@page.new_record? ? @page.save : @content.save)
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
                   call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                 else
                   render :action => 'edit'
                 end
               rescue ActiveRecord::StaleObjectError, Redmine::WikiFormatting::StaleSectionError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
                 render :action => 'edit'
               end
               # rename a page
               def rename
                 return render_403 unless editable?
                 @page.redirect_existing_links = true
                 # used to display the *original* title if some AR validation errors occur
                 @original_title = @page.pretty_title
                 if request.post? && @page.update_attributes(params[:wiki_page])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                 end
               end
               verify :method => :post, :only => :protect, :redirect_to => { :action => :show }
               def protect
                 @page.update_attribute :protected, params[:protected]
                 redirect_to :action => 'show', :project_id => @project, :id => @page.title
               end
               # show page history
               def history
                 @version_count = @page.content.versions.count
                 @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
                 # don't load text
                 @versions = @page.content.versions.find :all,
                                                         :select => "id, author_id, comments, updated_on, version",
                                                         :order => 'version DESC',
                                                         :limit  =>  @version_pages.items_per_page + 1,
                                                         :offset =>  @version_pages.current.offset
                 render :layout => false if request.xhr?
               end
               def diff
                 @diff = @page.diff(params[:version], params[:version_from])
                 render_404 unless @diff
               end
               def annotate
                 @annotate = @page.annotate(params[:version])
                 render_404 unless @annotate
               end
               verify :method => :delete, :only => [:destroy], :redirect_to => { :action => :show }
               # Removes a wiki page and its history
               # Children can be either set as root pages, removed or reassigned to another parent page
               def destroy
                 return render_403 unless editable?
                 @descendants_count = @page.descendants.size
                 if @descendants_count > 0
                   case params[:todo]
                   when 'nullify'
                     # Nothing to do
                   when 'destroy'
                     # Removes all its descendants
                     @page.descendants.each(&:destroy)
                   when 'reassign'
                     # Reassign children to another parent page
                     reassign_to = @wiki.pages.find_by_id(params[:reassign_to_id].to_i)
                     return unless reassign_to
                     @page.children.each do |child|
                       child.update_attribute(:parent, reassign_to)
                     end
                   else
                     @reassignable_to = @wiki.pages - @page.self_and_descendants
                     return
                   end
                 end
                 @page.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               # Export wiki to a single pdf or html file
               def export
                 @pages = @wiki.pages.all(:order => 'title', :include => [:content, :attachments], :limit => 75)
                 respond_to do |format|
                   format.html {
                     export = render_to_string :action => 'export_multiple', :layout => false
                     send_data(export, :type => 'text/html', :filename => "wiki.html")
                   }
                   format.pdf {
                     send_data(wiki_pages_to_pdf(@pages, @project), :type => 'application/pdf', :filename => "#{@project.identifier}.pdf")
                   }
                 end
               end
               def preview
                 page = @wiki.find_page(params[:id])
                 # page is nil when previewing a new page
                 return render_403 unless page.nil? || editable?(page)
                 if page
                   @attachements = page.attachments
                   @previewed = page.content
                 end
                 @text = params[:content][:text]
                 render :partial => 'common/preview'
               end
               def add_attachment
                 return render_403 unless editable?
                 attachments = Attachment.attach_files(@page, params[:attachments])
                 render_attachment_warning_if_needed(@page)
                 redirect_to :action => 'show', :id => @page.title, :project_id => @project
               end
             private
               def find_wiki
                 @project = Project.find(params[:project_id])
                 @wiki = @project.wiki
                 render_404 unless @wiki
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Finds the requested page or a new page if it doesn't exist
               def find_existing_or_new_page
                 @page = @wiki.find_or_new_page(params[:id])
                 if @wiki.page_found_with_redirect?
                   redirect_to params.update(:id => @page.title)
                 end
               end
               # Finds the requested page and returns a 404 error if it doesn't exist
               def find_existing_page
                 @page = @wiki.find_page(params[:id])
                 if @page.nil?
                   render_404
                   return
                 end
                 if @wiki.page_found_with_redirect?
                   redirect_to params.update(:id => @page.title)
                 end
               end
               # Returns true if the current user is allowed to edit the page, otherwise false
               def editable?(page = @page)
                 page.editable_by?(User.current)
               end
               # Returns the default content of a new wiki page
               def initial_page_content(page)
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper unless self.instance_of?(helper)
                 helper.instance_method(:initial_page_content).bind(self).call(page)
               end
               def load_pages_for_index
                 @pages = @wiki.pages.with_updated_on.all(:order => 'title', :include => {:wiki => :project})
               end
             end

app/models/wiki_page.rb +5 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'diff'
             require 'enumerator'
             class WikiPage < ActiveRecord::Base
+              include Redmine::SafeAttributes
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :dependent => :nullify, :order => 'title'
               acts_as_watchable
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                             :description => :text,
                             :datetime => :created_on,
                             :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
               acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
                                  :include => [{:wiki => :project}, :content],
                                  :permission => :view_wiki_pages,
                                  :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               validate :validate_parent_title
               before_destroy :remove_redirects
               before_save    :handle_redirects
               # eager load information about last updates, without loading text
               named_scope :with_updated_on, {
                 :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                 :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id"
               }
               # Wiki pages that are protected by default
               DEFAULT_PROTECTED_PAGES = %w(sidebar)
+              safe_attributes 'parent_id',
+                :if => lambda {|page, user| page.new_record? || user.allowed_to?(:rename_wiki_pages, page.project)}
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)
                   self.protected = true
                 end
               end
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_wiki_pages, project)
               end
               def title=(value)
                 value = Wiki.titleize(value)
                 @previous_title = read_attribute(:title) if @previous_title.blank?
                 write_attribute(:title, value)
               end
               def handle_redirects
                 self.title = Wiki.titleize(title)
                 # Manage redirects if the title has changed
                 if !@previous_title.blank? && (@previous_title != title) && !new_record?
                   # Update redirects that point to the old title
                   wiki.redirects.find_all_by_redirects_to(@previous_title).each do |r|
                     r.redirects_to = title
                     r.title == r.redirects_to ? r.destroy : r.save
                   end
                   # Remove redirects for the new title
                   wiki.redirects.find_all_by_title(title).each(&:destroy)
                   # Create a redirect to the new title
                   wiki.redirects << WikiRedirect.new(:title => @previous_title, :redirects_to => title) unless redirect_existing_links == "0"
                   @previous_title = nil
                 end
               end
               def remove_redirects
                 # Remove redirects to this page
                 wiki.redirects.find_all_by_redirects_to(title).each(&:destroy)
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 result = content.versions.find_by_version(version.to_i) if version
                 result ||= content
                 result
               end
               def diff(version_to=nil, version_from=nil)
                 version_to = version_to ? version_to.to_i : self.content.version
                 version_from = version_from ? version_from.to_i : version_to - 1
                 version_to, version_from = version_from, version_to unless version_from < version_to
                 content_to = content.versions.find_by_version(version_to)
                 content_from = content.versions.find_by_version(version_from)
                 (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
               end
               def annotate(version=nil)
                 version = version ? version.to_i : self.content.version
                 c = content.versions.find_by_version(version)
                 c ? WikiAnnotate.new(c) : nil
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
               def project
                 wiki.project
               end
               def text
                 content.text if content
               end
               def updated_on
                 unless @updated_on
                   if time = read_attribute(:updated_on)
                     # content updated_on was eager loaded with the page
                     begin
                       @updated_on = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s)
                     rescue
                     end
                   else
                     @updated_on = content && content.updated_on
                   end
                 end
                 @updated_on
               end
               # Returns true if usr is allowed to edit the page, otherwise false
               def editable_by?(usr)
                 !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
               end
               def attachments_deletable?(usr=User.current)
                 editable_by?(usr) && super(usr)
               end
               def parent_title
                 @parent_title || (self.parent && self.parent.pretty_title)
               end
               def parent_title=(t)
                 @parent_title = t
                 parent_page = t.blank? ? nil : self.wiki.find_page(t)
                 self.parent = parent_page
               end
               protected
               def validate_parent_title
                 errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
                 errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
                 errors.add(:parent_title, :not_same_project) if parent && (parent.wiki_id != wiki_id)
               end
             end
             class WikiDiff < Redmine::Helpers::Diff
               attr_reader :content_to, :content_from
               def initialize(content_to, content_from)
                 @content_to = content_to
                 @content_from = content_from
                 super(content_to.text, content_from.text)
               end
             end
             class WikiAnnotate
               attr_reader :lines, :content
               def initialize(content)
                 @content = content
                 current = content
                 current_lines = current.text.split(/\r?\n/)
                 @lines = current_lines.collect {|t| [nil, nil, t]}
                 positions = []
                 current_lines.size.times {|i| positions << i}
                 while (current.previous)
                   d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '+' && positions[line] && positions[line] != -1
                       if @lines[positions[line]][0].nil?
                         @lines[positions[line]][0] = current.version
                         @lines[positions[line]][1] = current.author
                       end
                     end
                   end
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '-'
                       positions.insert(line, -1)
                     else
                       positions[line] = nil
                     end
                   end
                   positions.compact!
                   # Stop if every line is annotated
                   break unless @lines.detect { |line| line[0].nil? }
                   current = current.previous
                 end
                 @lines.each { |line|
                   line[0] ||= current.version
                   # if the last known version is > 1 (eg. history was cleared), we don't know the author
                   line[1] ||= current.author if current.version == 1
                 }
               end
             end

app/views/wiki/edit.html.erb +7 -2

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%=h @page.pretty_title %></h2>
             <% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <% if @section %>
             <%= hidden_field_tag 'section', @section %>
             <%= hidden_field_tag 'section_hash', @section_hash %>
             <% end %>
             <%= error_messages_for 'content' %>
             <div class="box tabular">
             <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
-            <% if @page.new_record? && @page.parent %>
+            <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
-            <p><label><%= check_box_tag 'page[parent_id]', @page.parent.id, true %> <%= l(:field_parent_title) %></label> <%=h @page.parent.pretty_title %></p>
+              <% fields_for @page do |fp| %>
+                <p>
+                	<label><%= l(:field_parent_title) %></label>
+            		  <%= fp.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
+            		</p>
+              <% end %>
             <% end %>
             <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             </div>
             <p><%= submit_tag l(:button_save) %>
                <%= link_to_remote l(:label_preview),
                                    { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
                                      :method => :post,
                                      :update => 'preview',
                                      :with => "Form.serialize('wiki_form')",
                                      :complete => "Element.scrollTo('preview')"
                                    }, :accesskey => accesskey(:preview) %></p>
             <%= wikitoolbar_for 'content_text' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
               <%= robot_exclusion_tag %>
             <% end %>
             <% html_title @page.pretty_title %>

test/functional/wiki_controller_test.rb +52 -4

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'wiki_controller'
             # Re-raise errors caught by the controller.
             class WikiController; def rescue_action(e) raise e end; end
             class WikiControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles,
                        :enabled_modules, :wikis, :wiki_pages, :wiki_contents,
                        :wiki_content_versions, :attachments
               def setup
                 @controller = WikiController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_show_start_page
                 get :show, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h1', :content => /CookBook documentation/
                 # child_pages macro
                 assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
                            :child => { :tag => 'li',
                                        :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Page_with_an_inline_image' },
                                                                 :content => 'Page with an inline image' } }
               end
               def test_export_link
                 Role.anonymous.add_permission! :export_wiki_pages
                 get :show, :project_id => 'ecookbook'
                 assert_response :success
                 assert_tag 'a', :attributes => {:href => '/projects/ecookbook/wiki/CookBook_documentation.txt'}
               end
               def test_show_page_with_name
                 get :show, :project_id => 1, :id => 'Another_page'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h1', :content => /Another page/
                 # Included page with an inline image
                 assert_tag :tag => 'p', :content => /This is an inline image/
                 assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3',
                                                            :alt => 'This is a logo' }
               end
               def test_show_redirected_page
                 WikiRedirect.create!(:wiki_id => 1, :title => 'Old_title', :redirects_to => 'Another_page')
                 get :show, :project_id => 'ecookbook', :id => 'Old_title'
                 assert_redirected_to '/projects/ecookbook/wiki/Another_page'
               end
               def test_show_with_sidebar
                 page = Project.find(1).wiki.pages.new(:title => 'Sidebar')
                 page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
                 page.save!
                 get :show, :project_id => 1, :id => 'Another_page'
                 assert_response :success
                 assert_tag :tag => 'div', :attributes => {:id => 'sidebar'},
                                           :content => /Side bar content for test_show_with_sidebar/
               end
               def test_show_should_display_section_edit_links
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 'Page with sections'
                 assert_no_tag 'a', :attributes => {
                   :href => '/projects/ecookbook/wiki/Page_with_sections/edit?section=1'
                 }
                 assert_tag 'a', :attributes => {
                   :href => '/projects/ecookbook/wiki/Page_with_sections/edit?section=2'
                 }
                 assert_tag 'a', :attributes => {
                   :href => '/projects/ecookbook/wiki/Page_with_sections/edit?section=3'
                 }
               end
               def test_show_current_version_should_display_section_edit_links
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 'Page with sections', :version => 3
                 assert_tag 'a', :attributes => {
                   :href => '/projects/ecookbook/wiki/Page_with_sections/edit?section=2'
                 }
               end
               def test_show_old_version_should_not_display_section_edit_links
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 'Page with sections', :version => 2
                 assert_no_tag 'a', :attributes => {
                   :href => '/projects/ecookbook/wiki/Page_with_sections/edit?section=2'
                 }
               end
               def test_show_unexistent_page_without_edit_right
                 get :show, :project_id => 1, :id => 'Unexistent page'
                 assert_response 404
               end
               def test_show_unexistent_page_with_edit_right
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 'Unexistent page'
                 assert_response :success
                 assert_template 'edit'
-                assert_no_tag 'input', :attributes => {:name => 'page[parent_id]'}
               end
-              def test_show_unexistent_page_with_parent
+              def test_show_unexistent_page_with_parent_should_preselect_parent
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page'
                 assert_response :success
                 assert_template 'edit'
-                assert_tag 'input', :attributes => {:name => 'page[parent_id]', :value => '2'}
+                assert_tag 'select', :attributes => {:name => 'wiki_page[parent_id]'},
+                  :child => {:tag => 'option', :attributes => {:value => '2', :selected => 'selected'}}
               end
               def test_show_should_not_show_history_without_permission
                 Role.anonymous.remove_permission! :view_wiki_edits
                 get :show, :project_id => 1, :id => 'Page with sections', :version => 2
                 assert_response 302
               end
               def test_create_page
                 @request.session[:user_id] = 2
                 assert_difference 'WikiPage.count' do
                   assert_difference 'WikiContent.count' do
                     put :update, :project_id => 1,
                                 :id => 'New page',
                                 :content => {:comments => 'Created the page',
                                              :text => "h1. New page\n\nThis is a new page",
                                              :version => 0}
                   end
                 end
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'New_page'
                 page = Project.find(1).wiki.find_page('New page')
                 assert !page.new_record?
                 assert_not_nil page.content
                 assert_nil page.parent
                 assert_equal 'Created the page', page.content.comments
               end
               def test_create_page_with_attachments
                 @request.session[:user_id] = 2
                 assert_difference 'WikiPage.count' do
                   assert_difference 'Attachment.count' do
                     put :update, :project_id => 1,
                                 :id => 'New page',
                                 :content => {:comments => 'Created the page',
                                              :text => "h1. New page\n\nThis is a new page",
                                              :version => 0},
                                 :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   end
                 end
                 page = Project.find(1).wiki.find_page('New page')
                 assert_equal 1, page.attachments.count
                 assert_equal 'testfile.txt', page.attachments.first.filename
               end
               def test_create_page_with_parent
                 @request.session[:user_id] = 2
                 assert_difference 'WikiPage.count' do
                   put :update, :project_id => 1, :id => 'New page',
                     :content => {:text => "h1. New page\n\nThis is a new page", :version => 0},
-                    :page => {:parent_id => 2}
+                    :wiki_page => {:parent_id => 2}
                 end
                 page = Project.find(1).wiki.find_page('New page')
                 assert_equal WikiPage.find(2), page.parent
               end
               def test_edit_page
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 'ecookbook', :id => 'Another_page'
                 assert_response :success
                 assert_template 'edit'
                 assert_tag 'textarea',
                   :attributes => { :name => 'content[text]' },
                   :content => WikiPage.find_by_title('Another_page').content.text
               end
               def test_edit_section
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 'ecookbook', :id => 'Page_with_sections', :section => 2
                 assert_response :success
                 assert_template 'edit'
                 page = WikiPage.find_by_title('Page_with_sections')
                 section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
                 assert_tag 'textarea',
                   :attributes => { :name => 'content[text]' },
                   :content => section
                 assert_tag 'input',
                   :attributes => { :name => 'section', :type => 'hidden', :value => '2' }
                 assert_tag 'input',
                   :attributes => { :name => 'section_hash', :type => 'hidden', :value => hash }
               end
               def test_edit_invalid_section_should_respond_with_404
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 'ecookbook', :id => 'Page_with_sections', :section => 10
                 assert_response 404
               end
               def test_update_page
                 @request.session[:user_id] = 2
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1,
                         :id => 'Another_page',
                         :content => {
                           :comments => "my comments",
                           :text => "edited",
                           :version => 1
                         }
                     end
                   end
                 end
                 assert_redirected_to '/projects/ecookbook/wiki/Another_page'
                 page = Wiki.find(1).pages.find_by_title('Another_page')
                 assert_equal "edited", page.content.text
                 assert_equal 2, page.content.version
                 assert_equal "my comments", page.content.comments
               end
+              def test_update_page_with_parent
+                @request.session[:user_id] = 2
+                assert_no_difference 'WikiPage.count' do
+                  assert_no_difference 'WikiContent.count' do
+                    assert_difference 'WikiContent::Version.count' do
+                      put :update, :project_id => 1,
+                        :id => 'Another_page',
+                        :content => {
+                          :comments => "my comments",
+                          :text => "edited",
+                          :version => 1
+                        },
+                        :wiki_page => {:parent_id => '1'}
+                    end
+                  end
+                end
+                assert_redirected_to '/projects/ecookbook/wiki/Another_page'
+                page = Wiki.find(1).pages.find_by_title('Another_page')
+                assert_equal "edited", page.content.text
+                assert_equal 2, page.content.version
+                assert_equal "my comments", page.content.comments
+                assert_equal WikiPage.find(1), page.parent
+              end
               def test_update_page_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_no_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1,
                         :id => 'Another_page',
                         :content => {
                           :comments => 'a' * 300,  # failure here, comment is too long
                           :text => 'edited',
                           :version => 1
                         }
                       end
                     end
                   end
                 assert_response :success
                 assert_template 'edit'
                 assert_error_tag :descendant => {:content => /Comment is too long/}
                 assert_tag :tag => 'textarea', :attributes => {:id => 'content_text'}, :content => 'edited'
                 assert_tag :tag => 'input', :attributes => {:id => 'content_version', :value => '1'}
               end
+              def test_update_page_with_parent_change_only_should_not_create_content_version
+                @request.session[:user_id] = 2
+                assert_no_difference 'WikiPage.count' do
+                  assert_no_difference 'WikiContent.count' do
+                    assert_no_difference 'WikiContent::Version.count' do
+                      put :update, :project_id => 1,
+                        :id => 'Another_page',
+                        :content => {
+                          :comments => '',
+                          :text => Wiki.find(1).find_page('Another_page').content.text,
+                          :version => 1
+                        },
+                        :wiki_page => {:parent_id => '1'}
+                    end
+                  end
+                end
+                page = Wiki.find(1).pages.find_by_title('Another_page')
+                assert_equal 1, page.content.version
+                assert_equal WikiPage.find(1), page.parent
+              end
               def test_update_page_with_attachments_only_should_not_create_content_version
                 @request.session[:user_id] = 2
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_no_difference 'WikiContent::Version.count' do
                       assert_difference 'Attachment.count' do
                         put :update, :project_id => 1,
                           :id => 'Another_page',
                           :content => {
                             :comments => '',
                             :text => Wiki.find(1).find_page('Another_page').content.text,
                             :version => 1
                           },
                           :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}}
                       end
                     end
                   end
                 end
+                page = Wiki.find(1).pages.find_by_title('Another_page')
+                assert_equal 1, page.content.version
               end
               def test_update_stale_page_should_not_raise_an_error
                 @request.session[:user_id] = 2
                 c = Wiki.find(1).find_page('Another_page').content
                 c.text = 'Previous text'
                 c.save!
                 assert_equal 2, c.version
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_no_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1,
                         :id => 'Another_page',
                         :content => {
                           :comments => 'My comments',
                           :text => 'Text should not be lost',
                           :version => 1
                         }
                     end
                   end
                 end
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :div,
                   :attributes => { :class => /error/ },
                   :content => /Data has been updated by another user/
                 assert_tag 'textarea',
                   :attributes => { :name => 'content[text]' },
                   :content => /Text should not be lost/
                 assert_tag 'input',
                   :attributes => { :name => 'content[comments]', :value => 'My comments' }
                 c.reload
                 assert_equal 'Previous text', c.text
                 assert_equal 2, c.version
               end
               def test_update_section
                 @request.session[:user_id] = 2
                 page = WikiPage.find_by_title('Page_with_sections')
                 section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
                 text = page.content.text
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1, :id => 'Page_with_sections',
                         :content => {
                           :text => "New section content",
                           :version => 3
                         },
                         :section => 2,
                         :section_hash => hash
                     end
                   end
                 end
                 assert_redirected_to '/projects/ecookbook/wiki/Page_with_sections'
                 assert_equal Redmine::WikiFormatting::Textile::Formatter.new(text).update_section(2, "New section content"), page.reload.content.text
               end
               def test_update_section_should_allow_stale_page_update
                 @request.session[:user_id] = 2
                 page = WikiPage.find_by_title('Page_with_sections')
                 section, hash = Redmine::WikiFormatting::Textile::Formatter.new(page.content.text).get_section(2)
                 text = page.content.text
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1, :id => 'Page_with_sections',
                         :content => {
                           :text => "New section content",
                           :version => 2 # Current version is 3
                         },
                         :section => 2,
                         :section_hash => hash
                     end
                   end
                 end
                 assert_redirected_to '/projects/ecookbook/wiki/Page_with_sections'
                 page.reload
                 assert_equal Redmine::WikiFormatting::Textile::Formatter.new(text).update_section(2, "New section content"), page.content.text
                 assert_equal 4, page.content.version
               end
               def test_update_section_should_not_allow_stale_section_update
                 @request.session[:user_id] = 2
                 assert_no_difference 'WikiPage.count' do
                   assert_no_difference 'WikiContent.count' do
                     assert_no_difference 'WikiContent::Version.count' do
                       put :update, :project_id => 1, :id => 'Page_with_sections',
                         :content => {
                           :comments => 'My comments',
                           :text => "Text should not be lost",
                           :version => 3
                         },
                         :section => 2,
                         :section_hash => Digest::MD5.hexdigest("wrong hash")
                     end
                   end
                 end
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :div,
                   :attributes => { :class => /error/ },
                   :content => /Data has been updated by another user/
                 assert_tag 'textarea',
                   :attributes => { :name => 'content[text]' },
                   :content => /Text should not be lost/
                 assert_tag 'input',
                   :attributes => { :name => 'content[comments]', :value => 'My comments' }
               end
               def test_preview
                 @request.session[:user_id] = 2
                 xhr :post, :preview, :project_id => 1, :id => 'CookBook_documentation',
                                                :content => { :comments => '',
                                                              :text => 'this is a *previewed text*',
                                                              :version => 3 }
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'strong', :content => /previewed text/
               end
               def test_preview_new_page
                 @request.session[:user_id] = 2
                 xhr :post, :preview, :project_id => 1, :id => 'New page',
                                                :content => { :text => 'h1. New page',
                                                              :comments => '',
                                                              :version => 0 }
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'h1', :content => /New page/
               end
               def test_history
                 get :history, :project_id => 1, :id => 'CookBook_documentation'
                 assert_response :success
                 assert_template 'history'
                 assert_not_nil assigns(:versions)
                 assert_equal 3, assigns(:versions).size
                 assert_select "input[type=submit][name=commit]"
               end
               def test_history_with_one_version
                 get :history, :project_id => 1, :id => 'Another_page'
                 assert_response :success
                 assert_template 'history'
                 assert_not_nil assigns(:versions)
                 assert_equal 1, assigns(:versions).size
                 assert_select "input[type=submit][name=commit]", false
               end
               def test_diff
                 get :diff, :project_id => 1, :id => 'CookBook_documentation', :version => 2, :version_from => 1
                 assert_response :success
                 assert_template 'diff'
                 assert_tag :tag => 'span', :attributes => { :class => 'diff_in'},
                                            :content => /updated/
               end
               def test_annotate
                 get :annotate, :project_id => 1, :id =>  'CookBook_documentation', :version => 2
                 assert_response :success
                 assert_template 'annotate'
                 # Line 1
                 assert_tag :tag => 'tr', :child => {
                   :tag => 'th', :attributes => {:class => 'line-num'}, :content => '1', :sibling => {
                     :tag => 'td', :attributes => {:class => 'author'}, :content => /John Smith/, :sibling => {
                       :tag => 'td', :content => /h1\. CookBook documentation/
                     }
                   }
                 }
                 # Line 5
                 assert_tag :tag => 'tr', :child => {
                   :tag => 'th', :attributes => {:class => 'line-num'}, :content => '5', :sibling => {
                     :tag => 'td', :attributes => {:class => 'author'}, :content => /redMine Admin/, :sibling => {
                       :tag => 'td', :content => /Some updated \[\[documentation\]\] here/
                     }
                   }
                 }
               end
               def test_get_rename
                 @request.session[:user_id] = 2
                 get :rename, :project_id => 1, :id => 'Another_page'
                 assert_response :success
                 assert_template 'rename'
                 assert_tag 'option',
                   :attributes => {:value => ''},
                   :content => '',
                   :parent => {:tag => 'select', :attributes => {:name => 'wiki_page[parent_id]'}}
                 assert_no_tag 'option',
                   :attributes => {:selected => 'selected'},
                   :parent => {:tag => 'select', :attributes => {:name => 'wiki_page[parent_id]'}}
               end
               def test_get_rename_child_page
                 @request.session[:user_id] = 2
                 get :rename, :project_id => 1, :id => 'Child_1'
                 assert_response :success
                 assert_template 'rename'
                 assert_tag 'option',
                   :attributes => {:value => ''},
                   :content => '',
                   :parent => {:tag => 'select', :attributes => {:name => 'wiki_page[parent_id]'}}
                 assert_tag 'option',
                   :attributes => {:value => '2', :selected => 'selected'},
                   :content => /Another page/,
                   :parent => {
                     :tag => 'select',
                     :attributes => {:name => 'wiki_page[parent_id]'}
                   }
               end
               def test_rename_with_redirect
                 @request.session[:user_id] = 2
                 post :rename, :project_id => 1, :id => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => 1 }
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check redirects
                 assert_not_nil wiki.find_page('Another page')
                 assert_nil wiki.find_page('Another page', :with_redirect => false)
               end
               def test_rename_without_redirect
                 @request.session[:user_id] = 2
                 post :rename, :project_id => 1, :id => 'Another_page',
                                         :wiki_page => { :title => 'Another renamed page',
                                                         :redirect_existing_links => "0" }
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_renamed_page'
                 wiki = Project.find(1).wiki
                 # Check that there's no redirects
                 assert_nil wiki.find_page('Another page')
               end
               def test_rename_with_parent_assignment
                 @request.session[:user_id] = 2
                 post :rename, :project_id => 1, :id => 'Another_page',
                   :wiki_page => { :title => 'Another page', :redirect_existing_links => "0", :parent_id => '4' }
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_page'
                 assert_equal WikiPage.find(4), WikiPage.find_by_title('Another_page').parent
               end
               def test_rename_with_parent_unassignment
                 @request.session[:user_id] = 2
                 post :rename, :project_id => 1, :id => 'Child_1',
                   :wiki_page => { :title => 'Child 1', :redirect_existing_links => "0", :parent_id => '' }
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Child_1'
                 assert_nil WikiPage.find_by_title('Child_1').parent
               end
               def test_destroy_child
                 @request.session[:user_id] = 2
                 delete :destroy, :project_id => 1, :id => 'Child_1'
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
               end
               def test_destroy_parent
                 @request.session[:user_id] = 2
                 assert_no_difference('WikiPage.count') do
                   delete :destroy, :project_id => 1, :id => 'Another_page'
                 end
                 assert_response :success
                 assert_template 'destroy'
               end
               def test_destroy_parent_with_nullify
                 @request.session[:user_id] = 2
                 assert_difference('WikiPage.count', -1) do
                   delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'nullify'
                 end
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
               end
               def test_destroy_parent_with_cascade
                 @request.session[:user_id] = 2
                 assert_difference('WikiPage.count', -3) do
                   delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'destroy'
                 end
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
                 assert_nil WikiPage.find_by_id(5)
               end
               def test_destroy_parent_with_reassign
                 @request.session[:user_id] = 2
                 assert_difference('WikiPage.count', -1) do
                   delete :destroy, :project_id => 1, :id => 'Another_page', :todo => 'reassign', :reassign_to_id => 1
                 end
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_nil WikiPage.find_by_id(2)
                 assert_equal WikiPage.find(1), WikiPage.find_by_id(5).parent
               end
               def test_index
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 pages = assigns(:pages)
                 assert_not_nil pages
                 assert_equal Project.find(1).wiki.pages.size, pages.size
                 assert_equal pages.first.content.updated_on, pages.first.updated_on
                 assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
                                 :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/CookBook_documentation' },
                                                           :content => 'CookBook documentation' },
                                             :child => { :tag => 'ul',
                                                         :child => { :tag => 'li',
                                                                     :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Page_with_an_inline_image' },
                                                                                              :content => 'Page with an inline image' } } } },
                                 :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/projects/ecookbook/wiki/Another_page' },
                                                                                    :content => 'Another page' } }
               end
               def test_index_should_include_atom_link
                 get :index, :project_id => 'ecookbook'
                 assert_tag 'a', :attributes => { :href => '/projects/ecookbook/activity.atom?show_wiki_edits=1'}
               end
               def test_export_to_html
                 @request.session[:user_id] = 2
                 get :export, :project_id => 'ecookbook'
                 assert_response :success
                 assert_not_nil assigns(:pages)
                 assert assigns(:pages).any?
                 assert_equal "text/html", @response.content_type
                 assert_select "a[name=?]", "CookBook_documentation"
                 assert_select "a[name=?]", "Another_page"
                 assert_select "a[name=?]", "Page_with_an_inline_image"
               end
               def test_export_to_pdf
                 @request.session[:user_id] = 2
                 get :export, :project_id => 'ecookbook', :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:pages)
                 assert assigns(:pages).any?
                 assert_equal 'application/pdf', @response.content_type
                 assert_equal 'attachment; filename="ecookbook.pdf"', @response.headers['Content-Disposition']
                 assert @response.body.starts_with?('%PDF')
               end
               def test_export_without_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :export_wiki_pages
                 get :export, :project_id => 'ecookbook'
                 assert_response 403
               end
               def test_date_index
                 get :date_index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'date_index'
                 assert_not_nil assigns(:pages)
                 assert_not_nil assigns(:pages_by_date)
                 assert_tag 'a', :attributes => { :href => '/projects/ecookbook/activity.atom?show_wiki_edits=1'}
               end
               def test_not_found
                 get :show, :project_id => 999
                 assert_response 404
               end
               def test_protect_page
                 page = WikiPage.find_by_wiki_id_and_title(1, 'Another_page')
                 assert !page.protected?
                 @request.session[:user_id] = 2
                 post :protect, :project_id => 1, :id => page.title, :protected => '1'
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'Another_page'
                 assert page.reload.protected?
               end
               def test_unprotect_page
                 page = WikiPage.find_by_wiki_id_and_title(1, 'CookBook_documentation')
                 assert page.protected?
                 @request.session[:user_id] = 2
                 post :protect, :project_id => 1, :id => page.title, :protected => '0'
                 assert_redirected_to :action => 'show', :project_id => 'ecookbook', :id => 'CookBook_documentation'
                 assert !page.reload.protected?
               end
               def test_show_page_with_edit_link
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
               end
               def test_show_page_without_edit_link
                 @request.session[:user_id] = 4
                 get :show, :project_id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :attributes => { :href => '/projects/1/wiki/CookBook_documentation/edit' }
               end
               def test_show_pdf
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :format => 'pdf'
                 assert_response :success
                 assert_not_nil assigns(:page)
                 assert_equal 'application/pdf', @response.content_type
                 assert_equal 'attachment; filename="CookBook_documentation.pdf"',
                               @response.headers['Content-Disposition']
               end
               def test_show_html
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :format => 'html'
                 assert_response :success
                 assert_not_nil assigns(:page)
                 assert_equal 'text/html', @response.content_type
                 assert_equal 'attachment; filename="CookBook_documentation.html"',
                               @response.headers['Content-Disposition']
               end
               def test_show_txt
                 @request.session[:user_id] = 2
                 get :show, :project_id => 1, :format => 'txt'
                 assert_response :success
                 assert_not_nil assigns(:page)
                 assert_equal 'text/plain', @response.content_type
                 assert_equal 'attachment; filename="CookBook_documentation.txt"',
                               @response.headers['Content-Disposition']
               end
               def test_edit_unprotected_page
                 # Non members can edit unprotected wiki pages
                 @request.session[:user_id] = 4
                 get :edit, :project_id => 1, :id => 'Another_page'
                 assert_response :success
                 assert_template 'edit'
               end
               def test_edit_protected_page_by_nonmember
                 # Non members can't edit protected wiki pages
                 @request.session[:user_id] = 4
                 get :edit, :project_id => 1, :id => 'CookBook_documentation'
                 assert_response 403
               end
               def test_edit_protected_page_by_member
                 @request.session[:user_id] = 2
                 get :edit, :project_id => 1, :id => 'CookBook_documentation'
                 assert_response :success
                 assert_template 'edit'
               end
               def test_history_of_non_existing_page_should_return_404
                 get :history, :project_id => 1, :id => 'Unknown_page'
                 assert_response 404
               end
               def test_add_attachment
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count' do
                   post :add_attachment, :project_id => 1, :id => 'CookBook_documentation',
                     :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}}
                 end
                 attachment = Attachment.first(:order => 'id DESC')
                 assert_equal Wiki.find(1).find_page('CookBook_documentation'), attachment.container
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages