backlog 0.35.5 → 0.36.2

data/public/stylesheets/mwrt002.css

@@ -13,8 +13,8 @@ a:hover {font-weight:bold; color:#FF9900; background-color: #FFFFFF; text-decora
 table {padding:0px; margin:0px; width:inherit;}
 tbody {padding:0px; margin:0px; width:inherit;}
 th {padding:2px; margin:0px; width:inherit;}
-#wrap {width:793px; text-align:left; margin:auto;}
-#leftcol {width:580px; float:left; vertical-align:top; padding:4px 2px 4px 4px;}
+#wrap {width:1193px; text-align:left; margin:auto;}
+#leftcol {width:880px; float:left; vertical-align:top; padding:4px 2px 4px 4px;}
 #navbar {background-color:#F0F0F0; color:#777777; margin:0px 0px 5px 0; padding:5px; border:1px solid #333333; text-align:right;}
 #navbar a {font-weight:bold; color:#5B7C7C; background-color: #F0F0F0; text-decoration:none; border-bottom:1px dashed #333333;}      /* unvisited links */
 #navbar a:hover {font-weight:bold; color:#FF9900; background-color: #F0F0F0; text-decoration:none; border-bottom:1px solid #999999;}     /* user hovers     */
@@ -22,18 +22,18 @@ th {padding:2px; margin:0px; width:inherit;}
 #introtext {margin:25px 10px 10px 10px;}
 #spotlight {background-color:#FFFFFF; color:#000000; margin:0px 0px 5px 0; padding:5px; border:1px solid #333333;}
 #spotlight img {padding:3px 4px 0px 0; float:left;}
-#lfeature {background-color:#FFFFFF; color:#000000; margin:0px 1px 5px 0; padding:5px; border:1px solid #333333; width:275px; float:left;}
+#lfeature {background-color:#FFFFFF; color:#000000; margin:0px 1px 5px 0; padding:5px; border:1px solid #333333; width:425px; float:left;}
 #lfeature img {padding:3px 4px 0px 0; float:left;}
-#rfeature {background-color:#FFFFFF; color:#000000; margin:0px 0px 5px 1px; padding:5px; border:1px solid #333333; width:275px; float:right;}
+#rfeature {background-color:#FFFFFF; color:#000000; margin:0px 0px 5px 1px; padding:5px; border:1px solid #333333; width:425px; float:right;}
 #rfeature img {padding:3px 4px 0px 0; float:left;}
 #maincontent {clear:both;}
 .mainblock {background-color:#FFFFFF; color:#000000; margin:0px 0px 5px 0; padding:5px; border:1px solid #333333;}
 #banners {clear:both; margin:5px; padding:5px; text-align:center;}
 #footer {clear:both; text-align:center;}
-#footertext {background-color:#F0F0F0; color:#5B7C7C; margin:auto; padding:5px; border:1px solid #333333; height:30px; width:775px;}
+#footertext {background-color:#F0F0F0; color:#5B7C7C; margin:auto; padding:5px; border:1px solid #333333; height:30px; width:1175px;}
 #footertext a {font-weight:bold; color:#5B7C7C; background-color: #F0F0F0; text-decoration:none; border-bottom:1px dashed #333333;}      /* unvisited links */
 #footertext a:hover {font-weight:bold; color:#FF9900; background-color: #F0F0F0; text-decoration:none; border-bottom:1px solid #5B7C7C;}     /* user hovers     */
-#rightcol {width:200px; float:right; vertical-align:top; padding:4px 4px 4px 2px;}
+#rightcol {width:300px; float:right; vertical-align:top; padding:4px 4px 4px 2px;}
 .rblock {background-color:#FFFFFF; color:#000000; margin:0px 0px 5px 0; padding:5px; border:1px solid #333333;}
 .btitle {display: block; clear:both; padding:2px; margin:0px 0px 2px 0; border-bottom:1px dashed #999999;}
 #rightcol .btitle {display: block; clear:both; padding:2px; margin:0px 0px 2px 0; border:1px solid #999999; background-color:#F0F0F0; color:#333333;}

data/script/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

data/test/fixtures/backlogs.yml

@@ -1,8 +1,8 @@
 first:
   id: 1
   name: My backlog
-  work_account_id: 1
+  track_times: false
 another:
   id: 2
   name: Your backlog
-  work_account_id: 2
+  track_times: true

data/test/fixtures/work_lock_subscriptions.yml

@@ -1,7 +1,7 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   subscriber_user_id: 1000001
-  work_account_id: 1
+  backlog_id: 1
 two:
   subscriber_user_id: 1000001
-  work_account_id: 2
+  backlog_id: 2

data/test/fixtures/works.yml

@@ -6,13 +6,13 @@ first:
   start_time: !time 13:35:00
   completed_at: 2007-06-12T14:35:00
   hours: 30.0
-  work_account_id: 1
+  backlog_id: 1
 started:
   id: 2
   task_id: 4
   started_on: 2007-06-12
   start_time: !time 13:35:00
-  work_account_id: 1
+  backlog_id: 1
 personal:
   id: 3
   task_id: 1
@@ -21,17 +21,17 @@ personal:
   completed_at: 2007-06-12T14:35:00
   user_id: 1000001
   hours: 40.0
-  work_account_id: 1
+  backlog_id: 1
 brother_of_started:
   id: 5
   task_id: 4
   started_on: 2007-06-12
   start_time: !time 13:35:00
   completed_at: 2007-06-12T14:35:00
-  work_account_id: 1
+  backlog_id: 1
 without_task:
   id: 6
-  work_account_id: 1
+  backlog_id: 1
   started_on: 2007-06-13
   start_time: !time 13:35:00
   completed_at: 2007-06-13T14:35:00
@@ -43,5 +43,5 @@ short:
   start_time: !time 10:00:00
   completed_at: 2007-06-18T10:05:00
   hours: 0.083
-  work_account_id: 1
+  backlog_id: 1
   user_id: 1000001

data/test/functional/absences_controller_test.rb

@@ -4,7 +4,7 @@ require 'absences_controller'
 # Re-raise errors caught by the controller.
 class AbsencesController; def rescue_action(e) raise e end; end
 
-class AbsencesControllerTest < Test::Unit::TestCase
+class AbsencesControllerTest < ActionController::TestCase
   main_scenario
 
   def setup

data/test/functional/backlogs_controller_test.rb

@@ -4,7 +4,7 @@ require 'backlogs_controller'
 # Re-raise errors caught by the controller.
 class BacklogsController; def rescue_action(e) raise e end; end
 
-class BacklogsControllerTest < Test::Unit::TestCase
+class BacklogsControllerTest < ActionController::TestCase
   main_scenario
 
   def setup
@@ -62,10 +62,10 @@ class BacklogsControllerTest < Test::Unit::TestCase
   def test_create
     num_backlogs = Backlog.count
     @request.session[:user_id] = 1000001
-    post :create, :backlog => {:name => 'house work'}
+    post :create, :backlog => {:name => 'house work', :track_times => true}
 
-    assert_response :redirect
-    assert_redirected_to :action => :show
+    assert_response :redirect, assigns(:backlog).errors.to_a.inspect
+    assert_redirected_to :action => :show, :id => assigns(:backlog).id
 
     assert_equal num_backlogs + 1, Backlog.count
   end

data/test/functional/customers_controller_test.rb

@@ -4,7 +4,7 @@ require 'customers_controller'
 # Re-raise errors caught by the controller.
 class CustomersController; def rescue_action(e) raise e end; end
 
-class CustomersControllerTest < Test::Unit::TestCase
+class CustomersControllerTest < ActionController::TestCase
   fixtures :customers
 
   def setup

data/test/functional/dashboard_controller_test.rb

@@ -4,7 +4,7 @@ require 'dashboard_controller'
 # Re-raise errors caught by the controller.
 class DashboardController; def rescue_action(e) raise e end; end
 
-class DashboardControllerTest < Test::Unit::TestCase
+class DashboardControllerTest < ActionController::TestCase
   def setup
     @controller = DashboardController.new
     @request    = ActionController::TestRequest.new

data/test/functional/estimates_controller_test.rb

@@ -3,7 +3,7 @@ require 'estimates_controller'
 
 class EstimatesController; def rescue_action(e) raise e end; end
 
-class EstimatesControllerTest < Test::Unit::TestCase
+class EstimatesControllerTest < ActionController::TestCase
   main_scenario
 
   def setup

data/test/functional/groups_controller_test.rb

@@ -3,7 +3,7 @@ require 'groups_controller'
 
 class GroupsController; def rescue_action(e) raise e end; end
 
-class GroupsControllerTest < Test::Unit::TestCase
+class GroupsControllerTest < ActionController::TestCase
   main_scenario
 
   def setup

data/test/functional/parties_controller_test.rb

@@ -4,7 +4,7 @@ require 'parties_controller'
 # Re-raise errors caught by the controller.
 class PartiesController; def rescue_action(e) raise e end; end
 
-class PartiesControllerTest < Test::Unit::TestCase
+class PartiesControllerTest < ActionController::TestCase
   main_scenario
 
   def setup

data/test/functional/periods_controller_test.rb

@@ -4,7 +4,7 @@ require 'periods_controller'
 # Re-raise errors caught by the controller.
 class PeriodsController; def rescue_action(e) raise e end; end
 
-class PeriodsControllerTest < Test::Unit::TestCase
+class PeriodsControllerTest < ActionController::TestCase
   main_scenario
   
   def setup

data/test/functional/public_holidays_controller_test.rb

@@ -4,7 +4,7 @@ require 'public_holidays_controller'
 # Re-raise errors caught by the controller.
 class PublicHolidaysController; def rescue_action(e) raise e end; end
 
-class PublicHolidaysControllerTest < Test::Unit::TestCase
+class PublicHolidaysControllerTest < ActionController::TestCase
   fixtures :public_holidays
 
   def setup

data/test/functional/search_controller_test.rb

@@ -4,7 +4,7 @@ require 'search_controller'
 # Re-raise errors caught by the controller.
 class SearchController; def rescue_action(e) raise e end; end
 
-class SearchControllerTest < Test::Unit::TestCase
+class SearchControllerTest < ActionController::TestCase
   main_scenario
   
   def setup

data/test/functional/task_files_controller_test.rb

@@ -4,7 +4,7 @@ require 'task_files_controller'
 # Re-raise errors caught by the controller.
 class TaskFilesController; def rescue_action(e) raise e end; end
 
-class TaskFilesControllerTest < Test::Unit::TestCase
+class TaskFilesControllerTest < ActionController::TestCase
   fixtures :task_files
 
   def setup

data/test/functional/tasks_controller_test.rb

@@ -4,7 +4,7 @@ require 'tasks_controller'
 # Re-raise errors caught by the controller.
 class TasksController; def rescue_action(e) raise e end; end
 
-class TasksControllerTest < Test::Unit::TestCase
+class TasksControllerTest < ActionController::TestCase
   main_scenario
   
   def setup
@@ -66,7 +66,7 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_equal [], task.errors.full_messages
     
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:active)
+    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:active).id, :task => assigns(:task).id
     
     assert_equal num_tasks + 1, Task.count
   end
@@ -80,7 +80,7 @@ class TasksControllerTest < Test::Unit::TestCase
     assert_equal [], task.errors.full_messages
     
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => :edit, :id => 2
+    assert_redirected_to :controller => 'backlogs', :action => :edit, :id => 2, :task => task.id
     
     assert_equal num_tasks + 1, Task.count
   end
@@ -126,7 +126,7 @@ class TasksControllerTest < Test::Unit::TestCase
     post :update, :id => 2, :task => {:description => 'Two'}
     
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:active)
+    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:active), :task => 2
     
     after = Task.find(2)
     assert_equal 'Two', after.description
