backlog 0.36.2 → 0.37.1

data/test/functional/search_controller_test.rb

@@ -16,7 +16,7 @@ class SearchControllerTest < ActionController::TestCase
 
   def test_notes
     post :results, :q => 'hullo'
-    assert_not_nil assigns(:backlogs)
+    assert_not_nil assigns(:projects)
     assert_not_nil assigns(:tasks)
     assert_equal 1, assigns(:tasks).size
     assert_equal tasks(:first).id, assigns(:tasks).first.id

data/test/functional/tasks_controller_test.rb

@@ -19,14 +19,14 @@ class TasksControllerTest < ActionController::TestCase
     assert_sequences
   end
   
-  def test_index
-    get :index
-    assert_redirected_to :controller => 'backlogs'
-  end
-  
+#  def test_index
+#    get :index
+#    assert_redirected_to :controller => 'projects'
+#  end
+
   def test_list
     get :list
-    assert_redirected_to :controller => 'backlogs'
+    assert_redirected_to :controller => 'projects'
   end
   
   def test_list_started
@@ -59,7 +59,7 @@ class TasksControllerTest < ActionController::TestCase
   def test_create
     num_tasks = Task.count
     
-    post :create, :task => {:description => 'an important task', :backlog_id => '2',
+    post :create, :task => {:description => 'an important task', :project_id => '2',
       :period_id => periods(:active).id.to_s}
     
     task = assigns(:task)
@@ -74,13 +74,13 @@ class TasksControllerTest < ActionController::TestCase
   def test_create_without_period
     num_tasks = Task.count
     
-    post :create, :task => {:description => 'an important task', :backlog_id => '2'}
+    post :create, :task => {:description => 'an important task', :project_id => '2'}
     
     task = assigns(:task)
     assert_equal [], task.errors.full_messages
     
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => :edit, :id => 2, :task => task.id
+    assert_redirected_to :controller => 'projects', :action => :edit, :id => 2, :task => task.id
     
     assert_equal num_tasks + 1, Task.count
   end
@@ -138,7 +138,7 @@ class TasksControllerTest < ActionController::TestCase
     post :update, :id => 2, :task => {:period_id => ''}
     
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => 'show', :id => before.backlog, :task => 2
+    assert_redirected_to :controller => 'projects', :action => 'show', :id => before.project, :task => 2
     
     after = Task.find(2)
     assert_equal nil, after.period_id
@@ -180,13 +180,13 @@ class TasksControllerTest < ActionController::TestCase
     post :end_work, :id => 1, :work => {:work_start_time => (TimeOfDay.now - 3600).to_s}
     assert_response :redirect
     assert_redirected_to :controller => 'works', :action => :new, 
-                          'work[hours]' => "0.25",
-                          'work[task_id]' => 1,
-                          'work[started_on]' => Time.previous_quarter.to_date.to_s,
-                          'work[start_time]' => Time.previous_quarter.time_of_day.to_s,
-                          'work[completed_at]' => Time.next_quarter.iso8601,
-                          'estimate[todo]' => 1
-    
+                         'work[task_id]' => 1,
+                         'work[started_on]' => Time.previous_quarter.to_date.to_s,
+                         'work[start_time]' => Time.previous_quarter.time_of_day.to_s,
+                         'work[completed_at]' => Time.next_quarter.iso8601,
+                         'work[hours]' => "0.25",
+                         'estimate[todo]' => 1.0
+
     after = Task.find(1)
     assert_equal 70, after.total_done
   end

data/test/functional/user_controller_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'user_controller'
-require 'user_notify'
 
 # Raise errors beyond the default web-based presentation
 class UserController; def rescue_action(e) raise e end; end
@@ -16,7 +15,7 @@ class UserControllerTest < ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @request.host = "localhost"
-    ActionMailer::Base.inject_one_error = false
+    Mail::TestMailer.inject_one_error = false
     ActionMailer::Base.deliveries = []
   end
   
@@ -58,17 +57,15 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_signup
-    post_signup :login => "newuser",
-    :password => "password", :password_confirmation => "password",
-    :email => "newemail@example.com"
+    post_signup :login => "newuser", :password => "password", :password_confirmation => "password", :email => "newemail@example.com"
     assert_not_logged_in
     assert_redirected_to_login
     assert_equal 1, ActionMailer::Base.deliveries.size
     
     mail = ActionMailer::Base.deliveries[0]
     assert_equal "newemail@example.com", mail.to_addrs[0].to_s
-    assert_match /login:\s+\w+\n/, mail.encoded
-    assert_match /password:\s+\w+\n/, mail.encoded
+    assert_match /login:\s+\w+\s*\n/, mail.encoded
+    assert_match /password:\s+\w+\s*\n/, mail.encoded
     user = User.find_by_email("newemail@example.com")
     assert_match /user\[id\]=#{user.id}/, mail.encoded
     assert_match /key=#{user.security_token}/, mail.encoded
@@ -76,10 +73,8 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_signup__raises_delivery_errors
-    ActionMailer::Base.inject_one_error = true
-    post_signup :login => "newtesla",
-    :password => "newpassword", :password_confirmation => "newpassword",
-    :email => "newtesla@example.com"
+    Mail::TestMailer.inject_one_error = true
+    post_signup :login => "newtesla", :password => "newpassword", :password_confirmation => "newpassword", :email => "newtesla@example.com"
     assert_not_logged_in
     assert_equal 0, ActionMailer::Base.deliveries.size
     assert_contains "confirmation email not sent", flash[:notice]
@@ -150,8 +145,8 @@ class UserControllerTest < ActionController::TestCase
     assert_equal 1, ActionMailer::Base.deliveries.size
     mail = ActionMailer::Base.deliveries[0]
     assert_equal "tesla@example.com", mail.to_addrs[0].to_s
-    assert_match /login:\s+\w+\n/, mail.encoded
-    assert_match /password:\s+\w+\n/, mail.encoded
+    assert_match /login:\s+\w+\s*\n/, mail.encoded
+    assert_match /password:\s+\w+\s*\n/, mail.encoded
     assert_equal user, User.authenticate(user.login, 'changed_password')
   end
   
@@ -165,9 +160,9 @@ class UserControllerTest < ActionController::TestCase
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
   
-  def test_change_password__succeeds_despite_delivery_errors
+  def test_change_password_succeeds_despite_delivery_errors
     set_logged_in users(:tesla)
-    ActionMailer::Base.inject_one_error = true
+    Mail::TestMailer.inject_one_error = true
     post :change_password, :user => { :password => "changed_password", :password_confirmation => "changed_password" }
     assert_equal 0, ActionMailer::Base.deliveries.size
     assert_equal users(:tesla), User.authenticate(users(:tesla).login, 'changed_password')
@@ -194,7 +189,7 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_forgot_password__reports_delivery_error
-    ActionMailer::Base.inject_one_error = true
+    Mail::TestMailer.inject_one_error = true
     post :forgot_password, :user => { :email => users(:tesla).email }
     assert_equal 0, ActionMailer::Base.deliveries.size
     assert_match /Your password could not be emailed/, @response.body
@@ -229,7 +224,7 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_autologin_with_username_and_blank_password
-    @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['no_password_user'], :expires =>30.days.from_now})
+    @request.cookies['autologin'] = {:value => ['no_password_user'], :expires =>30.days.from_now}
     get :welcome
     assert_logged_in users(:no_password_user)
     assert_response :redirect
