jro_apps/redmine Commit - r2215:31178553f330

Merged r2116, r2117 and r2187 from trunk....

Jean-Philippe Lang -

r2215:31178553f330

parent child

Context file:

r2215:31178553f330

Expand all files

vendor/plugins/acts_as_attachable/init.rb created 644 +2 0

@@ -0,0 +1,2
	1	require File.dirname(__FILE__) + '/lib/acts_as_attachable'
	2	ActiveRecord::Base.send(:include, Redmine::Acts::Attachable)

vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb created 644 +57 0

@@ -0,0 +1,57
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module Redmine
	19	module Acts
	20	module Attachable
	21	def self.included(base)
	22	base.extend ClassMethods
	23	end
	24
	25	module ClassMethods
	26	def acts_as_attachable(options = {})
	27	cattr_accessor :attachable_options
	28	self.attachable_options = {}
	29	attachable_options[:view_permission] = options.delete(:view_permission) \|\| "view_#{self.name.pluralize.underscore}".to_sym
	30	attachable_options[:delete_permission] = options.delete(:delete_permission) \|\| "edit_#{self.name.pluralize.underscore}".to_sym
	31
	32	has_many :attachments, options.merge(:as => :container,
	33	:order => "#{Attachment.table_name}.created_on",
	34	:dependent => :destroy)
	35	send :include, Redmine::Acts::Attachable::InstanceMethods
	36	end
	37	end
	38
	39	module InstanceMethods
	40	def self.included(base)
	41	base.extend ClassMethods
	42	end
	43
	44	def attachments_visible?(user=User.current)
	45	user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
	46	end
	47
	48	def attachments_deletable?(user=User.current)
	49	user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
	50	end
	51
	52	module ClassMethods
	53	end
	54	end
	55	end
	56	end
	57	end

app/controllers/attachments_controller.rb +25 -8

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2008  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
             class AttachmentsController < ApplicationController
               before_filter :find_project
+              before_filter :read_authorize, :except => :destroy
+              before_filter :delete_authorize, :only => :destroy
+              verify :method => :post, :only => :destroy
               def show
                 if @attachment.is_diff?
                   @diff = File.new(@attachment.diskfile, "rb").read
                 send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                                 :type => @attachment.content_type,
                                                 :disposition => (@attachment.image? ? 'inline' : 'attachment')
               end
+              def destroy
+                # Make sure association callbacks are called
+                @attachment.container.attachments.delete(@attachment)
+                redirect_to :back
+              rescue ::ActionController::RedirectBackError
+                redirect_to :controller => 'projects', :action => 'show', :id => @project
+              end
             private
               def find_project
                 @attachment = Attachment.find(params[:id])
                 # Show 404 if the filename in the url is wrong
                 raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
                 @project = @attachment.project
-                permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
-                allowed = User.current.allowed_to?(permission, @project)
-                allowed ? true : (User.current.logged? ? render_403 : require_login)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def read_authorize
+                @attachment.visible? ? true : deny_access
+              end
+              def delete_authorize
+                @attachment.deletable? ? true : deny_access
+              end
             end

app/controllers/documents_controller.rb 0 -5

                 Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
                 redirect_to :action => 'show', :id => @document
               end
-              def destroy_attachment
-                @document.attachments.find(params[:attachment_id]).destroy
-                redirect_to :action => 'show', :id => @document
-              end
             private
               def find_project

app/controllers/issues_controller.rb +1 -12

             class IssuesController < ApplicationController
               menu_item :new_issue, :only => :new
-              before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
+              before_filter :find_issue, :only => [:show, :edit, :reply]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
               before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
                 @issues.each(&:destroy)
                 redirect_to :action => 'index', :project_id => @project
               end
-              def destroy_attachment
-                a = @issue.attachments.find(params[:attachment_id])
-                a.destroy
-                journal = @issue.init_journal(User.current)
-                journal.details << JournalDetail.new(:property => 'attachment',
-                                                     :prop_key => a.id,
-                                                     :old_value => a.filename)
-                journal.save
-                redirect_to :action => 'show', :id => @issue
-              end
               def gantt
                 @gantt = Redmine::Helpers::Gantt.new(params)