@@ -138,7 +138,7 @@ class TasksControllerTest < Test::Unit::TestCase
     post :update, :id => 2, :task => {:period_id => ''}
     
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => 'show', :id => before.backlog
+    assert_redirected_to :controller => 'backlogs', :action => 'show', :id => before.backlog, :task => 2
     
     after = Task.find(2)
     assert_equal nil, after.period_id
@@ -200,7 +200,7 @@ class TasksControllerTest < Test::Unit::TestCase
     post :move_to, :id => subtask.id.to_s, :target_id => supertask.id.to_s
     
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => :show_no_layout, :id => subtask_before.root_task.period_id
+    assert_redirected_to :controller => 'periods', :action => :show_no_layout, :id => subtask_before.root_task.period_id, :task => tasks(:subtask).id
     
     subtask_after = Task.find(subtask.id)
     assert_equal subtask.root_task.period_id, subtask_after.period_id

data/test/functional/user_controller_test.rb

@@ -5,7 +5,7 @@ require 'user_notify'
 # Raise errors beyond the default web-based presentation
 class UserController; def rescue_action(e) raise e end; end
 
-class UserControllerTest < Test::Unit::TestCase
+class UserControllerTest < ActionController::TestCase
   include UserSystem
   
   self.use_transactional_fixtures = false
