From svn at explainpmt.com Mon Feb 6 13:41:26 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 18:41:26 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [154] Refactored test fixtures for ProjectsControllerTest Message-ID: <20060206184126.D04F0C97B1@thurlow.textdrive.com> Revision: 154 Author: jwilger Date: 2006-02-06 18:41:25 +0000 (Mon, 06 Feb 2006) Log Message: ----------- Refactored test fixtures for ProjectsControllerTest Modified Paths: -------------- trunk/test/fixtures/users.yml trunk/test/functional/projects_controller_test.rb Modified: trunk/test/fixtures/users.yml =================================================================== --- trunk/test/fixtures/users.yml 2006-01-31 04:56:30 UTC (rev 153) +++ trunk/test/fixtures/users.yml 2006-02-06 18:41:25 UTC (rev 154) @@ -22,3 +22,19 @@ first_name: 'User' last_name: 'Two' admin: false +fourth: + id: 4 + username: 'user_three' + password: 'user_threepassword' + email: 'user_three at example.com' + first_name: 'User' + last_name: 'Three' + admin: false +fifth: + id: 5 + username: 'user_four' + password: 'user_fourpassword' + email: 'user_four at example.com' + first_name: 'User' + last_name: 'Four' + admin: false Modified: trunk/test/functional/projects_controller_test.rb =================================================================== --- trunk/test/functional/projects_controller_test.rb 2006-01-31 04:56:30 UTC (rev 153) +++ trunk/test/functional/projects_controller_test.rb 2006-02-06 18:41:25 UTC (rev 154) @@ -9,15 +9,15 @@ POPUPS = [:new,:create,:add_users,:update_users,:edit,:update] NO_RENDERS = [:remove_user,:delete] ALL_ACTIONS = FULL_PAGES + POPUPS + NO_RENDERS + + fixtures ALL_FIXTURES def setup - Project.destroy_all - User.destroy_all - create_common_fixtures :admin, :user_one, :project_one - @user_two = User.create 'username' => 'usertwo', - 'password' => 'usertwopass', - 'email' => 'usertwo at example.com', - 'first_name' => 'User', 'last_name' => 'Two' + @admin = User.find 1 + @user_one = User.find 2 + @user_two = User.find 3 + @project_one = Project.find 1 + @project_two = Project.find 2 @controller = ProjectsController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -48,29 +48,27 @@ get :index assert_response :success assert_template 'index' - assert assigns(:projects) - assert_equal Project.find_all(nil,'name ASC'), assigns(:projects) + assert_equal Project.find( :all, :order => 'name ASC' ), + assigns( :projects ) end def test_new get :new assert_response :success assert_template 'new' - assert assigns(:project) assert_kind_of Project, assigns(:project) - assert assigns(:project).new_record? + assert assigns( :project ).new_record? end def test_new_from_error project = Project.create assert !project.valid? - @request.session[:new_project] = project + @request.session[ :new_project ] = project get :new assert_response :success assert_template 'new' - assert assigns(:project) - assert_equal project, assigns(:project) - assert_nil session[:new_project] + assert_equal project, assigns( :project ) + assert_nil session[ :new_project ] end def test_create_no_membership @@ -99,86 +97,82 @@ num_before_create = Project.count post :create assert_redirected_to :controller => 'projects', :action => 'new' - assert session[:new_project] + assert session[ :new_project ] assert_equal num_before_create, Project.count end def test_add_users get :add_users, 'project_id' => @project_one.id assert_response :success - assert assigns(:project) - assert_equal @project_one, assigns(:project) + assert_equal @project_one, assigns( :project ) assert_template 'add_users' - assert assigns(:available_users) - assert_equal [@user_one, at user_two, at admin], assigns(:available_users) + available = User.find( :all ) - @project_one.users + assert_equal available, assigns( :available_users ) end def test_update_users post :update_users, 'project_id' => @project_one.id, - 'selected_users' => [@user_one.id, @user_two.id] + 'selected_users' => [ @user_one.id, @user_two.id ] assert_response :success assert_template 'layouts/refresh_parent_close_popup' - assert flash[:status] - [@user_one, @user_two].each do |u| + assert flash[ :status ] + [ @user_one, @user_two ].each do |u| assert @project_one.users.include?(u) end end def test_remove_user - @project_one.users << @user_one get :remove_user, 'project_id' => @project_one.id, 'id' => @user_one.id assert_redirected_to :controller => 'users', :action => 'index', :project_id => @project_one.id - assert flash[:status] - assert !@project_one.users(true).include?(@user_one) + assert flash[ :status ] + assert !@project_one.users( true ).include?( @user_one ) end def test_delete get :delete, 'id' => @project_one.id assert_redirected_to :controller => 'projects', :action => 'index' - assert flash[:status] - assert_raise(ActiveRecord::RecordNotFound) { Project.find(@project_one.id) } + assert flash[ :status ] + assert_raise( ActiveRecord::RecordNotFound ) do + Project.find @project_one.id + end end def test_edit get :edit, 'id' => @project_one.id assert_response :success assert_template 'edit' - assert assigns(:project) - assert_equal @project_one, assigns(:project) + assert_equal @project_one, assigns( :project ) end def test_edit_from_invalid - @request.session[:edit_project] = @project_one + @request.session[ :edit_project ] = @project_one get :edit, 'id' => @project_one.id - assert_kind_of Project, assigns(:project) - assert_equal @project_one.id, assigns(:project).id - assert_nil session[:edit_project] + assert_kind_of Project, assigns( :project ) + assert_equal @project_one.id, assigns( :project ).id + assert_nil session[ :edit_project ] end def test_update post :update, 'id' => @project_one.id, 'project' => { 'name' => 'Test' } assert_response :success assert_template 'layouts/refresh_parent_close_popup' - project = Project.find(@project_one.id) + project = Project.find @project_one.id assert_equal 'Test', project.name end def test_my_projects_list - @project_one.users << @user_one - project2 = Project.create('name' => 'Project Two') - project2.users << @user_one - @request.session[:current_user] = @user_one - process :my_projects_list + @request.session[ :current_user ] = @user_one + get :my_projects_list assert_response :success assert_template '_my_projects_list' - assert assigns(:projects).include?(@project_one) - assert assigns(:projects).include?(project2) + assert assigns( :projects ).include?( @project_one ) + assert assigns( :projects ).include?( @project_two ) end private def current_user - User.find(@request.session[:current_user].id) + @request.session[ :current_user ] end end From svn at explainpmt.com Mon Feb 6 13:50:12 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 18:50:12 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [155] refactored test fixtures for SessionControllerTest Message-ID: <20060206185012.E57EDC996E@thurlow.textdrive.com> Revision: 155 Author: jwilger Date: 2006-02-06 18:50:12 +0000 (Mon, 06 Feb 2006) Log Message: ----------- refactored test fixtures for SessionControllerTest Modified Paths: -------------- trunk/test/functional/session_controller_test.rb Modified: trunk/test/functional/session_controller_test.rb =================================================================== --- trunk/test/functional/session_controller_test.rb 2006-02-06 18:41:25 UTC (rev 154) +++ trunk/test/functional/session_controller_test.rb 2006-02-06 18:50:12 UTC (rev 155) @@ -5,9 +5,10 @@ class SessionController; def rescue_action(e) raise e end; end class SessionControllerTest < Test::Unit::TestCase + fixtures ALL_FIXTURES + def setup - User.destroy_all - create_common_fixtures :user_one + @user_one = User.find 2 @controller = SessionController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -20,31 +21,31 @@ def test_authenticate post :authenticate, 'username' => @user_one.username, - 'password' => @user_one.password - assert_equal @user_one, session[:current_user] + 'password' => @user_one.password + assert_equal @user_one, session[ :current_user ] assert_redirected_to :controller => 'dashboard', :action => 'index' end def test_authenticate_with_return_to - @request.session[:return_to] = '/foo/bar' + @request.session[ :return_to ] = '/foo/bar' post :authenticate, 'username' => @user_one.username, - 'password' => @user_one.password + 'password' => @user_one.password assert_redirect_url 'http://test.host/foo/bar' end def test_authenticate_failed post :authenticate assert_redirected_to :controller => 'session', :action => 'login' - assert_nil session[:current_user] + assert_nil session[ :current_user ] assert_equal "You entered an invalid username and/or password.", - flash[:error] + flash[ :error ] end def test_logout - @request.session[:current_user] = @user_one + @request.session[ :current_user ] = @user_one get :logout - assert_nil session[:current_user] + assert_nil session[ :current_user ] assert_redirected_to :controller => 'session', :action => 'login' - assert_equal "You have been logged out.", flash[:status] + assert_equal "You have been logged out.", flash[ :status ] end end From svn at explainpmt.com Mon Feb 6 15:36:41 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 20:36:41 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [156] refactored fixtures for StoriesControllerTest Message-ID: <20060206203641.B4DBBC9A02@thurlow.textdrive.com> Revision: 156 Author: jwilger Date: 2006-02-06 20:36:39 +0000 (Mon, 06 Feb 2006) Log Message: ----------- refactored fixtures for StoriesControllerTest Modified Paths: -------------- trunk/test/fixtures/stories.yml trunk/test/functional/stories_controller_test.rb trunk/test/unit/project_test.rb trunk/test/unit/story_test.rb Modified: trunk/test/fixtures/stories.yml =================================================================== --- trunk/test/fixtures/stories.yml 2006-02-06 18:50:12 UTC (rev 155) +++ trunk/test/fixtures/stories.yml 2006-02-06 20:36:39 UTC (rev 156) @@ -5,8 +5,10 @@ iteration_id: 1 user_id: 1 title: 'First Story' - status: 1 + status: 2 points: 3 + priority: 2 + risk: 1 second: id: 2 scid: 2 @@ -20,7 +22,7 @@ scid: 3 project_id: 1 title: 'Third Story' - status: 1 + status: 8 points: 2 fourth: id: 4 @@ -44,3 +46,12 @@ points: 3 priority: 1 risk: 1 +sixth: + id: 6 + scid: 6 + project_id: 1 + title: 'Sixth Story' + status: 2 + points: 2 + priority: 1 + risk: 1 Modified: trunk/test/functional/stories_controller_test.rb =================================================================== --- trunk/test/functional/stories_controller_test.rb 2006-02-06 18:50:12 UTC (rev 155) +++ trunk/test/functional/stories_controller_test.rb 2006-02-06 20:36:39 UTC (rev 156) @@ -6,25 +6,14 @@ class StoriesControllerTest < Test::Unit::TestCase def setup - Project.destroy_all - User.destroy_all - create_common_fixtures :user_one, :project_one, :story_one, :story_two, - :iteration_one - @project_one.users << @user_one - @story_one.project = @project_one - @story_one.save - @iteration_one.project = @project_one - @iteration_one.save - @story_two.project = @project_one - @story_two.save - @story_three = Story.create('title' => 'Story Three', - 'description' => 'Story Three', - 'priority' => Story::Priority::High, - 'risk' => Story::Risk::High, - 'points' => 1, - 'status' => Story::Status::Cancelled, - 'project_id' => @project_one.id) - @iteration_one.stories << @story_one + @user_one = User.find 2 + @project_one = Project.find 1 + @iteration_one = Iteration.find 1 + @story_one = Story.find 1 + @story_two = Story.find 2 + @story_three = Story.find 3 + @story_six = Story.find 6 + @controller = StoriesController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new @@ -35,20 +24,18 @@ get :index, 'project_id' => @project_one.id assert_response :success assert_template 'index' - assert_equal [@story_two], assigns(:stories) + assert_equal [ @story_six ], assigns( :stories ) end def test_backlog_show_cancelled get :index, 'project_id' => @project_one.id, 'show_cancelled' => 1 assert_response :success assert_template 'index' - assert_equal [@story_two, @story_three], assigns(:stories) + assert_equal [ @story_six, @story_three ], assigns( :stories ) end def test_backlog_no_iterations - # Destroy the one iteration - @iteration_one.destroy - assert_equal 0, Iteration.find(:all).length + Iteration.destroy_all get :index, 'project_id' => @project_one.id assert_response :success assert_template 'index' @@ -59,43 +46,42 @@ get :show, 'id' => @story_one.id, 'project_id' => @project_one.id assert_response :success assert_template 'show' - assert_equal @story_one, assigns(:story) + assert_equal @story_one, assigns( :story ) end def test_delete get :delete, 'id' => @story_one.id, 'project_id' => @project_one.id assert_redirected_to :controller => 'stories', :action => 'index', - :project_id => @project_one.id.to_s - assert_raise(ActiveRecord::RecordNotFound) { Story.find(@story_one.id) } + :project_id => @project_one.id.to_s + assert_raise( ActiveRecord::RecordNotFound ) { Story.find @story_one.id } end def test_delete_from_iteration get :delete, 'id' => @story_one.id, 'project_id' => @project_one.id, - :iteration_id => @iteration_one.id + :iteration_id => @iteration_one.id assert_redirected_to :controller => 'iterations', :action => 'show', - :id => @iteration_one.id.to_s, - :project_id => @project_one.id.to_s - assert_raise(ActiveRecord::RecordNotFound) { Story.find(@story_one.id) } + :id => @iteration_one.id.to_s, :project_id => @project_one.id.to_s + assert_raise( ActiveRecord::RecordNotFound ) { Story.find @story_one.id } end def test_new get :new, 'project_id' => @project_one.id assert_response :success assert_template 'new' - assert_kind_of Story, assigns(:story) - assert assigns(:story).new_record? + assert_kind_of Story, assigns( :story ) + assert assigns( :story ).new_record? end def test_new_from_invalid - @request.session[:new_story] = Story.new + @request.session[ :new_story ] = Story.new test_new - assert_nil session[:new_story] + assert_nil session[ :new_story ] end def test_create num = @project_one.stories.backlog.size post :create, 'project_id' => @project_one.id, - 'story' => { 'title' => 'Test Create', 'status' => 1 } + 'story' => { 'title' => 'Test Create', 'status' => 1 } assert_redirected_to :controller => 'stories', :action => 'index' assert_equal num + 1, @project_one.stories( true ).backlog.size end @@ -104,74 +90,72 @@ num = Story.count post :create, 'project_id' => @project_one.id, 'story' => { 'title' => '' } assert_redirected_to :controller => 'stories', :action => 'new', - :project_id => @project_one.id - assert session[:new_story] + :project_id => @project_one.id + assert session[ :new_story ] end def test_edit get :edit, 'project_id' => @project_one.id, 'id' => @story_one.id assert_response :success assert_template 'edit' - assert_equal @story_one, assigns(:story) + assert_equal @story_one, assigns( :story ) end def test_edit_from_invalid @story_one.title = nil - @request.session[:edit_story] = @story_one + @request.session[ :edit_story ] = @story_one test_edit - assert_nil session[:edit_story] + assert_nil session[ :edit_story ] end def test_update post :update, 'project_id' => @project_one.id, 'id' => @story_one.id, - 'story' => { 'title' => 'Test Update', 'status' => 1 } + 'story' => { 'title' => 'Test Update', 'status' => 1 } assert_redirected_to :controller => 'stories', :action => 'index' end def test_update_return_to_referer @request.session[:return_to] = '/project/1/iterations/show/1' post :update, 'project_id' => @project_one.id, 'id' => @story_one.id, - 'story' => { 'title' => 'Test Update', 'status' => 1 } + 'story' => { 'title' => 'Test Update' } assert_redirected_to '/project/1/iterations/show/1' end def test_update_invalid post :update, 'project_id' => @project_one.id, 'id' => @story_one.id, - 'story' => { 'title' => '' } + 'story' => { 'title' => '' } assert_redirected_to :controller => 'stories', :action => 'edit', - :project_id => @project_one.id.to_s, - :id => @story_one.id.to_s - assert session[:edit_story] + :project_id => @project_one.id.to_s, :id => @story_one.id.to_s + assert session[ :edit_story ] end def test_take_ownership get :take_ownership, 'id' => @story_one.id, 'project_id' => @project_one.id assert_redirected_to :controller => 'iterations', :action => 'show', - :id => @iteration_one.id.to_s, - :project_id => @project_one.id.to_s - assert flash[:status] - assert_equal @request.session[:current_user], - Story.find(@story_one.id).owner + :id => @iteration_one.id.to_s, :project_id => @project_one.id.to_s + assert flash[ :status ] + assert_equal @request.session[ :current_user ], + Story.find( @story_one.id ).owner end def test_release_ownership - @story_one.owner = @request.session[:current_user] + @story_one.owner = @request.session[ :current_user ] @story_one.save get :release_ownership, 'id' => @story_one.id, - 'project_id' => @project_one.id + 'project_id' => @project_one.id assert_redirected_to :controller => 'iterations', :action => 'show', - :id => @iteration_one.id.to_s, - :project_id => @project_one.id.to_s - assert flash[:status] - assert_nil Story.find(@story_one.id).owner + :id => @iteration_one.id.to_s, :project_id => @project_one.id.to_s + assert flash[ :status ] + assert_nil Story.find( @story_one.id ).owner end def test_main_menu_has_correct_current_link # new/edit/view story should have no selected item (class="current") in the MainMenu - for action in [:new, :show, :edit] + for action in [ :new, :show, :edit ] get action, 'id' => @story_one.id, 'project_id' => @project_one.id - assert_no_tag :tag => 'a', :attributes => { :class => 'current' }, :ancestor => { :tag => 'ul', :attributes => { :id => 'MainMenu' } } + assert_no_tag :tag => 'a', :attributes => { :class => 'current' }, + :ancestor => { :tag => 'ul', :attributes => { :id => 'MainMenu' } } end end end Modified: trunk/test/unit/project_test.rb =================================================================== --- trunk/test/unit/project_test.rb 2006-02-06 18:50:12 UTC (rev 155) +++ trunk/test/unit/project_test.rb 2006-02-06 20:36:39 UTC (rev 156) @@ -127,6 +127,7 @@ end def test_backlog - assert_equal 1, @project_one.stories.backlog.size + num_backlog = @project_one.stories.reject{ |a| a.iteration }.size + assert_equal num_backlog, @project_one.stories.backlog.size end end Modified: trunk/test/unit/story_test.rb =================================================================== --- trunk/test/unit/story_test.rb 2006-02-06 18:50:12 UTC (rev 155) +++ trunk/test/unit/story_test.rb 2006-02-06 20:36:39 UTC (rev 156) @@ -59,8 +59,10 @@ end def test_scid_increments_properly + current_scid = @project_one.stories.sort{ |a,b| a.scid <=> b.scid }. + last.scid story = @project_one.stories.create :title => 'A Story Card' - assert_equal 6, story.scid + assert_equal current_scid + 1, story.scid project_two = Project.find 2 story = project_two.stories.create :title => 'Another Story Card' From svn at explainpmt.com Mon Feb 6 15:53:30 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 20:53:30 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [157] refactored fixtures for UsersControllerTest Message-ID: <20060206205330.98663C9A72@thurlow.textdrive.com> Revision: 157 Author: jwilger Date: 2006-02-06 20:53:29 +0000 (Mon, 06 Feb 2006) Log Message: ----------- refactored fixtures for UsersControllerTest Modified Paths: -------------- trunk/test/functional/users_controller_test.rb Modified: trunk/test/functional/users_controller_test.rb =================================================================== --- trunk/test/functional/users_controller_test.rb 2006-02-06 20:36:39 UTC (rev 156) +++ trunk/test/functional/users_controller_test.rb 2006-02-06 20:53:29 UTC (rev 157) @@ -5,36 +5,37 @@ class UsersController; def rescue_action(e) raise e end; end class UsersControllerTest < Test::Unit::TestCase + fixtures ALL_FIXTURES def setup - User.destroy_all - Project.destroy_all - create_common_fixtures :admin, :user_one - @project_one = Project.create('name' => 'Project One') + @admin = User.find 1 + @user_one = User.find 2 + @project_one = Project.find 1 + @controller = UsersController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @request.session[:current_user] = @user_one + @request.session[ :current_user ] = @user_one end def test_authentication_required - @request.session[:current_user] = nil - actions = [:index, :new, :create, :edit, :update, :delete] + @request.session[ :current_user ] = nil + actions = [ :index, :new, :create, :edit, :update, :delete ] actions.each do |a| process a assert_redirected_to :controller => 'session', :action => 'login' - assert session[:return_to] + assert session[ :return_to ] assert_equal "Please log in, and we'll send you right along.", - flash[:status] + flash[ :status ] end end def test_admin_required - actions = [:new, :create, :edit, :update, :delete] + actions = [ :new, :create, :edit, :update, :delete ] actions.each do |a| process a assert_redirected_to :controller => 'error', :action => 'index' assert_equal "You must be logged in as an administrator to perform " + - "the requested action.", flash[:error] + "the requested action.", flash[ :error ] end end @@ -43,158 +44,153 @@ assert_response :success post :update, 'id' => @user_one.id, 'user' => {} assert_response :success - user = User.find(@user_one.id) + user = User.find @user_one.id assert !user.admin? end def test_admin_cannot_remove_own_admin_privileges - @request.session[:current_user] = @admin - get :edit, 'id' => @admin.id, 'user' => {'admin' => '0'} + @request.session[ :current_user ] = @admin + get :edit, 'id' => @admin.id, 'user' => { 'admin' => '0' } assert_response :success - user = User.find(@admin.id) + user = User.find @admin.id assert user.admin? end def test_index get :index assert_template 'index' - assert_equal User.find_all(nil, 'last_name ASC, first_name ASC'), - assigns(:users) + assert_equal User.find( :all, + :order => 'last_name ASC, first_name ASC' ), assigns( :users ) end def test_index_with_project_id - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin get :index, 'project_id' => @project_one.id assert_template 'project' - assert_equal @project_one, assigns(:project) + assert_equal @project_one, assigns( :project ) end def test_new - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin get :new assert_response :success assert_template 'new' - assert_kind_of User, assigns(:user) - assert assigns(:user).new_record? + assert_kind_of User, assigns( :user ) + assert assigns( :user ).new_record? end def test_new_from_invalid - @request.session[:current_user] = @admin - @request.session[:new_user] = User.new('last_name' => 'Foo') + @request.session[ :current_user ] = @admin + @request.session[ :new_user ] = User.new :last_name => 'Foo' get :new - assert_kind_of User, assigns(:user) - assert assigns(:user).new_record? - assert_equal 'Foo', assigns(:user).last_name - assert_nil session[:new_user] + assert_kind_of User, assigns( :user ) + assert assigns( :user ).new_record? + assert_equal 'Foo', assigns( :user ).last_name + assert_nil session[ :new_user ] end def test_new_with_project_id - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin get :new, 'project_id' => @project_one.id assert_response :success assert_template 'new' - assert_kind_of User, assigns(:user) - assert assigns(:user).new_record? - assert_equal @project_one, assigns(:project) + assert_kind_of User, assigns( :user ) + assert assigns( :user ).new_record? + assert_equal @project_one, assigns( :project ) assert_tag :tag => 'input', :attributes => { :type => 'hidden', :name => 'project_id', :value => @project_one.id } end def test_create - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin num_users = User.count post :create, 'user' => { 'username' => 'test_create', - 'password' => 'test_create_password', - 'password_confirmation' => - 'test_create_password', - 'email' => 'test_create at example.com', - 'first_name' => 'Test', - 'last_name' => 'Create' } + 'password' => 'test_create_password', + 'password_confirmation' => 'test_create_password', + 'email' => 'test_create at example.com', 'first_name' => 'Test', + 'last_name' => 'Create' } assert_response :success assert_template 'layouts/refresh_parent_close_popup' assert_equal num_users + 1, User.count end def test_create_invalid - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin num_users = User.count post :create, 'user' => {} assert_redirected_to :controller => 'users', :action => 'new' - assert_kind_of User, session[:new_user] - assert session[:new_user].new_record? + assert_kind_of User, session[ :new_user ] + assert session[ :new_user ].new_record? assert_equal num_users, User.count end def test_create_with_project_id - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin num_users = User.count post :create, 'project_id' => @project_one.id, - 'user' => { 'username' => 'test_create_with_project', - 'password' => 'test_create_password', - 'password_confirmation' => - 'test_create_password', - 'email' => 'test_create at example.com', - 'first_name' => 'Test', - 'last_name' => 'Create' } + 'user' => { 'username' => 'test_create_with_project', + 'password' => 'test_create_password', + 'password_confirmation' => 'test_create_password', + 'email' => 'test_create at example.com', 'first_name' => 'Test', + 'last_name' => 'Create' } assert_response :success assert_template 'layouts/refresh_parent_close_popup' assert_equal num_users + 1, User.count - user = User.find(:first, - :conditions => [ 'username = ?', - 'test_create_with_project' ]) - assert @project_one.users.include?(user) + user = User.find :first, + :conditions => [ 'username = ?', 'test_create_with_project' ] + assert @project_one.users.include?( user ) end def test_create_invalid_with_project_id - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin num_users = User.count post :create, 'user' => {}, 'project_id' => @project_one.id assert_redirected_to :controller => 'users', :action => 'new', - :project_id => @project_one.id - assert_kind_of User, session[:new_user] - assert session[:new_user].new_record? + :project_id => @project_one.id + assert_kind_of User, session[ :new_user ] + assert session[ :new_user ].new_record? assert_equal num_users, User.count end def test_edit - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin get :edit, 'id' => @user_one.id assert_response :success assert_template 'edit' - assert_equal @user_one, assigns(:user) + assert_equal @user_one, assigns( :user ) end def test_edit_from_invalid - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin @user_one.username = nil - @request.session[:edit_user] = @user_one + @request.session[ :edit_user ] = @user_one get :edit, 'id' => @user_one.id - assert_equal @user_one, assigns(:user) - assert_nil session[:edit_user] + assert_equal @user_one, assigns( :user ) + assert_nil session[ :edit_user ] end def test_update - @request.session[:current_user] = @admin - post :update, 'id' => @user_one.id, 'user' => {'last_name' => 'Foo'} + @request.session[ :current_user ] = @admin + post :update, 'id' => @user_one.id, 'user' => { 'last_name' => 'Foo' } assert_response :success assert_template 'layouts/refresh_parent_close_popup' - assert_equal 'Foo', User.find(@user_one.id).last_name + assert_equal 'Foo', User.find( @user_one.id ).last_name end def test_update_invalid - @request.session[:current_user] = @admin - post :update, 'id' => @user_one.id, 'user' => {'username' => ''} + @request.session[ :current_user ] = @admin + post :update, 'id' => @user_one.id, 'user' => { 'username' => '' } assert_redirected_to :controller => 'users', :action => 'edit', - :id => @user_one.id + :id => @user_one.id @user_one.username = '' - assert_equal @user_one, session[:edit_user] + assert_equal @user_one, session[ :edit_user ] end def test_delete - @request.session[:current_user] = @admin + @request.session[ :current_user ] = @admin get :delete, :id => @user_one.id - assert_raise(ActiveRecord::RecordNotFound) { - User.find(@user_one.id) - } + assert_raise( ActiveRecord::RecordNotFound ) do + User.find @user_one.id + end end end From svn at explainpmt.com Mon Feb 6 15:55:37 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 20:55:37 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [158] Removed custom fixture methods from test_helper.rb since they are no Message-ID: <20060206205537.C10ABC9A84@thurlow.textdrive.com> Revision: 158 Author: jwilger Date: 2006-02-06 20:55:37 +0000 (Mon, 06 Feb 2006) Log Message: ----------- Removed custom fixture methods from test_helper.rb since they are no longer needed. Modified Paths: -------------- trunk/test/test_helper.rb Modified: trunk/test/test_helper.rb =================================================================== --- trunk/test/test_helper.rb 2006-02-06 20:53:29 UTC (rev 157) +++ trunk/test/test_helper.rb 2006-02-06 20:55:37 UTC (rev 158) @@ -13,86 +13,4 @@ ALL_FIXTURES = [ :iterations, :milestones, :projects_users, :projects, :stories, :users ] - - private - def create_common_fixtures(*fixture_names) - fixture_names.each do |name| - self.send("fixture_#{name}".to_sym) - end - end - - def fixture_admin - @admin = User.create('username' => 'admin', 'password' => 'adminpass', - 'email' => 'admin at example.com', 'admin' => 1, - 'first_name' => 'Admin', 'last_name' => 'User') - end - - def fixture_user_one - @user_one = User.create('username' => 'user_one', - 'password' => 'user_onepassword', - 'email' => 'user_one at example.com', - 'first_name' => 'User', 'last_name' => 'One', - 'admin' => 0) - end - - def fixture_project_one - @project_one = Project.create('name' => 'Project One') - end - - def fixture_project_two - @project_two = Project.create('name' => 'Project Two') - end - - def fixture_story_one - @story_one = Story.create('title' => 'Story One', - 'description' => 'Story One', - 'priority' => Story::Priority::High, - 'risk' => Story::Risk::High, - 'points' => 1, - 'status' => Story::Status::Defined) - end - - def fixture_story_two - @story_two = Story.create('title' => 'Story Two', - 'description' => 'Story Two', - 'priority' => Story::Priority::High, - 'risk' => Story::Risk::High, - 'points' => 1, - 'status' => Story::Status::Defined) - end - - def fixture_iteration_one - @iteration_one = Iteration.create('start_date' => Date.today, - 'length' => 14) - end - - def fixture_past_milestone1 - @past_milestone1 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today - 365) - end - - def fixture_past_milestone2 - @past_milestone2 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today - 15) - end - - def fixture_recent_milestone1 - @recent_milestone1 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today - 14) - end - - def fixture_recent_milestone2 - @recent_milestone2 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today - 1) - end - - def fixture_future_milestone1 - @future_milestone1 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today) - end - - def fixture_future_milestone2 - @future_milestone2 = @project_one.milestones.create('name' => 'Milestone1', - 'date' => Date.today + 365) - end end From svn at explainpmt.com Mon Feb 6 17:33:21 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 22:33:21 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [159] New user form now opens in same window (completes SC9) Message-ID: <20060206223321.870C9C98FE@thurlow.textdrive.com> Revision: 159 Author: rmannl Date: 2006-02-06 22:33:16 +0000 (Mon, 06 Feb 2006) Log Message: ----------- New user form now opens in same window (completes SC9) Modified Paths: -------------- trunk/app/controllers/users_controller.rb trunk/app/views/users/_user_form.rhtml trunk/app/views/users/index.rhtml trunk/app/views/users/project.rhtml Modified: trunk/app/controllers/users_controller.rb =================================================================== --- trunk/app/controllers/users_controller.rb 2006-02-06 20:55:37 UTC (rev 158) +++ trunk/app/controllers/users_controller.rb 2006-02-06 22:33:16 UTC (rev 159) @@ -19,7 +19,7 @@ class UsersController < ApplicationController before_filter :require_admin_privileges, :except => [:index, :project] - popups :new, :create, :edit, :update + popups :edit, :update # If the 'project_id' request parameter is set, this will display the # project's team members. Otherwise, it shows all users on the system. Modified: trunk/app/views/users/_user_form.rhtml =================================================================== --- trunk/app/views/users/_user_form.rhtml 2006-02-06 20:55:37 UTC (rev 158) +++ trunk/app/views/users/_user_form.rhtml 2006-02-06 22:33:16 UTC (rev 159) @@ -39,7 +39,7 @@    - Cancel + Cancel Modified: trunk/app/views/users/index.rhtml =================================================================== --- trunk/app/views/users/index.rhtml 2006-02-06 20:55:37 UTC (rev 158) +++ trunk/app/views/users/index.rhtml 2006-02-06 22:33:16 UTC (rev 159) @@ -6,9 +6,7 @@