@@ -237,8 +232,8 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_autologin_with_token
-    @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['1000007'], :expires =>30.days.from_now})
-    @request.cookies['token'] = CGI::Cookie.new('autologin', {:value => ['random_token_string'], :expires =>30.days.from_now})
+    @request.cookies['autologin'] = {:value => ['1000007'], :expires =>30.days.from_now}
+    @request.cookies['token'] = {:value => ['random_token_string'], :expires =>30.days.from_now}
     get :welcome
     assert_logged_in users(:no_password_user)
     assert_response :redirect
@@ -246,8 +241,8 @@ class UserControllerTest < ActionController::TestCase
   end
   
   def test_autologin_unverified_user_with_token
-    @request.cookies['autologin'] = CGI::Cookie.new('autologin', {:value => ['1000007'], :expires =>30.days.from_now})
-    @request.cookies['token'] = CGI::Cookie.new('autologin', {:value => ['random_token_string'], :expires =>30.days.from_now})
+    @request.cookies['autologin'] = {:value => ['1000007'], :expires => 30.days.from_now}
+    @request.cookies['token'] = {:value => ['random_token_string'], :expires => 30.days.from_now}
     get :welcome
     assert_logged_in users(:no_password_user)
     assert current_user.verified?

data/test/functional/welcome_controller_test.rb

@@ -26,10 +26,11 @@ class WelcomeControllerTest < ActionController::TestCase
     Estimate.delete_all
     TaskFile.delete_all
     Task.delete_all