app/controllers/projects_controller.rb +8 -4

               def add_file
                 if request.post?
-                  @version = @project.versions.find_by_id(params[:version_id])
+                  container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-                  attachments = attach_files(@version, params[:attachments])
+                  attachments = attach_files(container, params[:attachments])
-                  Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
+                  if !attachments.empty? && Setting.notified_events.include?('file_added')
+                    Mailer.deliver_attachments_added(attachments)
+                  end
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
+                  return
                 end
                 @versions = @project.versions.sort
               end
                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
-                @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+                @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
+                @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               end

app/controllers/versions_controller.rb 0 -6

                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
               end
-              def destroy_file
-                @version.attachments.find(params[:attachment_id]).destroy
-                flash[:notice] = l(:notice_successful_delete)
-                redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-              end
               def status_by
                 respond_to do |format|
                   format.html { render :action => 'show' }

app/controllers/wiki_controller.rb +1 -8

               before_filter :find_wiki, :authorize
               before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
-              verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
+              verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :index }
               helper :attachments
               include AttachmentsHelper
                 redirect_to :action => 'index', :page => @page.title
               end
-              def destroy_attachment
-                @page = @wiki.find_page(params[:page])
-                return render_403 unless editable?
-                @page.attachments.find(params[:attachment_id]).destroy
-                redirect_to :action => 'index', :page => @page.title
-              end
             private
               def find_wiki

app/helpers/attachments_helper.rb +9 -4

@@ -16,10 +16,15
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module AttachmentsHelper	18	module AttachmentsHelper
19	# displays the links to ~~a collection of~~ attachments	19	# Displays view/delete links to the attachments of the given object
20	def link_to_attachments(attachments, options = {})	20	# Options:
21	if attachments.any?	21	# :author -- author names are not displayed if set to false
22	render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}	22	def link_to_attachments(container, options = {})
		23	options.assert_valid_keys(:author)
		24
		25	if container.attachments.any?
		26	options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
		27	render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options}
23	end	28	end
24	end	29	end
25		30

app/models/attachment.rb +8 0

                 container.project
               end
+              def visible?(user=User.current)
+                container.attachments_visible?(user)
+              end
+              def deletable?(user=User.current)
+                container.attachments_deletable?(user)
+              end
               def image?
                 self.filename =~ /\.(jpe?g|gif|png)$/i
               end

app/models/document.rb +1 -1

             class Document < ActiveRecord::Base
               belongs_to :project
               belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
-              has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_attachable :delete_permission => :manage_documents
               acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},

app/models/issue.rb +12 -1

               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
-              has_many :attachments, :as => :container, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
+              acts_as_attachable :after_remove => :attachment_removed
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
+              private
+              # Callback on attachment deletion
+              def attachment_removed(obj)
+                journal = init_journal(User.current)
+                journal.details << JournalDetail.new(:property => 'attachment',
+                                                     :prop_key => obj.id,
+                                                     :old_value => obj.filename)
+                journal.save
+              end
             end

app/models/mailer.rb +3 0

                 added_to = ''
                 added_to_url = ''
                 case container.class.name
+                when 'Project'
+                  added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
+                  added_to = "#{l(:label_project)}: #{container}"
                 when 'Version'
                   added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
                   added_to = "#{l(:label_version)}: #{container.name}"

app/models/message.rb +1 -1

               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
-              has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_attachable
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
               acts_as_searchable :columns => ['subject', 'content'],

app/models/project.rb +2 0

                                       :association_foreign_key => 'custom_field_id'
               acts_as_tree :order => "name", :counter_cache => true
+              acts_as_attachable :view_permission => :view_files,
+                                 :delete_permission => :manage_files
               acts_as_customizable
               acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil

app/models/version.rb +2 -1

               before_destroy :check_integrity
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
-              has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_attachable :view_permission => :view_files,
+                                 :delete_permission => :manage_files
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]

app/models/wiki_page.rb +5 -1

             class WikiPage < ActiveRecord::Base
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
-              has_many :attachments, :as => :container, :dependent => :destroy
+              acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :order => 'title'
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
               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)