@@ -146,6 +146,7 @@ class UserControllerTest < Test::Unit::TestCase
     user = users(:tesla)
     set_logged_in user
     post :change_password, :user => { :password => "changed_password", :password_onfirmation => "changed_password" }
+    assert_response :success
     assert_equal 1, ActionMailer::Base.deliveries.size
     mail = ActionMailer::Base.deliveries[0]
     assert_equal "tesla@example.com", mail.to_addrs[0].to_s
@@ -222,7 +223,7 @@ class UserControllerTest < Test::Unit::TestCase
     assert_equal @controller.url_for(:controller => 'welcome', :action => :index), @response.redirect_url
     assert_cookie :autologin, :value => '1000001'
     assert_cookie :token
-    assert_not_equal 'random_token_string', cookies['token'].value
+    assert_not_equal 'random_token_string', cookies['token']
     assert_equal false, User.find(1000001).token_expired?
     assert_not_equal 'random_token_string', User.find(1000001).security_token
   end

data/test/functional/welcome_controller_test.rb

@@ -4,7 +4,7 @@ require 'welcome_controller'
 # Re-raise errors caught by the controller.
 class WelcomeController; def rescue_action(e) raise e end; end
 
-class WelcomeControllerTest < Test::Unit::TestCase
+class WelcomeControllerTest < ActionController::TestCase
   main_scenario
   
   def setup

