jro_apps/redmine Commit - r3012:a2b4bb0dfb93

Ability to add a new version from the issue form (#4315)....

Jean-Philippe Lang -

r3012:a2b4bb0dfb93

parent child

Context file:

r3012:a2b4bb0dfb93

Collapse all files

app/controllers/projects_controller.rb +22 -3

             # Redmine - project management software
             # Copyright (C) 2006-2009  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.
             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
               before_filter :authorize_global, :only => :add
               before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_key_auth :activity
               after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
                 if controller.request.post?
                   controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                 end
               end
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 respond_to do |format|
                   format.html {
                     @projects = Project.visible.find(:all, :order => 'lft')
                   }
                   format.atom {
                     projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                           :limit => Setting.feeds_limit.to_i)
                     render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               # Add a new project
               def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
                 if request.get?
                   @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   @project.trackers = Tracker.all
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Setting.default_projects_modules
                 else
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                     # Add current user as a project member if he is not admin
                     unless User.current.admin?
                       r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                       m = Member.new(:user => User.current, :roles => [r])
                       @project.members << m
                     end
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'projects', :action => 'settings', :id => @project
                   end
                 end
               end
               def copy
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 @source_project = Project.find(params[:id])
                 if request.get?
                   @project = Project.copy_from(@source_project)
                   if @project
                     @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   else
                     redirect_to :controller => 'admin', :action => 'projects'
                   end
                 else
                   @project = Project.new(params[:project])
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.copy(@source_project, :only => params[:only])
                     @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Show @project
               def show
                 if params[:jump]
                   # try to redirect to the requested menu item
                   redirect_to_project_menu_item(@project, params[:jump]) && return
                 end
                 @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                 @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end
               def settings
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.attributes = params[:project]
                   if @project.save
                     @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 if request.post?
                   unless @project.archive
                     flash[:error] = l(:error_can_not_archive_project)
                   end
                 end
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post?
                   if @category.save
                 	  respond_to do |format|
                       format.html do
                         flash[:notice] = l(:notice_successful_create)
                         redirect_to :action => 'settings', :tab => 'categories', :id => @project
                       end
                       format.js do
                         # IE doesn't support the replace_html rjs method for select box options
                         render(:update) {|page| page.replace "issue_category_id",
                           content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                         }
                       end
                     end
                   else
                     respond_to do |format|
                       format.html
                       format.js do
                         render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
                       end
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
                 @version = @project.versions.build
                 if params[:version]
                   attributes = params[:version].dup
                   attributes.delete('sharing') unless attributes.nil? || @version.allowed_sharings.include?(attributes['sharing'])
                   @version.attributes = attributes
                 end
-              	if request.post? and @version.save
+              	if request.post?
-              	  flash[:notice] = l(:notice_successful_create)
+              	  if @version.save
-                  redirect_to :action => 'settings', :tab => 'versions', :id => @project
+                    respond_to do |format|
+                      format.html do
+                        flash[:notice] = l(:notice_successful_create)
+                        redirect_to :action => 'settings', :tab => 'versions', :id => @project
+                      end
+                      format.js do
+                        # IE doesn't support the replace_html rjs method for select box options
+                        render(:update) {|page| page.replace "issue_fixed_version_id",
+                          content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
+                        }
+                      end
+                    end
+                  else
+                    respond_to do |format|
+                      format.html
+                      format.js do
+                        render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
+                      end
+                    end
+              	  end
               	end
               end
               def add_file
                 if request.post?
                   container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                   attachments = attach_files(container, params[:attachments])
                   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
               def save_activities
                 if request.post? && params[:enumerations]
                   Project.transaction do
                     params[:enumerations].each do |id, activity|
                       @project.update_or_create_time_entry_activity(id, activity)
                     end
                   end
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
               end
               def reset_activities
                 @project.time_entry_activities.each do |time_entry_activity|
                   time_entry_activity.destroy(time_entry_activity.parent)
                 end
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
               end
               def list_files
                 sort_init 'filename', 'asc'
                 sort_update 'filename' => "#{Attachment.table_name}.filename",
                             'created_on' => "#{Attachment.table_name}.created_on",
                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
                 @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
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                 @versions = @project.shared_versions.sort
                 @issues_by_version = {}
                 unless @selected_tracker_ids.empty?
                   @versions.each do |version|
                     conditions = {:tracker_id => @selected_tracker_ids, "#{IssueStatus.table_name}.is_closed" => true}
                     if !@project.versions.include?(version)
                       conditions.merge!(:project_id => project_ids)
                     end
                     issues = version.fixed_issues.visible.find(:all,
                                                                :include => [:status, :tracker, :priority],
                                                                :conditions => conditions,
                                                                :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
                     @issues_by_version[version] = issues
                   end
                 end
                 @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].empty?}
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
                 @versions = @project.shared_versions.sort
                 @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
                 @issues_by_version = {}
                 unless @selected_tracker_ids.empty?
                   @versions.each do |version|
                     conditions = {:tracker_id => @selected_tracker_ids}
                     if !@project.versions.include?(version)
                       conditions.merge!(:project_id => project_ids)
                     end
                     issues = version.fixed_issues.visible.find(:all,
                                                                :include => [:status, :tracker, :priority],
                                                                :conditions => conditions,
                                                                :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
                     @issues_by_version[version] = issues
                   end
                 end
                 @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].empty?}
               end
               def activity
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date + 1; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                          :with_subprojects => @with_subprojects,
                                                                          :author => @author)
                 @activity.scope_select {|t| !params["show_#{t}"].nil?}
                 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                 events = @activity.events(@date_from, @date_to)
                 if events.empty? || stale?(:etag => [events.first, User.current])
                   respond_to do |format|
                     format.html {
                       @events_by_day = events.group_by(&:event_date)
                       render :layout => false if request.xhr?
                     }
                     format.atom {
                       title = l(:label_activity)
                       if @author
                         title = @author.name
                       elsif @activity.scope.size == 1
                         title = l("label_#{@activity.scope.first.singularize}_plural")
                       end
                       render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                     }
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/views/issues/_attributes.rhtml +8 -1

             <% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %>
             <div class="splitcontentleft">
             <% if @issue.new_record? || @allowed_statuses.any? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
             <% end %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
             <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
             <% unless @project.issue_categories.empty? %>
             <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_issue_category_new),
                                  'category[name]',
                                  {:controller => 'projects', :action => 'add_issue_category', :id => @project},
                                  :title => l(:label_issue_category_new),
                                  :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
             <% end %>
             <% unless @issue.assignable_versions.empty? %>