-    Backlog.delete_all
+    ActiveRecord::Base.connection.execute("DELETE FROM work_lock_subscriptions")
+    Project.delete_all
     get :index
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => :new
+    assert_redirected_to :controller => 'projects', :action => :new
   end
   
   def test_index_active_period
@@ -55,7 +56,7 @@ class WelcomeControllerTest < ActionController::TestCase
     tasks(:in_ancient).finish(Task::COMPLETED, true)
     get :index
     assert_response :redirect
-    assert_redirected_to :controller => 'backlogs', :action => :show, :id => 1
+    assert_redirected_to :controller => 'projects', :action => :show, :id => 1
   end
   
 end

data/test/functional/works_controller_test.rb

@@ -78,7 +78,7 @@ class WorksControllerTest < ActionController::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, :backlog_id => '1'}
+    post :create, :work => {:task_id => '1', :started_on => Date.today.to_s, :start_time => Time.now.time_of_day.to_s, :project_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 < ActionController::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, :backlog_id => '1'}
+    post :create, :work => {:task_id => '1', :start_time => Time.now.time_of_day.to_s, :project_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -100,7 +100,7 @@ class WorksControllerTest < ActionController::TestCase
   def test_create_with_old_start_date
     num_works = Work.count
     
-    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :backlog_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :project_id => '1', 
         :start_time => '12:00', :completed_at => '2007-07-31 12:20'}
     
     assert_response :redirect
@@ -113,7 +113,7 @@ class WorksControllerTest < ActionController::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', :backlog_id => '1', 
+    post :create, :work => {:task_id => '1', :started_on => '2007-07-31', :project_id => '1', 
         :start_time => '12:00', :completed_at_time => '12:20'}
     
     assert_response :redirect
@@ -127,7 +127,7 @@ class WorksControllerTest < ActionController::TestCase
   def test_create_with_old_start_date_and_no_times
     num_works = Work.count
     
-    post :create, :work => {:started_on => '2007-07-31', :backlog_id => '1', :hours_time => '3:00'}
+    post :create, :work => {:started_on => '2007-07-31', :project_id => '1', :hours_time => '3:00'}
     
     assert_response :redirect, assigns(:work).errors.to_a.inspect
     assert_redirected_to :controller => 'works', :action => 'daily_work_sheet', :id => '2007-07-31'

data/test/integration/user_system_test.rb

@@ -7,7 +7,7 @@ class UserSystemTest < ActionController::IntegrationTest
   main_scenario
 
   def setup
-    ActionMailer::Base.inject_one_error = false
+    Mail::TestMailer.inject_one_error = false
     ActionMailer::Base.deliveries = []
   end
 

data/test/mocks/test/clock.rb

@@ -4,7 +4,7 @@ class Clock
   cattr_writer :time
 
   def self.now
-    @@time
+    @@time.utc
   end
 
   def self.advance_by_days( days )

data/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/test/performance/common.rb

@@ -24,7 +24,7 @@ module Backlog
       
       def start_jetty
         @port = 8080
-        @context = '/backlog'
+        @context = '/project'
         @factor = 2.0
         ENV['RAILS_ENV'] = 'test'
         @jetty_thread = IO.popen("rake war:standalone:run")

data/test/test_helper.rb

@@ -1,11 +1,12 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-require 'user_notify'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+# ActiveSupport::Dependencies.autoload_paths.unshift Rails.root.to_s + '/test/mocks/test'
 
 class ActiveSupport::TestCase
   def self.main_scenario
-    fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks,
+    fixtures :parties, :users, :groups, :groups_users, :projects, :periods, :tasks,
     :task_files, :works, :estimates, :work_lock_subscriptions, :work_locks, :absences
   end
   
@@ -37,7 +38,7 @@ class ActiveSupport::TestCase
   end
   
   def assert_sequences
-    Backlog.find(:all).each do |b|
+    Project.find(:all).each do |b|
       b.unplanned_tasks.each_with_index do |t, i|
         assert_equal i+1, t.position
       end
@@ -81,7 +82,7 @@ class ActiveSupport::TestCase
   end
   
   def assert_redirected_to_login
-    assert_equal @controller.url_for(:action => "login"), @response.redirect_url
+    assert_equal @controller.url_for(:action => "login"), response.redirect_url
   end
   
   def post_signup( user_params )
@@ -102,3 +103,19 @@ class ActiveSupport::TestCase
   end
   
 end