app/views/attachments/_links.rhtml +3 -3

             <p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
             <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
               <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-              <% if options[:delete_url] %>
+              <% if options[:deletable] %>
-                <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}),
+                <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => attachment},
                                                      :confirm => l(:text_are_you_sure),
                                                      :method => :post,
                                                      :class => 'delete',
                                                      :title => l(:button_delete) %>
               <% end %>
-              <% unless options[:no_author] %>
+              <% if options[:author] %>
                 <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
               <% end %>
               </p>

app/views/documents/show.rhtml +1 -1

             </div>
             <h3><%= l(:label_attachment_plural) %></h3>
-            <%= link_to_attachments @attachments, :delete_url => (authorize_for('documents', 'destroy_attachment') ? {:controller => 'documents', :action => 'destroy_attachment', :id => @document} : nil) %>
+            <%= link_to_attachments @document %>
             <% if authorize_for('documents', 'add_attachment') %>
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",

app/views/issues/show.rhtml +1 -3

             <%= textilizable @issue, :description, :attachments => @issue.attachments %>
             </div>
-            <% if @issue.attachments.any? %>
+            <%= link_to_attachments @issue %>
-            <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
-            <% end %>
             <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
             <hr />

app/views/messages/show.rhtml +2 -2

             <div class="wiki">
             <%= textilizable(@topic.content, :attachments => @topic.attachments) %>
             </div>
-            <%= link_to_attachments @topic.attachments, :no_author => true %>
+            <%= link_to_attachments @topic, :author => false %>
             </div>
             <br />
               <div class="message reply">
               <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
               <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
-              <%= link_to_attachments message.attachments, :no_author => true %>
+              <%= link_to_attachments message, :author => false %>
               </div>
             <% end %>
             <% end %>

app/views/projects/add_file.rhtml +6 -3

             <div class="box">
             <% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
-            <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
+            <% if @versions.any? %>
-            <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
+            <p><label for="version_id"><%=l(:field_version)%></label>
+            <%= select_tag "version_id", content_tag('option', '') +
+            														 options_from_collection_for_select(@versions, "id", "name") %></p>
+            <% end %>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             </div>
             <%= submit_tag l(:button_add) %>
-            <% end %> 
  No newline at end of file
+            <% end %>

app/views/projects/list_files.rhtml +10 -12

             <h2><%=l(:label_attachment_plural)%></h2>
-            <% delete_allowed = authorize_for('versions', 'destroy_file') %>
+            <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
             <table class="list">
               <thead><tr>
-                <th><%=l(:field_version)%></th>
                 <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
                 <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
                 <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
                 <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
                 <th>MD5</th>
-                <% if delete_allowed %><th></th><% end %>
+                <th></th>
               </tr></thead>
               <tbody>
-            <% for version in @versions %>
+            <% @containers.each do |container| %>
-              <% unless version.attachments.empty? %>
+              <% next if container.attachments.empty? -%>
-              <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
+            	<% if container.is_a?(Version) -%>
-              <% for file in version.attachments %>
+              <tr><th colspan="6" align="left"><span class="icon icon-package"><b><%=h container %></b></span></th></tr>
+            	<% end -%>
+              <% container.attachments.each do |file| %>
               <tr class="<%= cycle("odd", "even") %>">
-                <td></td>
                 <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
                 <td align="center"><%= format_time(file.created_on) %></td>
                 <td align="center"><%= number_to_human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
-                <% if delete_allowed %>
                 <td align="center">
-                    <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post %>
+                <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
+            																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
                 </td>
-                <% end %>
               </tr>
               <% end
               reset_cycle %>
-              <% end %>
             <% end %>
               </tbody>
             </table>

app/views/wiki/show.rhtml +1 -1

             <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-            <%= link_to_attachments @page.attachments, :delete_url => ((@editable && authorize_for('wiki', 'destroy_attachment')) ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
+            <%= link_to_attachments @page %>
             <% if @editable && authorize_for('wiki', 'add_attachment') %>
             <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",

doc/CHANGELOG +1 0

             == v0.8.1
             * Select watchers on new issue form
+            * Files module: ability to add files without version
             * Show view/annotate/download links on entry and annotate views
             * Fixed: Deleted files are shown when using Darcs

lib/redmine.rb +4 -4

                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:issues => :new}