-            <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %></p>
+            <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %>
+            <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
+                                 l(:label_version_new),
+                                 'version[name]',
+                                 {:controller => 'projects', :action => 'add_version', :id => @project},
+                                 :title => l(:label_version_new),
+                                 :tabindex => 200) if authorize_for('projects', 'add_version') %>
+            </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
             <p><%= f.text_field :due_date, :size => 10 %><%= calendar_for('issue_due_date') %></p>
             <p><%= f.text_field :estimated_hours, :size => 3 %> <%= l(:field_hours) %></p>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
             </div>
             <div style="clear:both;"> </div>
             <%= render :partial => 'form_custom_fields' %>
             <% end %>

test/functional/projects_controller_test.rb +23 0

             # Redmine - project management software
             # 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
             # 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.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
                        :attachments, :custom_fields, :custom_values, :time_entries
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
               end
               def test_index_routing
                 assert_routing(
                   {:method => :get, :path => '/projects'},
                   :controller => 'projects', :action => 'index'
                 )
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:projects)
                 assert_tag :ul, :child => {:tag => 'li',
                                            :descendant => {:tag => 'a', :content => 'eCookbook'},
                                            :child => { :tag => 'ul',
                                                        :descendant => { :tag => 'a',
                                                                         :content => 'Child of private child'
                                                                        }
                                                       }
                                            }
                 assert_no_tag :a, :content => /Private child of eCookbook/
               end
               def test_index_atom_routing
                 assert_routing(
                   {:method => :get, :path => '/projects.atom'},
                   :controller => 'projects', :action => 'index', :format => 'atom'
                 )
               end
               def test_index_atom
                 get :index, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
                 assert_select 'feed>title', :text => 'Redmine: Latest projects'
                 assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
               end
               def test_add_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/new'},
                   :controller => 'projects', :action => 'add'
                 )
                 assert_recognizes(
                   {:controller => 'projects', :action => 'add'},
                   {:method => :post, :path => '/projects/new'}
                 )
                 assert_recognizes(
                   {:controller => 'projects', :action => 'add'},
                   {:method => :post, :path => '/projects'}
                 )
               end
               def test_get_add
                 @request.session[:user_id] = 1
                 get :add
                 assert_response :success
                 assert_template 'add'
               end
               def test_get_add_by_non_admin
                 @request.session[:user_id] = 2
                 get :add
                 assert_response :success
                 assert_template 'add'
               end
               def test_post_add
                 @request.session[:user_id] = 1
                 post :add, :project => { :name => "blog",
                                          :description => "weblog",
                                          :identifier => "blog",
                                          :is_public => 1,
                                          :custom_field_values => { '3' => 'Beta' }
                                         }
                 assert_redirected_to '/projects/blog/settings'
                 project = Project.find_by_name('blog')
                 assert_kind_of Project, project
                 assert_equal 'weblog', project.description
                 assert_equal true, project.is_public?
                 assert_nil project.parent
               end
               def test_post_add_subproject
                 @request.session[:user_id] = 1
                 post :add, :project => { :name => "blog",
                                          :description => "weblog",
                                          :identifier => "blog",
                                          :is_public => 1,
                                          :custom_field_values => { '3' => 'Beta' },
                                          :parent_id => 1
                                         }
                 assert_redirected_to '/projects/blog/settings'
                 project = Project.find_by_name('blog')
                 assert_kind_of Project, project
                 assert_equal Project.find(1), project.parent
               end
               def test_post_add_by_non_admin
                 @request.session[:user_id] = 2
                 post :add, :project => { :name => "blog",
                                          :description => "weblog",
                                          :identifier => "blog",
                                          :is_public => 1,
                                          :custom_field_values => { '3' => 'Beta' }
                                         }
                 assert_redirected_to '/projects/blog/settings'
                 project = Project.find_by_name('blog')
                 assert_kind_of Project, project
                 assert_equal 'weblog', project.description
                 assert_equal true, project.is_public?
                 # User should be added as a project member
                 assert User.find(2).member_of?(project)
                 assert_equal 1, project.members.size
               end
               def test_show_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/test'},
                   :controller => 'projects', :action => 'show', :id => 'test'
                 )
               end
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_show_should_not_fail_when_custom_values_are_nil
                 project = Project.find_by_identifier('ecookbook')
                 project.custom_values.first.update_attribute(:value, nil)
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               end
               def test_settings_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/4223/settings'},
                   :controller => 'projects', :action => 'settings', :id => '4223'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/4223/settings/members'},
                   :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
                 )
               end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name',
                                                    :issue_custom_field_ids => ['']}
                 assert_redirected_to 'projects/ecookbook/settings'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_add_version_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/64/versions/new'},
                   :controller => 'projects', :action => 'add_version', :id => '64'
                 )
                 assert_routing(
                 #TODO: use PUT
                   {:method => :post, :path => 'projects/64/versions/new'},
                   :controller => 'projects', :action => 'add_version', :id => '64'
                 )
               end
