backlog 0.10.8 → 0.11.0

data/test/fixtures/backlogs.yml

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

data/test/fixtures/configurations.yml

@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2

data/test/fixtures/customers.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+  name: Mesta
+two:
+  id: 2
+  name: Statens Veivesen

data/test/fixtures/tasks.yml

@@ -19,6 +19,7 @@
     backlog_id: 1
     period_id: 3
     description: postponed task
+    position: NULL
     finished_at: 2007-08-02 14:15:42
     resolution: POSTPONED
 - started:

data/test/fixtures/users.yml

@@ -1,5 +1,3 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
 tesla:
   party_id: 1000001
   login: tesla
@@ -8,7 +6,7 @@ tesla:
   email: tesla@example.com
   verified: true
   security_token: random_token_string
-  token_expiry: <%= (Clock.now - 1.day) %> # expired
+  token_expiry: <%= (Clock.now - 1.day).strftime("%Y-%m-%d %H:%M:%S") %> # expired
   deleted: false
 
 long_user:
@@ -46,7 +44,7 @@ unverified_user:
   email: unverified_user@example.com
   verified: false
   security_token: random_token_string
-  token_expiry: <%= (Clock.now + User.token_lifetime) %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
+  token_expiry: <%= (Clock.now + User.token_lifetime).strftime("%Y-%m-%d %H:%M:%S") %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
   deleted: false
 
 no_password_user:
@@ -57,5 +55,5 @@ no_password_user:
   email: no_password_user@example.com
   verified: true
   security_token: random_token_string
-  token_expiry: <%= (Clock.now + 1.day) %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
+  token_expiry: <%= (Clock.now + 1.day).strftime("%Y-%m-%d %H:%M:%S") %> # for mysql, add .strftime("%y-%m-%d %H:%M:%S")
   deleted: false

data/test/fixtures/work_accounts.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+  name: LightControl
+two:
+  id: 2
+  name: M2M Server

data/test/fixtures/works.yml

@@ -5,10 +5,12 @@ first:
   started_at: 2007-06-12T13:35:00
   completed_at: 2007-06-12T14:35:00
   hours: 40.0
+  work_account_id: 1
 started:
   id: 2
   task_id: 4
   started_at: 2007-06-12T13:35:00
+  work_account_id: 1
 personal:
   id: 3
   task_id: 1
@@ -16,8 +18,17 @@ personal:
   completed_at: 2007-06-12T14:35:00
   user_id: 1000001
   hours: 40.0
+  work_account_id: 1
 brother_of_started:
   id: 5
   task_id: 4
   started_at: 2007-06-12T13:35:00
   completed_at: 2007-06-12T14:35:00
+  work_account_id: 1
+without_task:
+  id: 6
+  work_account_id: 1
+  started_at: 2007-06-13T13:35:00
+  completed_at: 2007-06-13T14:35:00
+  hours: 8.0
+  user_id: 1000001

data/test/functional/backlogs_controller_test.rb

@@ -5,7 +5,7 @@ require 'backlogs_controller'
 class BacklogsController; def rescue_action(e) raise e end; end
 
 class BacklogsControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
 
   def setup
     @user_controller = UserController.new

data/test/functional/work_accounts_controller_test.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'work_accounts_controller'
+
+# Re-raise errors caught by the controller.
+class WorkAccountsController; def rescue_action(e) raise e end; end
+
+class WorkAccountsControllerTest < Test::Unit::TestCase
+  fixtures :work_accounts, :backlogs, :tasks, :estimates, :works, :task_files
+
+  def setup
+    @controller = WorkAccountsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = 1000001
+
+    @first_id = work_accounts(:one).id
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+  end
+
+  def test_list
+    get :list
+
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:work_accounts)
+  end
+
+  def test_show
+    get :show, :id => @first_id
+
+    assert_response :success
+    assert_template 'show'
+
+    assert_not_nil assigns(:work_account)
+    assert assigns(:work_account).valid?
+  end
+
+  def test_new
+    get :new
+
+    assert_response :success
+    assert_template 'new'
+
+    assert_not_nil assigns(:work_account)
+  end
+
+  def test_create
+    num_work_accounts = WorkAccount.count
+
+    post :create, :work_account => {:name => 'TimeKeeper'}
+
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_equal num_work_accounts + 1, WorkAccount.count
+  end
+
+  def test_edit
+    get :edit, :id => @first_id
+
+    assert_response :success
+    assert_template 'edit'
+
+    assert_not_nil assigns(:work_account)
+    assert assigns(:work_account).valid?
+  end
+
+  def test_update
+    post :update, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'show', :id => @first_id
+  end
+
+  def test_destroy
+    assert_nothing_raised {
+      WorkAccount.find(@first_id)
+    }
+
+    post :destroy, :id => @first_id
+    assert_response :redirect
+    assert_redirected_to :action => 'list'
+
+    assert_raise(ActiveRecord::RecordNotFound) {
+      WorkAccount.find(@first_id)
+    }
+  end
+end