-                map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit, :destroy_attachment]}
+                map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => [:edit, :reply]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
               end
               map.project_module :documents do |map|
-                map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
+                map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
-                map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
+                map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
                 map.permission :view_wiki_pages, :wiki => [:index, :special]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
-                map.permission :delete_wiki_pages_attachments, :wiki => :destroy_attachment
+                map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end

test/fixtures/attachments.yml +24 0

@@ -85,4 +85,28 attachments_007:
85	filename: archive.zip	85	filename: archive.zip
86	author_id: 1	86	author_id: 1
87	content_type: application/octet-stream	87	content_type: application/octet-stream
		88	attachments_008:
		89	created_on: 2006-07-19 21:07:27 +02:00
		90	container_type: Project
		91	container_id: 1
		92	downloads: 0
		93	disk_filename: 060719210727_project_file.zip
		94	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
		95	id: 8
		96	filesize: 320
		97	filename: project_file.zip
		98	author_id: 2
		99	content_type: application/octet-stream
		100	attachments_009:
		101	created_on: 2006-07-19 21:07:27 +02:00
		102	container_type: Version
		103	container_id: 1
		104	downloads: 0
		105	disk_filename: 060719210727_version_file.zip
		106	digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
		107	id: 9
		108	filesize: 452
		109	filename: version_file.zip
		110	author_id: 2
		111	content_type: application/octet-stream
88	No newline at end of file	112

test/functional/attachments_controller_test.rb +46 0

@@ -76,4 +76,50 class AttachmentsControllerTest < Test::Unit::TestCase
76	get :download, :id => 7	76	get :download, :id => 7
77	assert_redirected_to 'account/login'	77	assert_redirected_to 'account/login'
78	end	78	end
		79
		80	def test_destroy_issue_attachment
		81	issue = Issue.find(3)
		82	@request.session[:user_id] = 2
		83
		84	assert_difference 'issue.attachments.count', -1 do
		85	post :destroy, :id => 1
		86	end
		87	# no referrer
		88	assert_redirected_to 'projects/show/ecookbook'
		89	assert_nil Attachment.find_by_id(1)
		90	j = issue.journals.find(:first, :order => 'created_on DESC')
		91	assert_equal 'attachment', j.details.first.property
		92	assert_equal '1', j.details.first.prop_key
		93	assert_equal 'error281.txt', j.details.first.old_value
		94	end
		95
		96	def test_destroy_wiki_page_attachment
		97	@request.session[:user_id] = 2
		98	assert_difference 'Attachment.count', -1 do
		99	post :destroy, :id => 3
		100	assert_response 302
		101	end
		102	end
		103
		104	def test_destroy_project_attachment
		105	@request.session[:user_id] = 2
		106	assert_difference 'Attachment.count', -1 do
		107	post :destroy, :id => 8
		108	assert_response 302
		109	end
		110	end
		111
		112	def test_destroy_version_attachment
		113	@request.session[:user_id] = 2
		114	assert_difference 'Attachment.count', -1 do
		115	post :destroy, :id => 9
		116	assert_response 302
		117	end
		118	end
		119
		120	def test_destroy_without_permission
		121	post :destroy, :id => 3
		122	assert_redirected_to '/login'
		123	assert Attachment.find_by_id(3)
		124	end
79	end	125	end

test/functional/issues_controller_test.rb 0 -13

@@ -747,17 +747,4 class IssuesControllerTest < Test::Unit::TestCase
747	assert_equal 2, TimeEntry.find(1).issue_id	747	assert_equal 2, TimeEntry.find(1).issue_id
748	assert_equal 2, TimeEntry.find(2).issue_id	748	assert_equal 2, TimeEntry.find(2).issue_id
749	end	749	end
750
751	def test_destroy_attachment
752	issue = Issue.find(3)
753	a = issue.attachments.size
754	@request.session[:user_id] = 2
755	post :destroy_attachment, :id => 3, :attachment_id => 1
756	assert_redirected_to 'issues/show/3'
757	assert_nil Attachment.find_by_id(1)
758	issue.reload
759	assert_equal((a-1), issue.attachments.size)
760	j = issue.journals.find(:first, :order => 'created_on DESC')
761	assert_equal 'attachment', j.details.first.property
762	end
763	end	750	end