+              def test_add_version
+                @request.session[:user_id] = 2 # manager
+                assert_difference 'Version.count' do
+                  post :add_version, :id => '1', :version => {:name => 'test_add_version'}
+                end
+                assert_redirected_to '/projects/ecookbook/settings/versions'
+                version = Version.find_by_name('test_add_version')
+                assert_not_nil version
+                assert_equal 1, version.project_id
+              end
+              def test_add_version_from_issue_form
+                @request.session[:user_id] = 2 # manager
+                assert_difference 'Version.count' do
+                  xhr :post, :add_version, :id => '1', :version => {:name => 'test_add_version_from_issue_form'}
+                end
+                assert_response :success
+                assert_select_rjs :replace, 'issue_fixed_version_id'
+                version = Version.find_by_name('test_add_version_from_issue_form')
+                assert_not_nil version
+                assert_equal 1, version.project_id
+              end
               def test_add_issue_category_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/test/categories/new'},
                   :controller => 'projects', :action => 'add_issue_category', :id => 'test'
                 )
                 assert_routing(
                 #TODO: use PUT and update form
                   {:method => :post, :path => 'projects/64/categories/new'},
                   :controller => 'projects', :action => 'add_issue_category', :id => '64'
                 )
               end
               def test_destroy_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/destroy'},
                   :controller => 'projects', :action => 'destroy', :id => '567'
                 )
                 assert_routing(
                 #TODO: use DELETE and update form
                   {:method => :post, :path => 'projects/64/destroy'},
                   :controller => 'projects', :action => 'destroy', :id => '64'
                 )
               end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_add_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/ecookbook/files'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Project.find(1), a.container
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert_equal "[eCookbook] New file", mail.subject
                 assert mail.body.include?('testfile.txt')
               end
               def test_add_file_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/33/files/new'},
                   :controller => 'projects', :action => 'add_file', :id => '33'
                 )
                 assert_routing(
                   {:method => :post, :path => '/projects/33/files/new'},
                   :controller => 'projects', :action => 'add_file', :id => '33'
                 )
               end
               def test_add_version_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/ecookbook/files'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Version.find(2), a.container
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:containers)
                 # file attached to the project
                 assert_tag :a, :content => 'project_file.zip',
                                :attributes => { :href => '/attachments/download/8/project_file.zip' }
                 # file attached to a project's version
                 assert_tag :a, :content => 'version_file.zip',
                                :attributes => { :href => '/attachments/download/9/version_file.zip' }
               end
               def test_list_files_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/33/files'},
                   :controller => 'projects', :action => 'list_files', :id => '33'
                 )
               end
               def test_changelog_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/44/changelog'},
                   :controller => 'projects', :action => 'changelog', :id => '44'
                 )
               end
               def test_changelog
                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:versions)
               end
               def test_changelog_showing_subprojects_versions
                 get :changelog, :id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:versions)
                 # Version on subproject appears
                 assert assigns(:versions).include?(Version.find(4))
               end
               def test_roadmap_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/33/roadmap'},
                   :controller => 'projects', :action => 'roadmap', :id => '33'
                 )
               end
               def test_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_with_completed_versions
                 get :roadmap, :id => 1, :completed => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_showing_subprojects_versions
                 get :roadmap, :id => 1, :with_subprojects => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version on subproject appears
                 assert assigns(:versions).include?(Version.find(4))
               end
               def test_project_activity_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/1/activity'},
                    :controller => 'projects', :action => 'activity', :id => '1'
                 )
               end
               def test_project_activity_atom_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/1/activity.atom'},
                    :controller => 'projects', :action => 'activity', :id => '1', :format => 'atom'
                 )
               end
               def test_project_activity
                 get :activity, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue-edit/ },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
               end
               def test_previous_project_activity
                 get :activity, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_global_activity_routing
                 assert_routing({:method => :get, :path => '/activity'}, :controller => 'projects', :action => 'activity', :id => nil)
               end
               def test_global_activity
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{5.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(5).subject}/,
                                }
                              }
                            }
               end
               def test_user_activity
                 get :activity, :user_id => 2
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_global_activity_atom_routing
                 assert_routing({:method => :get, :path => '/activity.atom'}, :controller => 'projects', :action => 'activity', :id => nil, :format => 'atom')
               end
               def test_activity_atom_feed
                 get :activity, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
               end
               def test_archive_routing
                 assert_routing(
                 #TODO: use PUT to project path and modify form
                   {:method => :post, :path => 'projects/64/archive'},
                   :controller => 'projects', :action => 'archive', :id => '64'
                 )
               end
               def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
               def test_unarchive_routing
                 assert_routing(
                 #TODO: use PUT to project path and modify form
                   {:method => :post, :path => '/projects/567/unarchive'},
                   :controller => 'projects', :action => 'unarchive', :id => '567'
                 )
               end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
               def test_project_breadcrumbs_should_be_limited_to_3_ancestors
                 CustomField.delete_all
                 parent = nil
 .times do |i|
                   p = Project.create!(:name => "Breadcrumbs #{i}", :identifier => "breadcrumbs-#{i}")
                   p.set_parent!(parent)
                   get :show, :id => p
                   assert_tag :h1, :parent => { :attributes => {:id => 'header'}},
                                   :children => { :count => [i, 3].min,
                                                  :only => { :tag => 'a' } }
                   parent = p
                 end
               end
               def test_copy_with_project
                 @request.session[:user_id] = 1 # admin
                 get :copy, :id => 1
                 assert_response :success
                 assert_template 'copy'
                 assert assigns(:project)
                 assert_equal Project.find(1).description, assigns(:project).description
                 assert_nil assigns(:project).id
               end
               def test_copy_without_project
                 @request.session[:user_id] = 1 # admin
                 get :copy
                 assert_response :redirect
                 assert_redirected_to :controller => 'admin', :action => 'projects'
               end
               def test_jump_should_redirect_to_active_tab
                 get :show, :id => 1, :jump => 'issues'
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               def test_jump_should_not_redirect_to_inactive_tab
                 get :show, :id => 3, :jump => 'documents'
                 assert_response :success
                 assert_template 'show'
               end
               def test_jump_should_not_redirect_to_unknown_tab
                 get :show, :id => 3, :jump => 'foobar'
                 assert_response :success
                 assert_template 'show'
               end
               def test_reset_activities_routing
                 assert_routing({:method => :delete, :path => 'projects/64/reset_activities'},
                                :controller => 'projects', :action => 'reset_activities', :id => '64')
               end
               def test_reset_activities
                 @request.session[:user_id] = 2 # manager
                 project_activity = TimeEntryActivity.new({
                                                            :name => 'Project Specific',
                                                            :parent => TimeEntryActivity.find(:first),
                                                            :project => Project.find(1),
                                                            :active => true
                                                          })
                 assert project_activity.save
                 project_activity_two = TimeEntryActivity.new({
                                                                :name => 'Project Specific Two',
                                                                :parent => TimeEntryActivity.find(:last),
                                                                :project => Project.find(1),
                                                                :active => true
                                                              })
                 assert project_activity_two.save
                 delete :reset_activities, :id => 1
                 assert_response :redirect
                 assert_redirected_to 'projects/ecookbook/settings/activities'
                 assert_nil TimeEntryActivity.find_by_id(project_activity.id)
                 assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
               end
               def test_reset_activities_should_reassign_time_entries_back_to_the_system_activity
                 @request.session[:user_id] = 2 # manager
                 project_activity = TimeEntryActivity.new({
                                                            :name => 'Project Specific Design',
                                                            :parent => TimeEntryActivity.find(9),
                                                            :project => Project.find(1),
                                                            :active => true
                                                          })
                 assert project_activity.save
                 assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
                 assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
                 delete :reset_activities, :id => 1
                 assert_response :redirect
                 assert_redirected_to 'projects/ecookbook/settings/activities'
                 assert_nil TimeEntryActivity.find_by_id(project_activity.id)
                 assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity"
                 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "TimeEntries still assigned to project specific activity"
               end
               def test_save_activities_routing
                 assert_routing({:method => :post, :path => 'projects/64/activities/save'},
                                :controller => 'projects', :action => 'save_activities', :id => '64')
               end
               def test_save_activities_to_override_system_activities
                 @request.session[:user_id] = 2 # manager
                 billable_field = TimeEntryActivityCustomField.find_by_name("Billable")
                 post :save_activities, :id => 1, :enumerations => {
                   "9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design, De-activate
                   "10"=> {"parent_id"=>"10", "custom_field_values"=>{"7"=>"0"}, "active"=>"1"}, # Development, Change custom value
                   "14"=>{"parent_id"=>"14", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"}, # Inactive Activity, Activate with custom value
                   "11"=>{"parent_id"=>"11", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"} # QA, no changes
                 }
                 assert_response :redirect
                 assert_redirected_to 'projects/ecookbook/settings/activities'
                 # Created project specific activities...
                 project = Project.find('ecookbook')
                 # ... Design
                 design = project.time_entry_activities.find_by_name("Design")
                 assert design, "Project activity not found"
                 assert_equal 9, design.parent_id # Relate to the system activity
                 assert_not_equal design.parent.id, design.id # Different records
                 assert_equal design.parent.name, design.name # Same name
                 assert !design.active?
                 # ... Development
                 development = project.time_entry_activities.find_by_name("Development")
                 assert development, "Project activity not found"
                 assert_equal 10, development.parent_id # Relate to the system activity
                 assert_not_equal development.parent.id, development.id # Different records
                 assert_equal development.parent.name, development.name # Same name
                 assert development.active?
                 assert_equal "0", development.custom_value_for(billable_field).value
                 # ... Inactive Activity
                 previously_inactive = project.time_entry_activities.find_by_name("Inactive Activity")
                 assert previously_inactive, "Project activity not found"
                 assert_equal 14, previously_inactive.parent_id # Relate to the system activity
                 assert_not_equal previously_inactive.parent.id, previously_inactive.id # Different records
                 assert_equal previously_inactive.parent.name, previously_inactive.name # Same name
                 assert previously_inactive.active?
                 assert_equal "1", previously_inactive.custom_value_for(billable_field).value
                 # ... QA
                 assert_equal nil, project.time_entry_activities.find_by_name("QA"), "Custom QA activity created when it wasn't modified"
               end
               def test_save_activities_will_update_project_specific_activities
                 @request.session[:user_id] = 2 # manager
                 project_activity = TimeEntryActivity.new({
                                                            :name => 'Project Specific',
                                                            :parent => TimeEntryActivity.find(:first),
                                                            :project => Project.find(1),
                                                            :active => true
                                                          })
                 assert project_activity.save
                 project_activity_two = TimeEntryActivity.new({
                                                                :name => 'Project Specific Two',
                                                                :parent => TimeEntryActivity.find(:last),
                                                                :project => Project.find(1),
                                                                :active => true
                                                              })
                 assert project_activity_two.save
                 post :save_activities, :id => 1, :enumerations => {
                   project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate
                   project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate
                 }
                 assert_response :redirect
                 assert_redirected_to 'projects/ecookbook/settings/activities'
                 # Created project specific activities...
                 project = Project.find('ecookbook')
                 assert_equal 2, project.time_entry_activities.count
                 activity_one = project.time_entry_activities.find_by_name(project_activity.name)
                 assert activity_one, "Project activity not found"
                 assert_equal project_activity.id, activity_one.id
                 assert !activity_one.active?
                 activity_two = project.time_entry_activities.find_by_name(project_activity_two.name)
                 assert activity_two, "Project activity not found"
                 assert_equal project_activity_two.id, activity_two.id
                 assert !activity_two.active?
               end
               def test_save_activities_when_creating_new_activities_will_convert_existing_data
                 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
                 @request.session[:user_id] = 2 # manager
                 post :save_activities, :id => 1, :enumerations => {
                   "9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"} # Design, De-activate
                 }
                 assert_response :redirect
                 # No more TimeEntries using the system activity
                 assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "Time Entries still assigned to system activities"
                 # All TimeEntries using project activity
                 project_specific_activity = TimeEntryActivity.find_by_parent_id_and_project_id(9, 1)
                 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_specific_activity.id, 1).size, "No Time Entries assigned to the project activity"
               end
               def test_save_activities_when_creating_new_activities_will_not_convert_existing_data_if_an_exception_is_raised
                 # TODO: Need to cause an exception on create but these tests
                 # aren't setup for mocking.  Just create a record now so the
                 # second one is a dupicate
                 parent = TimeEntryActivity.find(9)
                 TimeEntryActivity.create!({:name => parent.name, :project_id => 1, :position => parent.position, :active => true})
                 TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1), :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'})
                 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size
                 assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size
                 @request.session[:user_id] = 2 # manager
                 post :save_activities, :id => 1, :enumerations => {
                   "9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design
                   "10"=> {"parent_id"=>"10", "custom_field_values"=>{"7"=>"0"}, "active"=>"1"} # Development, Change custom value
                 }
                 assert_response :redirect
                 # TimeEntries shouldn't have been reassigned on the failed record
                 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "Time Entries are not assigned to system activities"
                 # TimeEntries shouldn't have been reassigned on the saved record either
                 assert_equal 1, TimeEntry.find_all_by_activity_id_and_project_id(10, 1).size, "Time Entries are not assigned to system activities"
               end
               # A hook that is manually registered later
               class ProjectBasedTemplate < Redmine::Hook::ViewListener
                 def view_layouts_base_html_head(context)
                   # Adds a project stylesheet
                   stylesheet_link_tag(context[:project].identifier) if context[:project]
                 end
               end
               # Don't use this hook now
               Redmine::Hook.clear_listeners
               def test_hook_response
                 Redmine::Hook.add_listener(ProjectBasedTemplate)
                 get :show, :id => 1
                 assert_tag :tag => 'link', :attributes => {:href => '/stylesheets/ecookbook.css'},
                                            :parent => {:tag => 'head'}
                 Redmine::Hook.clear_listeners
               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