+
+module Mail
+  class TestMailer
+    @@inject_one_error = false
+    cattr_accessor :inject_one_error
+
+    def deliver_with_exception!(mail)
+      if inject_one_error
+        Mail::TestMailer::inject_one_error = false
+        raise "Failed to send email" if raise_delivery_errors
+      end
+      deliver_without_exception!(mail)
+    end
+    alias_method_chain :deliver!, :exception
+  end
+end

data/test/test_helper.rb~

@@ -0,0 +1,121 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+ActiveSupport::Dependencies.autoload_paths.unshift Rails.root.to_s + '/test/mocks/test'
+
+class ActiveSupport::TestCase
+  def self.main_scenario
+    fixtures :parties, :users, :groups, :groups_users, :projects, :periods, :tasks,
+    :task_files, :works, :estimates, :work_lock_subscriptions, :work_locks, :absences
+  end
+  
+  # Transactional fixtures accelerate your tests by wrapping each test method
+  # in a transaction that's rolled back on completion.  This ensures that the
+  # test database remains unchanged so your fixtures don't have to be reloaded
+  # between every test method.  Fewer database queries means faster tests.
+  #
+  # Read Mike Clark's excellent walkthrough at
+  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
+  #
+  # Every Active Record database supports transactions except MyISAM tables
+  # in MySQL.  Turn off transactional fixtures in this case; however, if you
+  # don't care one way or the other, switching from MyISAM to InnoDB tables
+  # is recommended.
+  self.use_transactional_fixtures = true
+  
+  # Instantiated fixtures are slow, but give you @david where otherwise you
+  # would need people(:david).  If you don't want to migrate your existing
+  # test cases which use the @david style and don't mind the speed hit (each
+  # instantiated fixtures translates to a database query per test method),
+  # then set this back to true.
+  self.use_instantiated_fixtures  = false
+  
+  # Add more helper methods to be used by all tests here...
+  
+  def add_stored_detour
+    @request.session[:detours] = [{:controller => 'bogus', :action => :location}]
+  end
+  
+  def assert_sequences
+    Project.find(:all).each do |b|
+      b.unplanned_tasks.each_with_index do |t, i|
+        assert_equal i+1, t.position
+      end
+    end
+    
+    Party.find(:all).each do |p|
+      p.periods.each_with_index do |period, i|
+        assert_equal i+1, period.position
+      end
+    end
+    
+    Period.find(:all).each do |p|
+      p.open_tasks.each_with_index do |t, i|
+        assert_equal i+1, t.position, "Open tasks for period #{p.id} are not in sequence:\n#{p.open_tasks.map{|t|[t.id, t.position]}.inspect}\nTask #{t.id} position does not match."
+      end
+    end
+  end
+  
+  # TODO (uwe): This method should be removed
+  # It is here only because ClassTableInheritanceInRails broke reading fixtures by name
+  def users(login)
+    User.find_by_login(login.to_s)
+  end  
+  
+  def set_logged_in( user )
+    @request.session[:user_id] = user.id
+  end
+  
+  def set_logged_out
+    @request.session[:user_id] = nil
+  end
+  
+  def assert_logged_in( user )
+    assert_equal user.id, @request.session[:user_id]
+    assert_equal user, Thread.current[:user]
+  end
+  
+  def assert_not_logged_in
+    assert_nil @request.session[:user_id]
+    assert_nil assigns(:current_user)
+  end
+  
+  def assert_redirected_to_login
+    assert_equal @controller.url_for(:action => "login"), response.redirect_url
+  end
+  
+  def post_signup( user_params )
+    post :signup, "user" => user_params
+  end
+  
+  def assert_password_validation_fails
+    user = assigns(:user)
+    assert_equal 1, user.errors.size
+    assert_not_nil user.errors['password']
+    assert_response :success
+    assert_equal 0, ActionMailer::Base.deliveries.size
+  end
+  
+  def assert_contains( target, container )
+    assert !container.nil?, %Q( Failed to find "#{target}" in nil String )
+    assert container.include?(target)
+  end
+  
+end
+
+module Mail
+  class TestMailer
+    @@inject_one_error = false
+    cattr_accessor :inject_one_error
+
+    def deliver_with_exception!(mail)
+      if inject_one_error
+        Mail::TestMailer::inject_one_error = false
+        raise "Failed to send email" if raise_delivery_errors
+      end
+      deliver_without_exception!(mail)
+    end
+    alias_method_chain :deliver!, :exception
+  end
+end