data/test/functional/works_controller_test.rb

@@ -5,7 +5,7 @@ require 'works_controller'
 class WorksController; def rescue_action(e) raise e end; end
 
 class WorksControllerTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
   
   def setup
     @controller = WorksController.new
@@ -56,7 +56,7 @@ class WorksControllerTest < Test::Unit::TestCase
   def test_create
     num_works = Work.count
     
-    post :create, :work => {:task_id => 1, :started_at => Time.now.iso8601}
+    post :create, :work => {:task_id => 1, :started_at => Time.now.iso8601, :work_account_id => '1'}
     
     assert_response :redirect
     assert_redirected_to :controller => 'periods', :action => 'show', :id => periods(:past).id, :task_id => 1
@@ -106,5 +106,9 @@ class WorksControllerTest < Test::Unit::TestCase
     assert_equal num_tasks, Task.count
     assert_equal num_open_tasks - 1, Task.find_open.size
   end
+
+  def test_weekly_work_sheet
+    get :weekly_work_sheet, :id => 24
+  end
   
 end

data/test/integration/user_system_test.rb

@@ -4,7 +4,7 @@ require 'user_notify'
 
 class UserSystemTest < ActionController::IntegrationTest
   self.use_transactional_fixtures = false
-  fixtures :users, :groups_users, :works
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :estimates, :works, :task_files
 
   def setup
     ActionMailer::Base.inject_one_error = false

data/test/performance/test.rb

@@ -1,3 +1,6 @@
-100.times do 
+count = 100
+puts "Running #{count} times"
+count.times do 
   `GET http://localhost:3000/parties/burn_down_chart/1 >/dev/null`
 end
+puts "Finished."

data/test/unit/configuration_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ConfigurationTest < Test::Unit::TestCase
+  fixtures :configurations
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/customer_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CustomerTest < Test::Unit::TestCase
+  fixtures :customers
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/estimate_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class EstimateTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :works, :estimates
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :works, :estimates
 
   # Replace this with your real tests.
   def test_truth

data/test/unit/group_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class GroupTest < Test::Unit::TestCase
-  fixtures :groups, :groups_users
+  fixtures :parties, :users, :groups, :groups_users, :periods, :tasks, :works, :periods, :estimates, :task_files
 
   # Replace this with your real tests.
   def test_truth

data/test/unit/period_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class PeriodTest < Test::Unit::TestCase
-  fixtures :periods, :tasks, :task_files, :estimates, :works
+  fixtures :parties, :users, :groups, :groups_users, :periods, :tasks, :task_files, :estimates, :works
 
   def test_burn_down_graph
     image = periods(:past).burn_down_graph(Chart::THUMBNAIL)

data/test/unit/task_file_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class TaskFileTest < Test::Unit::TestCase
-  fixtures :task_files
+  fixtures :tasks, :task_files, :estimates, :works
 
   # Replace this with your real tests.
   def test_truth

data/test/unit/task_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class TaskTest < Test::Unit::TestCase
-  fixtures :parties, :users, :groups, :groups_users, :backlogs, :periods, :tasks, :task_files, :estimates, :works
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :task_files, :estimates, :works
   
   # Replace this with your real tests.
   def test_truth

data/test/unit/work_account_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class WorkAccountTest < Test::Unit::TestCase
+  fixtures :work_accounts, :backlogs, :tasks, :estimates, :works, :task_files
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/unit/work_test.rb

