@@ -2,7 +2,9 @@ class StoriesController < ApplicationController before_filter :find_story, :except => [:index, :new, :create, :audit, :export, :export_tasks, :bulk_create, :create_many, :cancelled] def index - @stories = @project.stories.backlog + @stories = @project.stories.backlog.select { |s| + s.status != Story::Status::Cancelled + } end def cancelled app/controllers/stories_controller.rb @@ -50,9 +50,9 @@ class Project < ActiveRecord::Base has_many :stories, :include => [:iteration, :initiative, :project], :dependent => :destroy do -# def backlog -# self.select { |s| s.iteration.nil? } -# end + def backlog + self.select { |s| s.iteration.nil? } + end def not_estimated_and_not_cancelled self.select { |s| @@ -67,7 +67,6 @@ class Project < ActiveRecord::Base s.iteration.nil? } end - alias backlog not_cancelled_and_not_assigned_to_an_iteration def cancelled self.select{ |s| app/models/project.rb @@ -1,7 +1,7 @@ first: id: 1 username: 'admin' - password: 'adminpass' + password: '94faab26ece5df8aee97238cde8bf5b0fe8f20f4' email: 'admin@example.com' admin: true first_name: 'Admin' test/fixtures/users.yml @@ -8,7 +8,7 @@ class ProjectTest < Test::Unit::TestCase def setup @project_one = Project.find 1 - + @iteration_one = Iteration.find 1 @iteration_two = Iteration.find 2 @iteration_four = Iteration.find 4 @@ -23,7 +23,7 @@ class ProjectTest < Test::Unit::TestCase @milestone_six = Milestone.find 6 @milestone_seven = Milestone.find 7 end - + def test_current_iteration_that_starts_today assert_equal @iteration_one, @project_one.iterations.current end @@ -41,7 +41,7 @@ class ProjectTest < Test::Unit::TestCase @iteration_one.save! assert_equal @iteration_one, @project_one.iterations.current end - + def test_past_iterations assert_equal [ @iteration_four, @iteration_six ], @project_one.iterations.past @@ -51,12 +51,12 @@ class ProjectTest < Test::Unit::TestCase @iteration_four.destroy @iteration_six.destroy end - + def test_past_iterations_with_no_past_iterations destroy_past_iterations assert @project_one.iterations.past.empty? end - + def test_previous_iteration assert_equal @iteration_four, @project_one.iterations.previous end @@ -75,12 +75,12 @@ class ProjectTest < Test::Unit::TestCase @iteration_two.destroy @iteration_five.destroy end - + def test_future_iterations_with_no_future_iterations destroy_future_iterations assert @project_one.iterations.future.empty? end - + def test_next_iteration assert_equal @iteration_two, @project_one.iterations.next end @@ -101,7 +101,7 @@ class ProjectTest < Test::Unit::TestCase @milestone_seven.destroy assert @project_one.milestones.future.empty? end - + def test_recent_milestones assert_equal [ @milestone_four, @milestone_three ], @project_one.milestones.recent @@ -111,12 +111,12 @@ class ProjectTest < Test::Unit::TestCase @milestone_four.destroy @milestone_three.destroy end - + def test_recent_milestones_with_no_recent_milestones destroy_recent_milestones assert @project_one.milestones.recent.empty? end - + def test_past_milestones assert_equal @project_one.milestones.recent + [ @milestone_two, @milestone_one ], @project_one.milestones.past @@ -128,7 +128,7 @@ class ProjectTest < Test::Unit::TestCase @milestone_one.destroy assert @project_one.milestones.past.empty? end - + def test_backlog num_backlog = @project_one.stories.reject{ |a| a.iteration }.size assert_equal num_backlog, @project_one.stories.backlog.size test/unit/project_test.rb @@ -12,7 +12,7 @@ class StoryTest < Test::Unit::TestCase @project_one = Project.find 1 @iteration_one = Iteration.find 1 end - + def test_status_collection assert_equal( [ Story::Status::New, Story::Status::Defined, Story::Status::InProgress, @@ -148,13 +148,13 @@ class StoryTest < Test::Unit::TestCase story.save or fail assert_equal Story::Status::InProgress, story.status end - + def test_title_validations story = Story.new story.title = '_' * 255 story.valid? assert_nil story.errors[:title] - + # title validation must throw an error when title.length > 255 # to support postgreSQL (mySQL truncates a value when it's longer # than defined in the DB, but postgreSQL dies) @@ -162,17 +162,17 @@ class StoryTest < Test::Unit::TestCase story.valid? assert_not_nil story.errors[:title] end - + def test_points_validations story = Story.new - + for valid_value in [nil, 1, 99] story.points = valid_value story.valid? assert_nil story.errors[:points] end - - for invalid_value in [-99, -1, 0] + + for invalid_value in [-99, -1] story.points = invalid_value story.valid? assert_not_nil story.errors[:points] @@ -289,7 +289,7 @@ class StoryStatusTest < Test::Unit::TestCase @statuses << Story::Status.new(i + 1) end end - + def test_order @statuses.each_with_index do |s,i| i += 1 test/unit/story_test.rb @@ -5,11 +5,11 @@ require File.dirname(__FILE__) + '/../test_helper' class UserTest < Test::Unit::TestCase fixtures ALL_FIXTURES - + def setup @user_one = User.find 1 end - + def test_full_name assert_equal("#{@user_one.first_name} #{@user_one.last_name}", @user_one.full_name) @@ -17,7 +17,7 @@ class UserTest < Test::Unit::TestCase def test_authenticate assert_equal(@user_one, - User.authenticate(@user_one.username, @user_one.password)) + User.authenticate(@user_one.username, 'adminpass')) end def test_authenticate_bad_password @@ -26,21 +26,21 @@ class UserTest < Test::Unit::TestCase end def test_authenticate_bad_username - assert_nil User.authenticate('bad_username', @user_one.password) - assert_nil User.authenticate(nil, @user_one.password) + assert_nil User.authenticate('bad_username', 'adminpass') + assert_nil User.authenticate(nil, 'adminpass') end def test_authenticate_bad_username_and_password assert_nil User.authenticate('bad_username', 'bad_password') assert_nil User.authenticate(nil, nil) end - + def test_username_validations @user_one.username = '_' * 1 @user_one.valid? assert_nil @user_one.errors[:username] end - + def test_password_validations @user_one.password = '_' * 1 @user_one.valid? test/unit/user_test.rb e84ae678a7f984aa8d05c19ae7377d84a77d7e59 Jake Dempsey angelo0000@gmail.com http://github.com/explainpmt/explainpmt/commit/a84210169b9bc322ce7d8a8ce9e26cf38d3921d8 a84210169b9bc322ce7d8a8ce9e26cf38d3921d8 2008-04-11T14:12:30-07:00 2008-04-11T14:12:30-07:00 fixed failing unit tests git-svn-id: http://explainpmt.googlecode.com/svn/trunk@698 1861e259-8220-0410-84d7-1f84cab42028 1109ae5b881cdcbaab6b8d21e437d606b0a80380 Jake Dempsey angelo0000@gmail.com