Admin accounts are marked with <%= image_tag('admin_dot.gif') %>

<% if is_admin? %>

- <%= popup_link('Create New User', 'new_user', - 'width=400,height=400,resizable,scrollbars', - :controller => 'users', :action => 'new') %> + <%= link_to('Create New User', :controller => 'users', :action => 'new') %>

<% end %> Modified: trunk/app/views/users/project.rhtml =================================================================== --- trunk/app/views/users/project.rhtml 2006-02-06 20:55:37 UTC (rev 158) +++ trunk/app/views/users/project.rhtml 2006-02-06 22:33:16 UTC (rev 159) @@ -11,10 +11,9 @@ :controller => 'projects', :action => 'add_users', :project_id => @project.id) %>

-

<%= popup_link('Create New User', 'new_user', - 'width=400,height=400,resizable,scrollbars', - :controller => 'users', :action => 'new', - :project_id => @project.id) %>

+

<%= link_to('Create New User', + :controller => 'users', :action => 'new', + :project_id => @project.id) %>

<% end %> From svn at explainpmt.com Mon Feb 6 17:37:47 2006 From: svn at explainpmt.com (svn@explainpmt.com) Date: Mon, 6 Feb 2006 22:37:47 +0000 (GMT) Subject: [eXPlainPMT Developers] [SVN commit] [160] Edit user form now opens in same window (completes SC10) Message-ID: <20060206223747.DB0CDC98FE@thurlow.textdrive.com> Revision: 160 Author: rmannl Date: 2006-02-06 22:37:43 +0000 (Mon, 06 Feb 2006) Log Message: ----------- Edit user form now opens in same window (completes SC10) Modified Paths: -------------- trunk/app/controllers/users_controller.rb trunk/app/views/layouts/main.rhtml trunk/app/views/users/index.rhtml Modified: trunk/app/controllers/users_controller.rb =================================================================== --- trunk/app/controllers/users_controller.rb 2006-02-06 22:33:16 UTC (rev 159) +++ trunk/app/controllers/users_controller.rb 2006-02-06 22:37:43 UTC (rev 160) @@ -19,7 +19,6 @@ class UsersController < ApplicationController before_filter :require_admin_privileges, :except => [:index, :project] - popups :edit, :update # If the 'project_id' request parameter is set, this will display the # project's team members. Otherwise, it shows all users on the system. Modified: trunk/app/views/layouts/main.rhtml =================================================================== --- trunk/app/views/layouts/main.rhtml 2006-02-06 22:33:16 UTC (rev 159) +++ trunk/app/views/layouts/main.rhtml 2006-02-06 22:37:43 UTC (rev 160) @@ -15,8 +15,7 @@
Welcome back <%= @session[:current_user].full_name %>   |   - <%= popup_link('Edit Profile', 'edit_profile', - 'width=400,height=400,resizable,scrollbars', + <%= link_to('Edit Profile', :controller => 'users', :action => 'edit', :id => @session[:current_user].id)%> Modified: trunk/app/views/users/index.rhtml =================================================================== --- trunk/app/views/users/index.rhtml 2006-02-06 22:33:16 UTC (rev 159) +++ trunk/app/views/users/index.rhtml 2006-02-06 22:37:43 UTC (rev 160) @@ -22,10 +22,8 @@ <% if is_admin? %>