@@ -4,7 +4,7 @@ require 'user_system'
 class WorkTest < Test::Unit::TestCase
   include UserSystem
   
-  fixtures :users, :groups_users, :works
+  fixtures :parties, :users, :groups, :groups_users, :work_accounts, :backlogs, :periods, :tasks, :estimates, :works, :task_files
   
   def test_work_totals_for_week
     work_totals = Work.work_totals_for_week(24, 1000001)

data/vendor/plugins/goldspike/lib/java_library.rb

@@ -15,13 +15,7 @@ module War
       @config = config
       @name = name
       @version = version
-      check_locations = local_locations(name, version)
-      
-      if locations.is_a?(String)
-        locations = [ locations ]
-      end 
-      check_locations += locations
-      @locations =  check_locations
+      @locations = local_locations(name, version)
     end
     
     def file
@@ -91,12 +85,12 @@ module War
       WLog.debug("locations for " + name + " " + version);
       paths = []
       if config.local_java_lib
-        paths << File.join(local_java_lib, "#{name}-#{version}.#{type}")
-        paths << File.join(local_java_lib, "#{name}.#{type}")
+        paths << File.join(config.local_java_lib, "#{name}-#{version}.#{type}")
+        paths << File.join(config.local_java_lib, "#{name}.#{type}")
       end
       if config.jruby_home
-        paths << File.join(jruby_home, 'lib', "#{name}-#{version}.#{type}")
-        paths << File.join(jruby_home, 'lib', "#{name}.#{type}")
+        paths << File.join(config.jruby_home, 'lib', "#{name}-#{version}.#{type}")
+        paths << File.join(config.jruby_home, 'lib', "#{name}.#{type}")
       end
       WLog.debug("paths: " + paths.join("\n"))
       return paths

data/vendor/plugins/goldspike/lib/run.rb

@@ -12,7 +12,6 @@ module War
     attr_accessor :classpath
     
     def initialize(config = Configuration.instance)
-puts config.jetty_java_opts
       @config = config
       @jetty_main = 'org.mortbay.start.Main'
       @jetty_tmp = File.join('tmp', 'jetty')
@@ -158,4 +157,4 @@ END_OF_JETTY_XML
     end
     
   end #class
-end #module
+end #module

data/vendor/plugins/goldspike/lib/war_config.rb

@@ -96,7 +96,7 @@ module War
       add_library(maven_library('org.jruby.extras', 'goldspike', '1.3'))
       add_library(maven_library('javax.activation', 'activation', '1.1'))
       add_library(maven_library('commons-pool', 'commons-pool', '1.3'))
-      #add_library(maven_library('bouncycastle', 'bcprov-jdk14', '124'))
+      add_library(maven_library('bouncycastle', 'bcprov-jdk14', '124'))
 
       # default gems
       @gem_libraries = {}
@@ -115,8 +115,7 @@ module War
       # default jetty settings
       @jetty_port = 8080
       @jetty_java_opts = ENV['JAVA_OPTS'] || ''
-puts ENV['JAVA_OPTS']
-puts @jetty_java_opts
+      
       # separators
       if RUBY_PLATFORM =~ /(mswin)|(cygwin)/i # watch out for darwin
         @os_separator = '\\'
@@ -280,15 +279,12 @@ puts @jetty_java_opts
       end
 
       # method hook for library property
-      def include_library(name, properties)
-        if properties == nil or properties[:version] == nil or properties[:locations] == nil
-          WLog.warn "in include_library #{name}, 'version' and 'locations' specifications are mandatory"
-          return
-        end
+      def include_library(name, version)
         begin
-          @result.add_java_library(@result.java_library(name, properties[:version], properties[:locations]))
+          @result.add_library(@result.java_library(name, version))
         rescue
-          WLog.warn "couldn't load library #{name}, check library definition in the config file"
+          WLog.warn "couldn't load library #{name}-#{version}.jar, check library definition in the config file"
+          WLog.debug $!
         end
       end
 
@@ -298,6 +294,7 @@ puts @jetty_java_opts
           @result.add_library(@result.maven_library(group, name, version))
         rescue
           WLog.warn "couldn't load maven library #{name}, check library definition in the config file"
+          WLog.debug $!
         end
       end