test/functional/messages_controller_test.rb +1 -1

               def test_post_new
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
-                Setting.notified_events << 'message_posted'
+                Setting.notified_events = ['message_posted']
                 post :new, :board_id => 1,
                            :message => { :subject => 'Test created message',

test/functional/projects_controller_test.rb +47 -2

@@ -23,7 +23,8 class ProjectsController; def rescue_action(e) raise e end; end
23		23
24	class ProjectsControllerTest < Test::Unit::TestCase	24	class ProjectsControllerTest < Test::Unit::TestCase
25	fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,	25	fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
26	:trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages	26	:trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
		27	:attachments
27		28
28	def setup	29	def setup
29	@controller = ProjectsController.new	30	@controller = ProjectsController.new
@@ -112,12 +113,56 class ProjectsControllerTest < Test::Unit::TestCase
112	assert_redirected_to 'admin/projects'	113	assert_redirected_to 'admin/projects'
113	assert_nil Project.find_by_id(1)	114	assert_nil Project.find_by_id(1)
114	end	115	end
		116
		117	def test_add_file
		118	set_tmp_attachments_directory
		119	@request.session[:user_id] = 2
		120	Setting.notified_events = ['file_added']
		121	ActionMailer::Base.deliveries.clear
		122
		123	assert_difference 'Attachment.count' do
		124	post :add_file, :id => 1, :version_id => '',
		125	:attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
		126	end
		127	assert_redirected_to 'projects/list_files/ecookbook'
		128	a = Attachment.find(:first, :order => 'created_on DESC')
		129	assert_equal 'testfile.txt', a.filename
		130	assert_equal Project.find(1), a.container
		131
		132	mail = ActionMailer::Base.deliveries.last
		133	assert_kind_of TMail::Mail, mail
		134	assert_equal "[eCookbook] New file", mail.subject
		135	assert mail.body.include?('testfile.txt')
		136	end
		137
		138	def test_add_version_file
		139	set_tmp_attachments_directory
		140	@request.session[:user_id] = 2
		141	Setting.notified_events = ['file_added']
		142
		143	assert_difference 'Attachment.count' do
		144	post :add_file, :id => 1, :version_id => '2',
		145	:attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
		146	end
		147	assert_redirected_to 'projects/list_files/ecookbook'
		148	a = Attachment.find(:first, :order => 'created_on DESC')
		149	assert_equal 'testfile.txt', a.filename
		150	assert_equal Version.find(2), a.container
		151	end
115		152
116	def test_list_files	153	def test_list_files
117	get :list_files, :id => 1	154	get :list_files, :id => 1
118	assert_response :success	155	assert_response :success
119	assert_template 'list_files'	156	assert_template 'list_files'
120	assert_not_nil assigns(:~~version~~s)	157	assert_not_nil assigns(:containers)
		158
		159	# file attached to the project
		160	assert_tag :a, :content => 'project_file.zip',
		161	:attributes => { :href => '/attachments/download/8/project_file.zip' }
		162
		163	# file attached to a project's version
		164	assert_tag :a, :content => 'version_file.zip',
		165	:attributes => { :href => '/attachments/download/9/version_file.zip' }
121	end	166	end
122		167
123	def test_changelog	168	def test_changelog

test/functional/wiki_controller_test.rb 0 -7

                 assert_template 'edit'
               end
-              def test_destroy_attachment
-                @request.session[:user_id] = 2
-                assert_difference 'Attachment.count', -1 do
-                  post :destroy_attachment, :id => 1, :page => 'Page_with_an_inline_image', :attachment_id => 3
-                end
-              end
               def test_history_of_non_existing_page_should_return_404
                 get :history, :id => 1, :page => 'Unknown_page'
                 assert_response 404

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