diff options
| -rw-r--r-- | app/controllers/projects_controller.rb | 48 | ||||
| -rw-r--r-- | test/functional/projects_controller_test.rb | 187 |
2 files changed, 122 insertions, 113 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index aab86db..8a89ab8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -21,7 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #++ -class ProjectsController < ApplicationController +class ProjectsController < ApplicationController before_filter :login_required, :only => [:create, :update, :destroy, :new, :edit, :confirm_delete] before_filter :check_if_only_site_admins_can_create, :only => [:new, :create] @@ -31,26 +31,26 @@ class ProjectsController < ApplicationController before_filter :require_user_has_ssh_keys, :only => [:new, :create] renders_in_site_specific_context :only => [:show, :edit, :update, :confirm_delete] renders_in_global_context :except => [:show, :edit, :update, :confirm_delete, :clones] - + def index - @projects = Project.paginate(:all, :order => "projects.created_at desc", + @projects = Project.paginate(:all, :order => "projects.created_at desc", :page => params[:page], :include => [:tags, { :repositories => :project } ]) - + @atom_auto_discovery_url = projects_path(:format => :atom) respond_to do |format| format.html { @active_recently = Project.most_active_recently @active_overall = Project.most_active_overall(@active_recently.size) - @tags = Project.top_tags + @tags = Project.top_tags } format.xml { render :xml => @projects } format.atom { } end end - + def category tags = params[:id].to_s.gsub(/,\ ?/, " ") - @projects = Project.paginate_by_tag(tags, :order => 'created_at desc', + @projects = Project.paginate_by_tag(tags, :order => 'created_at desc', :page => params[:page]) @atom_auto_discovery_url = projects_category_path(params[:id], :format => :atom) respond_to do |format| @@ -62,7 +62,7 @@ class ProjectsController < ApplicationController format.atom { render :action => "index"} end end - + def show @owner = @project @root = @project @@ -86,13 +86,13 @@ class ProjectsController < ApplicationController format.js { render :partial => "repositories" } end end - + def new @project = Project.new @project.owner = current_user @root = Breadcrumb::NewProject.new end - + def create @project = Project.new(params[:project]) @root = Breadcrumb::NewProject.new @@ -103,7 +103,7 @@ class ProjectsController < ApplicationController when "Group" current_user.groups.find(params[:project][:owner_id]) end - + if @project.save @project.create_event(Action::CREATE_PROJECT, @project, current_user) redirect_to new_project_repository_path(@project) @@ -111,12 +111,12 @@ class ProjectsController < ApplicationController render :action => 'new' end end - + def edit - @groups = current_user.groups + @groups = current_user.groups.select{|g| g.admin?(current_user) } @root = Breadcrumb::EditProject.new(@project) end - + def edit_slug @root = Breadcrumb::EditProject.new(@project) if request.put? @@ -128,16 +128,16 @@ class ProjectsController < ApplicationController end end end - + def update - @groups = current_user.groups + @groups = current_user.groups.select{|g| g.admin?(current_user) } @root = Breadcrumb::EditProject.new(@project) - + # change group, if requested unless params[:project][:owner_id].blank? @project.change_owner_to(current_user.groups.find(params[:project][:owner_id])) end - + @project.attributes = params[:project] changed = @project.changed? # Dirty attr tracking is cleared after #save if @project.save && @project.wiki_repository.save @@ -148,7 +148,7 @@ class ProjectsController < ApplicationController render :action => 'edit' end end - + def preview @project = Project.new @project.description = params[:project][:description] @@ -156,11 +156,11 @@ class ProjectsController < ApplicationController wants.js end end - + def confirm_delete @project = Project.find_by_slug!(params[:id]) end - + def destroy @project = Project.find_by_slug!(params[:id]) if @project.can_be_deleted_by?(current_user) @@ -172,19 +172,19 @@ class ProjectsController < ApplicationController end redirect_to projects_path end - + protected def find_project @project = Project.find_by_slug!(params[:id], :include => [:repositories]) end - + def assure_adminship if !@project.admin?(current_user) flash[:error] = I18n.t "projects_controller.update_error" redirect_to(project_path(@project)) and return end end - + def check_if_only_site_admins_can_create if GitoriousConfig["only_site_admins_can_create_projects"] unless current_user.site_admin? diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 697809e..af3f1d1 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -20,14 +20,14 @@ require File.dirname(__FILE__) + '/../test_helper' class ProjectsControllerTest < ActionController::TestCase - + should_render_in_site_specific_context :only => [:show, :edit, :update, :confirm_delete] should_render_in_global_context :except => [:show, :edit, :update, :confirm_delete, :clones] def setup @project = projects(:johans) end - + context "Routing" do should "recognizes routing like /projectname" do assert_recognizes({ @@ -36,134 +36,134 @@ class ProjectsControllerTest < ActionController::TestCase assert_recognizes({:controller => "projects", :action => "show", :id => @project.to_param}, {:path => "/#{@project.to_param}/", :method => :get}) assert_generates("/#{@project.to_param}", { - :controller => "projects", - :action => "show", + :controller => "projects", + :action => "show", :id => @project.to_param }) end - + should "recognizes routing like /projectname/repositories" do assert_recognizes({ :controller => "repositories", - :action => "index", - :project_id => @project.to_param + :action => "index", + :project_id => @project.to_param }, {:path => "/#{@project.to_param}/repositories", :method => :get}) - + assert_recognizes({ :controller => "repositories", - :action => "index", + :action => "index", :project_id => @project.to_param }, {:path => "/#{@project.to_param}/repositories/", :method => :get}) assert_generates("/#{@project.to_param}/repositories", { - :controller => "repositories", - :action => "index", + :controller => "repositories", + :action => "index", :project_id => @project.to_param }) end - + should "recognizes routing like /projectname/repositories/action" do assert_recognizes({ :controller => "repositories", - :action => "new", + :action => "new", :project_id => @project.to_param }, {:path => "/#{@project.to_param}/repositories/new", :method => :get}) assert_recognizes({ :controller => "repositories", - :action => "new", + :action => "new", :project_id => @project.to_param }, {:path => "/#{@project.to_param}/repositories/new", :method => :get}) assert_generates("/#{@project.to_param}/repositories/new", { - :controller => "repositories", - :action => "new", + :controller => "repositories", + :action => "new", :project_id => @project.to_param }) end - + should "recognizes project actions" do { - "edit" => [:get, "/edit"], + "edit" => [:get, "/edit"], "update" => [:put, ""], "destroy" => [:delete, ""], "confirm_delete" => [:get, "/confirm_delete"], }.each do |action, (method, path)| assert_recognizes({ :controller => "projects", - :action => action, + :action => action, :id => @project.to_param }, {:path => "/#{@project.to_param}#{path}", :method => method}) assert_generates("/#{@project.to_param}#{path}", { - :controller => "projects", - :action => action, + :controller => "projects", + :action => action, :id => @project.to_param }) end end - + should "recognizes custom routing with format" do assert_recognizes({ :controller => "projects", - :action => "show", + :action => "show", :id => @project.to_param, :format => "xml" }, {:path => "/#{@project.to_param}.xml", :method => :get}) assert_recognizes({ :controller => "projects", - :action => "index", + :action => "index", :format => "xml" }, {:path => "/projects.xml", :method => :get}) assert_generates("/projects.xml", { - :controller => "projects", - :action => "index", + :controller => "projects", + :action => "index", :format => "xml" }) end end - context "ProjectsController" do + context "ProjectsController" do should "GET projects/ should be succesful" do get :index assert_response :success assert !assigns(:projects).empty? assert_template(("index")) end - + should "GET projects/new should be succesful" do login_as :johan get :new assert_response :success assert_template(("new")) end - + should "GET projects/new should redirect to new_user_key_path if no keys on user" do users(:johan).ssh_keys.destroy_all login_as :johan get :new assert_redirected_to(new_user_key_path(users(:johan))) end - + should "GET projects/new should require login" do get :new assert_response :redirect assert_redirected_to(new_sessions_path) end - + should "POST projects/create with valid data should create project" do login_as :johan assert_difference("Project.count") do post :create, :project => { - :title => "project x", - :slug => "projectx", + :title => "project x", + :slug => "projectx", :description => "projectx's description", :owner_type => "User" } end assert_response :redirect assert_redirected_to(new_project_repository_path(assigns(:project))) - + assert_equal users(:johan), assigns(:project).user assert_equal users(:johan), assigns(:project).owner end - + should "POST projects/create with invalid data should re-render the template" do login_as :johan assert_no_difference("Project.count") do @@ -173,13 +173,13 @@ class ProjectsControllerTest < ActionController::TestCase assert_template "projects/new" assert !assigns(:project).valid? end - + should "Create an event when POSTing successfully to create" do login_as :johan assert_difference("Event.count") do post :create, :project => { - :title => "project x", - :slug => "projectx", + :title => "project x", + :slug => "projectx", :description => "projectx's description", :owner_type => "User" } @@ -188,7 +188,7 @@ class ProjectsControllerTest < ActionController::TestCase event = assigns(:project).events.first assert_equal Action::CREATE_PROJECT, event.action end - + should "render a error page if the create was throttled" do login_as :johan Project.any_instance.expects(:save).raises(RecordThrottling::LimitReachedError) @@ -204,15 +204,15 @@ class ProjectsControllerTest < ActionController::TestCase assert_select "h1", /slow down/i assert_select "p", /denied your request due to excessive usage/i end - + should "POST projects/create with valid data should create project, owned by a group" do login_as :johan group = groups(:team_thunderbird) group.add_member(users(:johan), Role.admin) assert_difference("Project.count") do post :create, :project => { - :title => "project x", - :slug => "projectx", + :title => "project x", + :slug => "projectx", :description => "projectx's description", :owner_type => "Group", :owner_id => group.id @@ -220,42 +220,42 @@ class ProjectsControllerTest < ActionController::TestCase end assert_response :redirect assert_redirected_to(new_project_repository_path(assigns(:project))) - + assert_equal users(:johan), assigns(:project).user assert_equal group, assigns(:project).owner end - + should "POST projects/create should redirect to new_user_key_path if no keys on user" do users(:johan).ssh_keys.destroy_all login_as :johan post :create assert_redirected_to(new_user_key_path(users(:johan))) end - + should 'POST projects/create should redirect to acceptance of EULA if this has not been done' do users(:johan).update_attribute(:aasm_state, "pending") login_as :johan post :create assert_redirected_to(user_license_path(users(:johan))) end - + should "projects/create should require login" do post :create assert_redirected_to(new_sessions_path) end - + should "PUT projects/update should require login" do put :update assert_redirected_to(new_sessions_path) end - + should "GET projects/N/edit is only for project owner" do login_as :moe get :edit, :id => projects(:johans).to_param assert_match(/you're not the owner of this project/i, flash[:error]) assert_redirected_to(project_path(projects(:johans))) end - + should "PUT projects/update can only be done by project owner" do project = projects(:johans) project.owner = groups(:team_thunderbird) @@ -264,7 +264,7 @@ class ProjectsControllerTest < ActionController::TestCase get :edit, :id => project.to_param assert_response :success end - + should "PUT projects/update can only be done by project group admins" do project = projects(:johans) project.owner = groups(:team_thunderbird) @@ -276,13 +276,13 @@ class ProjectsControllerTest < ActionController::TestCase assert_equal "bar", assigns(:project).reload.description assert_redirected_to(project_path(project)) end - + should 'Non-admins for projects should be denied access to edit slug' do login_as :moe get :edit_slug, :id => projects(:johans).to_param assert_response :redirect end - + should 'allow project admins to change the slug' do login_as :johan @project = projects(:johans) @@ -292,9 +292,9 @@ class ProjectsControllerTest < ActionController::TestCase assert_redirected_to :action => :show, :id => @project.reload.slug assert_equal 'another_one', projects(:johans).reload.slug end - - - + + + should "PUT projects/update with valid data should update record" do login_as :johan project = projects(:johans) @@ -304,28 +304,28 @@ class ProjectsControllerTest < ActionController::TestCase assert_redirected_to(project_path(project.reload)) assert_equal "new name", project.reload.title end - + should 'PUT preview should render a preview of the project information' do login_as :johan project = projects(:johans) put :preview, :id => project.to_param, :project => {:title => 'something new', :description => 'This is a long description'}, :format => 'js' assert_response :success end - + should "DELETE projects/destroy should require login" do delete :destroy assert_response :redirect #assert_redirected_to("http://test.host" + new_sessions_path) assert_redirected_to(new_sessions_path) end - + should "DELETE projects/xx is only allowed by project owner" do login_as :moe delete :destroy, :id => projects(:johans).slug assert_redirected_to(projects_path) assert_match(/You're not the owner of this project, or the project has clones/i, flash[:error]) end - + should "DELETE projects/xx is only allowed if there's a single repository (mainline)" do login_as :johan delete :destroy, :id => projects(:johans).slug @@ -333,7 +333,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_match(/You're not the owner of this project, or the project has clones/i, flash[:error]) assert_not_nil Project.find_by_id(1) end - + should "DELETE projects/destroy should destroy the project" do login_as :johan repositories(:johans2).destroy @@ -341,7 +341,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_redirected_to(projects_path) assert_nil Project.find_by_id(1) end - + should "GET projects/show should be success" do get :show, :id => projects(:johans).slug assert_equal projects(:johans), assigns(:project) @@ -365,7 +365,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to(new_sessions_path) end - + should "GET projects/xx/confirm_delete fetches the project" do login_as(:johan) get :edit, :id => projects(:johans).slug @@ -387,7 +387,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_not_nil assigns(:user_clones) assert_template "_repositories" end - + # should "GET show with an etag based on the event" do # 50.times do |i| # projects(:johans).events.create!({ @@ -398,7 +398,7 @@ class ProjectsControllerTest < ActionController::TestCase # get :show, :id => projects(:johans).slug # page_one_etag = @response.etag # assert_not_nil page_one_etag - + # get :show, :id => projects(:johans).slug, :page => 2 # assert_not_equal page_one_etag, @response.etag # end @@ -412,18 +412,27 @@ class ProjectsControllerTest < ActionController::TestCase @group = users(:mike).groups.first login_as :mike end - + should "gets a list of the users' groups on edit" do + group = groups(:a_team) + assert !group.member?(users(:mike)) + group.add_member(users(:mike), Role.member) get :edit, :id => @project.to_param assert_response :success - assert_equal users(:mike).groups, assigns(:groups) + assert !assigns(:groups).include?(group), "included group where user is only member" + assert_equal users(:mike).groups.select{|g| g.admin?(users(:mike)) }, assigns(:groups) end - - should "gets a list of the users' groups on update" do + + should "only get a list of groups user is admin in, on update" do + group = groups(:a_team) + assert !group.member?(users(:mike)) + group.add_member(users(:mike), Role.member) put :update, :id => @project.to_param, :project => {:title => "foo"} - assert_equal users(:mike).groups, assigns(:groups) + assert_response :redirect + assert !assigns(:groups).include?(group), "included group where user is only member" + assert_equal users(:mike).groups.select{|g| g.admin?(users(:mike)) }, assigns(:groups) end - + should "changes the owner" do put :update, :id => @project.to_param, :project => { :owner_id => @group.id @@ -432,13 +441,13 @@ class ProjectsControllerTest < ActionController::TestCase assert_equal @group, @project.reload.owner assert_equal @group, @project.wiki_repository.owner end - + should "changes the owner, only if the original owner was a user" do @project.owner = @group @project.save! new_group = Group.create!(:name => "temp") new_group.add_member(users(:mike), Role.admin) - + put :update, :id => @project.to_param, :project => { :owner_id => new_group.id } @@ -451,29 +460,29 @@ class ProjectsControllerTest < ActionController::TestCase setup do GitoriousConfig['public_mode'] = false end - + teardown do GitoriousConfig['public_mode'] = true end - + should "GET /projects" do get :index assert_redirected_to(root_path) assert_match(/Action requires login/, flash[:error]) end end - + context "when only admins are allowed to create new projects" do setup do - GitoriousConfig["only_site_admins_can_create_projects"] = true + GitoriousConfig["only_site_admins_can_create_projects"] = true users(:johan).update_attribute(:is_admin, true) users(:moe).update_attribute(:is_admin, false) end - + teardown do GitoriousConfig["only_site_admins_can_create_projects"] = false end - + should "redirect if the user is not a site admin on GET #new" do login_as :moe get :new @@ -481,14 +490,14 @@ class ProjectsControllerTest < ActionController::TestCase assert_match(/only site administrators/i, flash[:error]) assert_redirected_to projects_path end - + should "be succesful on #new if the user is a site_admin" do login_as :johan get :new assert_nil flash[:error] assert_response :success end - + should "redirect if the user is not a site admin on POST #create" do login_as :moe post :create, :project => {} @@ -496,12 +505,12 @@ class ProjectsControllerTest < ActionController::TestCase assert_match(/only site administrators/i, flash[:error]) assert_redirected_to projects_path end - + should "be succesful on POST #create if the user is a site_admin" do login_as :johan post :create, :project => { - :title => "project x", - :slug => "projectx", + :title => "project x", + :slug => "projectx", :description => "projectx's description", :owner_type => "User" } @@ -510,7 +519,7 @@ class ProjectsControllerTest < ActionController::TestCase assert_redirected_to new_project_repository_path(assigns(:project)) end end - + context "with a site specific layout" do should "render with the application layout if there's no containing site" do get :show, :id => projects(:johans).to_param @@ -520,23 +529,23 @@ class ProjectsControllerTest < ActionController::TestCase assert_not_nil @controller.send(:current_site) assert_equal Site.default.title, @controller.send(:current_site).title end - + should "redirect to the proper subdomain if the current site has one" do @request.host = "gitorious.test" get :show, :id => projects(:thunderbird).to_param assert_response :redirect - assert_redirected_to project_path(projects(:thunderbird), + assert_redirected_to project_path(projects(:thunderbird), :only_path => false, :host => "#{sites(:qt).subdomain}.gitorious.test") end - + should "redirect to the proper subdomain if the current site has one and we're using www" do @request.host = "www.gitorious.test" get :show, :id => projects(:thunderbird).to_param assert_response :redirect - assert_redirected_to project_path(projects(:thunderbird), + assert_redirected_to project_path(projects(:thunderbird), :only_path => false, :host => "#{sites(:qt).subdomain}.gitorious.test") end - + should "redirect to the main domain if the current_site doesn't have a subdomain" do @request.host = "qt.gitorious.test" get :show, :id => projects(:johans).to_param |