data/test/functional/work_locks_controller_test.rb

@@ -4,7 +4,7 @@ require 'work_locks_controller'
 # Re-raise errors caught by the controller.
 class WorkLocksController; def rescue_action(e) raise e end; end
 
-class WorkLocksControllerTest < Test::Unit::TestCase
+class WorkLocksControllerTest < ActionController::TestCase
   fixtures :work_locks
 
   def setup

data/test/functional/works_controller_test.rb

@@ -4,7 +4,7 @@ require 'works_controller'
 # Re-raise errors caught by the controller.
 class WorksController; def rescue_action(e) raise e end; end
 
-class WorksControllerTest < Test::Unit::TestCase
+class WorksControllerTest < ActionController::TestCase
   main_scenario
   
   def setup
@@ -78,7 +78,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create
     num_works = Work.count
     
-    post :create, :work => {:task_id => '1', :started_on => Date.today.to_s, :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
+    post :create, :work => {:task_id => '1', :started_on => Date.today.to_s, :start_time => Time.now.time_of_day.to_s, :backlog_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -89,7 +89,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_without_start_date
     num_works = Work.count
     
-    post :create, :work => {:task_id => '1', :start_time => Time.now.time_of_day.to_s, :work_account_id => '1'}
+    post :create, :work => {:task_id => '1', :start_time => Time.now.time_of_day.to_s, :backlog_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -100,12 +100,12 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_with_old_start_date
     num_works = Work.count
     
-    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :work_account_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :backlog_id => '1', 
         :start_time => '12:00', :completed_at => '2007-07-31 12:20'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
-    
+    assert_equal 'Work was successfully created.', flash[:notice]
     assert_equal num_works + 1, Work.count
     assert_equal BigDecimal('0.333'), assigns(:work).hours
   end
@@ -113,7 +113,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_with_old_start_date_and_completed_at_time
     num_works = Work.count
     
-    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :work_account_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :backlog_id => '1', 
         :start_time => '12:00', :completed_at_time => '12:20'}
     
     assert_response :redirect
@@ -127,9 +127,9 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create_with_old_start_date_and_no_times
     num_works = Work.count
     
-    post :create, :work => {:started_on => '2007-07-31', :work_account_id => '1', :hours_time => '3:00'}
+    post :create, :work => {:started_on => '2007-07-31', :backlog_id => '1', :hours_time => '3:00'}
     
-    assert_response :redirect
+    assert_response :redirect, assigns(:work).errors.to_a.inspect
     assert_redirected_to :controller => 'works', :action => 'daily_work_sheet', :id => '2007-07-31'
     
     assert_equal num_works + 1, Work.count
@@ -153,7 +153,7 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:work)
     assert_equal([], assigns(:work).errors.full_messages, assigns(:work).inspect)
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id
+    assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
   end
   
   def test_update_time
@@ -191,7 +191,7 @@ class WorksControllerTest < Test::Unit::TestCase
     
     post :destroy, :id => 1
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => 'list_work'
+    assert_redirected_to :controller => 'periods', :action => 'list_work', :id => 2
     
     assert_raise(ActiveRecord::RecordNotFound) {
       Work.find(1)
@@ -207,7 +207,7 @@ class WorksControllerTest < Test::Unit::TestCase
     post :update, "commit"=>"Lagre", "action"=>"update", "id"=>work.id.to_s, "controller"=>"works", "estimate"=>{"todo"=>"0"}, "work"=>{"completed_at"=>"2007-08-02 14:15", "task_id"=> task.id.to_s, "user_id"=>"1000001", "started_on"=>"2007-08-02", "start_time"=>"14:00"}
     
     assert_response :redirect
-    assert_redirected_to :controller => 'periods', :action => :show, :id => task.period, :task => nil
+    assert_redirected_to :controller => 'periods', :action => :show, :id => task.period, :task_id => 4
     
     assert_equal num_tasks, Task.count
     assert_equal num_open_tasks - 1, Task.find_open.size

data/test/test_helper.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 require 'user_notify'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
   def self.main_scenario
-    fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks,
+    fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks,
     :task_files, :works, :estimates, :work_lock_subscriptions, :work_locks, :absences
   end
   

data/test/unit/absence_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class AbsenceTest < Test::Unit::TestCase
+class AbsenceTest < ActiveSupport::TestCase
   main_scenario
 
   def teardown

data/test/unit/configuration_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ConfigurationTest < Test::Unit::TestCase
+class ConfigurationTest < ActiveSupport::TestCase
   fixtures :configurations
 
   # Replace this with your real tests.

data/test/unit/customer_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class CustomerTest < Test::Unit::TestCase
+class CustomerTest < ActiveSupport::TestCase
   fixtures :customers
 
   # Replace this with your real tests.