timesheet_plugin 0.5.0 → 0.6.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timesheet_plugin
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Eric Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -07:00
+date: 2010-03-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -42,8 +42,11 @@ files:
 - app/views/timesheet/no_projects.rhtml
 - app/views/timesheet/report.rhtml
 - app/views/timesheet/timelog.rhtml
+- assets/images/csv.png
 - assets/images/toggle-arrow-closed.gif
 - assets/images/toggle-arrow-open.gif
+- assets/javascripts/timesheet.js
+- assets/stylesheets/timesheet.css
 - config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -52,10 +55,17 @@ files:
 - config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/hu.yml
+- config/locales/hy.yml
 - config/locales/it.yml
+- config/locales/ja.yml
 - config/locales/lt.yml
 - config/locales/pl.yml
+- config/locales/pt-br.yml
 - config/locales/ru.yml
+- config/locales/sr.yml
+- config/locales/sv.yml
+- config/locales/uk.yml
+- config/routes.rb
 - init.rb
 - lang/ca.yml
 - lang/cs.yml
@@ -65,13 +75,23 @@ files:
 - lang/es.yml
 - lang/fr.yml
 - lang/hu.yml
+- lang/hy.yml
 - lang/it.yml
+- lang/ja.yml
 - lang/lt.yml
 - lang/pl.yml
+- lang/pt-br.yml
 - lang/ru.yml
-- lib/tasks/plugin_stat.rake
+- lang/sr.yml
+- lang/sv.yml
+- lang/uk.yml
 - lib/timesheet_compatibility.rb
 - rails/init.rb
+- test/functional/timesheet_controller_test.rb
+- test/integration/timesheet_menu_test.rb
+- test/test_helper.rb
+- test/unit/sanity_test.rb
+- test/unit/timesheet_test.rb
 has_rdoc: true
 homepage: https://projects.littlestreamsoftware.com/projects/redmine-timesheet
 licenses: []
@@ -101,7 +121,8 @@ signing_key:
 specification_version: 3
 summary: A Timesheet plugin for Redmine to show timelogs for all projects
 test_files: 
-- spec/models/timesheet_spec.rb
-- spec/spec_helper.rb
-- spec/controllers/timesheet_controller_spec.rb
-- spec/sanity_spec.rb
+- test/test_helper.rb
+- test/integration/timesheet_menu_test.rb
+- test/unit/timesheet_test.rb
+- test/unit/sanity_test.rb
+- test/functional/timesheet_controller_test.rb

data/lib/tasks/plugin_stat.rake

@@ -1,38 +0,0 @@
-namespace :spec do
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-    ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-    ::STATS_DIRECTORIES << %w(Integration\ specs spec/integration) if File.exist?('spec/integration')
-    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-    ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-    ::CodeStatistics::TEST_TYPES << "Integration specs" if File.exist?('spec/integration')
-  end
-end
-
-
-STATS_DIRECTORIES = [
-  %w(Controllers        app/controllers),
-  %w(Helpers            app/helpers), 
-  %w(Models             app/models),
-  %w(Libraries          lib/),
-  %w(APIs               app/apis),
-  %w(Integration\ tests test/integration),
-  %w(Functional\ tests  test/functional),
-  %w(Unit\ tests        test/unit)
-
-].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  require 'code_statistics'
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end

data/spec/controllers/timesheet_controller_spec.rb

@@ -1,263 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-module TimesheetControllerHelper
-  # Sets up the default mocks
-  def default_mocks(options = {})
-    # User
-    @current_user = mock_model(User)
-    @current_user.stub!(:admin?).and_return(false)
-    @user_project_mock = mock_model(Project)
-    @user_project_mock.stub!(:find).and_return([ ])
-    @current_user.stub!(:projects).and_return(@user_project_mock)
-    stub_current_user
-    
-    # Redmine application controller
-    controller.stub!(:check_if_login_required).and_return(true)
-    controller.stub!(:set_localization)
-    
-    # Timesheet
-    @timesheet = mock_model(Timesheet)
-    @timesheet.stub!(:projects).and_return([ ])
-    @timesheet.stub!(:projects=)
-    @timesheet.stub!(:allowed_projects).and_return(['not empty'])
-    @timesheet.stub!(:allowed_projects=)
-    @timesheet.stub!(:date_from)
-    @timesheet.stub!(:date_from=)
-    @timesheet.stub!(:date_to)
-    @timesheet.stub!(:date_to=)
-    @timesheet.stub!(:activities)
-    @timesheet.stub!(:activities=)
-    @timesheet.stub!(:users)
-    @timesheet.stub!(:users=)
-    @timesheet.stub!(:fetch_time_entries)
-    @timesheet.stub!(:time_entries).and_return([ ])
-    @timesheet.stub!(:sort)
-    @timesheet.stub!(:sort=)
-    @timesheet.stub!(:period_type=)
-    stub_timesheet unless options[:skip_timesheet_stub]
-  end
-  
-  # Converts current user to admin
-  def mock_admin
-    @current_user.stub!(:admin?).and_return(true)
-    stub_current_user
-  end
-  
-  # Restubs the current user
-  def stub_current_user
-    User.stub!(:current).and_return(@current_user)
-  end
-  
-  # Restubs the new timesheet
-  def stub_timesheet
-    Timesheet.stub!(:new).and_return(@timesheet)
-  end
-end
-
-describe 'TimesheetControllerShared', :shared => true do
-  it 'should set @timesheet.allowed_projects to the list of current projects the user is a member of' do
-    project1 = mock_model(Project)
-    project2 = mock_model(Project)
-    projects = [project1, project2]
-    
-    # Adjust mocks
-    @user_project_mock.should_receive(:find).and_return(projects)
-    stub_current_user
-    @timesheet.should_receive(:allowed_projects=).with(projects)
-    @timesheet.stub!(:allowed_projects).and_return(projects)
-    stub_timesheet
-    
-    send_request
-    assigns[:timesheet].allowed_projects.should eql(projects)
-  end
-
-  it 'should set @timesheet.allowed_projects to all the projects if the user is an admin' do
-    mock_admin
-    project1 = mock_model(Project)
-    project2 = mock_model(Project)
-    projects = [project1, project2]
-    
-    # Adjust mocks
-    Project.stub!(:find).with(:all, { :order => "name ASC" }).and_return(projects)
-    @timesheet.should_receive(:allowed_projects=).with(projects)
-    @timesheet.stub!(:allowed_projects).and_return(projects)
-    stub_timesheet
-    
-    send_request
-    assigns[:timesheet].allowed_projects.should eql(projects)
-  end
-
-  it 'should get the list size from the settings' do
-    settings = { 'list_size' => 10, 'precision' => '2' }
-    Setting.should_receive(:plugin_timesheet_plugin).twice.and_return(settings)
-    
-    send_request
-    assigns[:list_size].should eql(10)
-  end
-
-  it 'should get the precision from the settings' do
-    settings = { 'list_size' => 10, 'precision' => '2' }
-    Setting.should_receive(:plugin_timesheet_plugin).twice.and_return(settings)
-    
-    send_request
-    assigns[:precision].should eql(2)
-  end
-
-  it 'should create a new @timesheet' do
-    Timesheet.should_receive(:new).and_return(@timesheet)
-
-    send_request
-    assigns[:timesheet].should eql(@timesheet)
-  end
-end
-
-
-describe TimesheetController do
-  it "should use TimesheetController" do
-    controller.should be_an_instance_of(TimesheetController)
-  end
-
-end
-describe TimesheetController,"#index with GET request" do
-  include TimesheetControllerHelper
-  
-  def send_request
-    get 'index'
-  end
-  
-  before(:each) do
-    default_mocks
-  end
-
-  it_should_behave_like "TimesheetControllerShared"
-  
-  it 'should have no timelog entries' do
-    get 'index'
-    assigns[:timesheet].time_entries.should be_empty
-  end
-
-  it 'should render the index template' do
-    get 'index'
-    response.should render_template('index')
-  end
-end
-
-describe TimesheetController,"#index with GET request and a session" do
-  include TimesheetControllerHelper
-  it 'should read the session data' do
-    default_mocks(:skip_timesheet_stub => true)
-
-    projects = []
-    4.times do |i|
-      projects << mock_model(Project, :id => i + 1)
-    end
-    
-    controller.stub!(:allowed_projects).and_return(projects)
-    session[TimesheetController::SessionKey] = HashWithIndifferentAccess.new(
-      :projects => projects.collect(&:id).collect(&:to_s),
-      :date_to => '2009-01-01',
-      :date_from => '2009-01-01'
-    )
-
-    get :index
-    assigns[:timesheet].date_from.should eql('2009-01-01')
-    assigns[:timesheet].date_to.should eql('2009-01-01')
-    assigns[:timesheet].projects.should eql(projects)
-  end
-end
-
-describe TimesheetController,"#index with GET request from an Anonymous user" do
-  include TimesheetControllerHelper
-
-  it 'should render the no_projects template' do
-    get 'index'
-    response.should render_template('no_projects')
-  end
-
-end
-
-describe TimesheetController,"#report with GET request from an Anonymous user" do
-  include TimesheetControllerHelper
-
-  it 'should redirect to the index' do
-    get 'report'
-    response.should be_redirect
-    response.should redirect_to(:action => 'index')
-  end
-
-end
-
-describe TimesheetController,"#report with POST request from an Anonymous user" do
-  include TimesheetControllerHelper
-
-  it 'should redirect to the index' do
-    get 'report'
-    response.should be_redirect
-    response.should redirect_to(:action => 'index')
-  end
-
-end
-
-describe TimesheetController,"#report with POST request" do
-  include TimesheetControllerHelper
-  
-  before(:each) do
-    default_mocks
-  end
-
-  def send_request
-    post_report
-  end
-  
-  def post_report(data={ :timesheet => { } })
-    post 'report', data
-  end
-  
-  it_should_behave_like "TimesheetControllerShared"
-  
-  it 'should only allow the allowed projects into @timesheet.projects' do
-    project1 = mock_model(Project, :to_param => '1', :id => 1)
-    project2 = mock_model(Project, :to_param => '2', :id => 2)
-    projects = [project1, project2]
-    
-    # Adjust mocks
-    @user_project_mock.should_receive(:find).and_return(projects)
-    stub_current_user
-
-    @timesheet.should_receive(:allowed_projects=).with(projects)
-    @timesheet.should_receive(:allowed_projects).twice.and_return(projects)
-    @timesheet.should_receive(:projects=).with([project1])
-    stub_timesheet
-
-    post_report({ :timesheet => { :projects => ['1'] } })
-  end
-
-  it 'should save the session data' do
-    post_report({ :timesheet => { :projects => ['1'] } })
-    session[TimesheetController::SessionKey].should_not be_nil
-    session[TimesheetController::SessionKey].keys.should include('projects')
-    session[TimesheetController::SessionKey]['projects'].should eql(['1'])
-  end
-end
-
-describe TimesheetController,"#report with request with no data" do
-  include TimesheetControllerHelper
-  
-  before(:each) do
-    default_mocks
-  end
-
-  describe 'should redirect to the index' do
-    it 'from a GET request' do
-      post 'report', { }
-      response.should be_redirect
-      response.should redirect_to(:action => 'index')
-    end
-
-    it 'from a POST request' do
-      post 'report', { }
-      response.should be_redirect
-      response.should redirect_to(:action => 'index')
-    end
-  end
-end

data/spec/models/timesheet_spec.rb

@@ -1,537 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-module TimesheetSpecHelper
-  def timesheet_factory(options={ })
-    timesheet = Timesheet.new(options)
-    timesheet.date_from ||= Date.today.to_s
-    timesheet.date_to ||= Date.today.to_s
-    
-    return timesheet
-  end
-  
-  def project_factory(id, options = { })
-    object_options = { 
-      :parent => nil,
-      :id => id,
-      :to_param => id.to_s
-    }.merge(options)
-
-    project = mock_model(Project, object_options)
-    project_te1 = mock_model(TimeEntry, :id => '100' + id.to_s, :project_id => project.id, :issue_id => '1', :hours => '5', :activity_id => '1', :spent_on => Date.today, :user => 1)
-    project_te2 = mock_model(TimeEntry, :id => '101' + id.to_s, :project_id => project.id, :issue_id => '1', :hours => '10', :activity_id => '1', :spent_on => Date.today, :user => 1)
-    project_time_entries_mock = mock('project_time_entries_mock')
-    project_time_entries_mock.stub!(:find).and_return([project_te1, project_te2])
-    project.stub!(:time_entries).and_return(project_time_entries_mock)
-    project.stub!(:name).and_return('Project ' + id.to_s)
-    
-    return project
-  end
-  
-  def time_entry_factory(id, options = { })
-    object_options = {
-      :id => id,
-      :to_param => id.to_s,
-      :spent_on => Date.today,
-    }.merge(options)
-    
-    time_entry = mock_model(TimeEntry, object_options)
-    time_entry.stub!(:issue).and_return(options[:issue]) unless options[:issue].nil?
-    return time_entry
-  end
-
-  def stub_non_member_user(projects)
-    @current_user = mock_model(User)
-    @current_user.stub!(:admin?).and_return(false)
-    projects.each do |project|
-      @current_user.stub!(:allowed_to?).with(:view_time_entries, project).and_return(false)
-      @current_user.stub!(:allowed_to?).with(:see_project_timesheets, project).and_return(false)
-    end
-    User.stub!(:current).and_return(@current_user)
-  end
-  
-  def stub_normal_user(projects)
-    @current_user = mock_model(User)
-    @current_user.stub!(:admin?).and_return(false)
-    projects.each do |project|
-      @current_user.stub!(:allowed_to?).with(:view_time_entries, project).and_return(true)
-      @current_user.stub!(:allowed_to?).with(:see_project_timesheets, project).and_return(false)
-    end
-    User.stub!(:current).and_return(@current_user)
-  end
-  
-  def stub_manager_user(projects)
-    @current_user = mock_model(User)
-    @current_user.stub!(:admin?).and_return(false)
-    projects.each do |project|
-      @current_user.stub!(:allowed_to?).with(:view_time_entries, project).and_return(true)
-      @current_user.stub!(:allowed_to?).with(:see_project_timesheets, project).and_return(true)
-    end
-    User.stub!(:current).and_return(@current_user)
-  end
-  
-  def stub_admin_user
-    @current_user = mock_model(User)
-    @current_user.stub!(:admin?).and_return(true)
-    @current_user.stub!(:allowed_to?).and_return(true)
-    @current_user.stub!(:name).and_return("Administrator Bob")
-    User.stub!(:current).and_return(@current_user)    
-  end
-end
-
-describe Timesheet do
-  it 'should not be an ActiveRecord class' do
-    Timesheet.should_not be_a_kind_of(ActiveRecord::Base)
-  end
-end
-
-describe Timesheet, 'initializing' do
-  it 'should initialize time_entries to an empty Hash' do 
-    timesheet = Timesheet.new
-    timesheet.time_entries.should be_a_kind_of(Hash)
-    timesheet.time_entries.should be_empty
-  end
-
-  it 'should initialize projects to an empty Array' do 
-    timesheet = Timesheet.new
-    timesheet.projects.should be_a_kind_of(Array)
-    timesheet.projects.should be_empty
-  end
-
-  it 'should initialize allowed_projects to an empty Array' do 
-    timesheet = Timesheet.new
-    timesheet.allowed_projects.should be_a_kind_of(Array)
-    timesheet.allowed_projects.should be_empty
-  end
-
-  it 'should initialize activities to an Array' do 
-    timesheet = Timesheet.new
-    timesheet.activities.should be_a_kind_of(Array)
-  end
-
-  it 'should initialize users to an Array' do 
-    timesheet = Timesheet.new
-    timesheet.users.should be_a_kind_of(Array)
-  end
-
-  it 'should initialize sort to :project' do 
-    timesheet = Timesheet.new
-    timesheet.sort.should eql(:project)
-  end
-
-  it 'should initialize time_entries to the passed in options' do 
-    data = { :test => true }
-    timesheet = Timesheet.new({ :time_entries => data })
-    timesheet.time_entries.should_not be_empty
-    timesheet.time_entries.should eql(data)
-  end
-
-  it 'should initialize allowed_projects to the passed in options' do 
-    data = ['project1', 'project2']
-    timesheet = Timesheet.new({ :allowed_projects => data })
-    timesheet.allowed_projects.should_not be_empty
-    timesheet.allowed_projects.should eql(data)
-  end
-
-  it 'should initialize activities to the integers of the passed in options' do 
-    act1 = mock('act1')
-    act1.stub!(:to_i).and_return(200)
-    act2 = mock('act2')
-    act2.stub!(:to_i).and_return(300)
-    data = [act1, act2]
-    timesheet = Timesheet.new({ :activities => data })
-    timesheet.activities.should_not be_empty
-    timesheet.activities.should eql([200, 300])
-  end
-
-  it 'should initialize users to the ids of the passed in options' do 
-    user1 = mock('user1')
-    user1.stub!(:to_i).and_return(100)
-    user2 = mock('user2')
-    user2.stub!(:to_i).and_return(101)
-    data = [user1, user2]
-    timesheet = Timesheet.new({ :users => data })
-    timesheet.users.should_not be_empty
-    timesheet.users.should eql([100, 101])
-  end
-
-  it 'should initialize sort to the :user option when passed :user' do 
-    timesheet = Timesheet.new({ :sort => :user })
-    timesheet.sort.should eql(:user)
-  end
-
-  it 'should initialize sort to the :project option when passed :project' do 
-    timesheet = Timesheet.new({ :sort => :project })
-    timesheet.sort.should eql(:project)
-  end
-
-  it 'should initialize sort to the :issue option when passed :issue' do 
-    timesheet = Timesheet.new({ :sort => :issue })
-    timesheet.sort.should eql(:issue)
-  end
-
-  it 'should initialize sort to the :project option when passed an invalid sort' do 
-    timesheet = Timesheet.new({ :sort => :invalid })
-    timesheet.sort.should eql(:project)
-  end
-end
-
-describe Timesheet,'.fetch_time_entries' do
-  include TimesheetSpecHelper
-  
-  it 'should clear .time_entries' do
-    timesheet = Timesheet.new
-    timesheet.time_entries = { :filled => 'data' }
-    proc { 
-      timesheet.fetch_time_entries
-    }.should change(timesheet, :time_entries)
-    
-  end
-
-  it 'should add a time_entry Hash for each project' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project2 = project_factory(2)
-
-    stub_admin_user
-    timesheet.projects = [project1, project2]
-
-    timesheet.fetch_time_entries
-    timesheet.time_entries.should_not be_empty
-    timesheet.time_entries.should have(2).things
-  end
-  
-  it 'should use the project name for each time_entry key' do 
-    
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.should_receive(:name).and_return('Project 1')
-    project2 = project_factory(2)
-    project2.should_receive(:name).and_return('Project 2')
-
-    stub_admin_user
-    timesheet.projects = [project1, project2]
-    
-    timesheet.fetch_time_entries
-    timesheet.time_entries.keys.should include("Project 1")
-    timesheet.time_entries.keys.should include("Project 2")
-  end
-
-  it 'should add the parent project name for each time_entry array for sub-projects' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.should_receive(:name).twice.and_return('Project 1')
-    project2 = project_factory(2, :parent => project1 )
-    project2.should_receive(:name).and_return('Project 2')
-
-    stub_admin_user
-    timesheet.projects = [project1, project2]
-    
-    timesheet.fetch_time_entries
-    timesheet.time_entries.keys.should include("Project 1")
-    timesheet.time_entries.keys.should include("Project 1 / Project 2")
-  end
-
-  it 'should fetch all the time entries on a project in the date range'
-  it 'should fetch all the time entries on a project matching the activities'
-  it 'should fetch all the time entries on a project matching the users'
-end
-
-describe Timesheet,'.fetch_time_entries with user sorting' do
-  include TimesheetSpecHelper
-  
-  it 'should clear .time_entries' do
-    timesheet = Timesheet.new({ :sort => :user })
-    timesheet.time_entries = { :filled => 'data' }
-    proc { 
-      timesheet.fetch_time_entries
-    }.should change(timesheet, :time_entries)
-    
-  end
-
-  it 'should add a time_entry array for each user' do
-    stub_admin_user
-    timesheet = timesheet_factory(:sort => :user, :users => [User.current.id])
-
-    time_entries = [
-                    time_entry_factory(1, { :user => User.current }),
-                    time_entry_factory(2, { :user => User.current }),
-                    time_entry_factory(3, { :user => User.current }),
-                    time_entry_factory(4, { :user => User.current }),
-                    time_entry_factory(5, { :user => User.current })
-                   ]
-    
-    TimeEntry.stub!(:find).and_return(time_entries)
-    User.stub!(:find_by_id).and_return(User.current)
-
-    timesheet.fetch_time_entries
-    timesheet.time_entries.should_not be_empty
-    timesheet.time_entries.should have(1).thing # One user
-  end
-  
-  it 'should use the user name for each time_entry array' do 
-    stub_admin_user
-    timesheet = timesheet_factory(:sort => :user, :users => [User.current.id])
-
-    time_entries = [
-                    time_entry_factory(1, { :user => User.current }),
-                    time_entry_factory(2, { :user => User.current }),
-                    time_entry_factory(3, { :user => User.current }),
-                    time_entry_factory(4, { :user => User.current }),
-                    time_entry_factory(5, { :user => User.current })
-                   ]
-
-    TimeEntry.stub!(:find).and_return(time_entries)
-    User.stub!(:find_by_id).and_return(User.current)
-    
-    timesheet.fetch_time_entries
-    timesheet.time_entries.keys.should include("Administrator Bob")
-  end
-end
-
-describe Timesheet,'.fetch_time_entries with issue sorting' do
-  include TimesheetSpecHelper
-
-  it 'should clear .time_entries' do
-    timesheet = Timesheet.new({ :sort => :issue })
-    timesheet.time_entries = { :filled => 'data' }
-    proc { 
-      timesheet.fetch_time_entries
-    }.should change(timesheet, :time_entries)
-    
-  end
-
-  it 'should add a time_entry array for each project' do
-    stub_admin_user
-    project1 = project_factory(1)
-    timesheet = timesheet_factory(:sort => :issue, :users => [User.current.id])
-    timesheet.projects = [project1]
-
-    @issue1 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    @issue2 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    @issue3 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    
-    time_entry1 = time_entry_factory(1, { :user => User.current, :issue => @issue1 })
-    time_entry2 = time_entry_factory(2, { :user => User.current, :issue => @issue1 })
-    time_entry3 = time_entry_factory(3, { :user => User.current, :issue => @issue2 })
-    time_entry4 = time_entry_factory(4, { :user => User.current, :issue => @issue2 })
-    time_entry5 = time_entry_factory(5, { :user => User.current, :issue => @issue3 })
-
-    project1.should_receive(:issues).and_return([@issue1, @issue2, @issue3])
-    
-    time_entries = [
-                    time_entry1,
-                    time_entry2,
-                    time_entry3,
-                    time_entry4,
-                    time_entry5
-                   ]
-    
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue1).and_return([time_entry1, time_entry2])
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue2).and_return([time_entry3, time_entry4])
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue3).and_return([time_entry5])
-    
-    timesheet.fetch_time_entries
-    timesheet.time_entries.should_not be_empty
-    timesheet.time_entries.should have(1).thing
-  end
-  
-  it 'should use the project for each time_entry array' do 
-    stub_admin_user
-    project1 = project_factory(1)
-    timesheet = timesheet_factory(:sort => :issue, :users => [User.current.id])
-    timesheet.projects = [project1]
-
-    @issue1 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    @issue2 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    @issue3 = mock_model(Issue, :id => 1, :to_param => '1', :project => project1)
-    
-    time_entry1 = time_entry_factory(1, { :user => User.current, :issue => @issue1 })
-    time_entry2 = time_entry_factory(2, { :user => User.current, :issue => @issue1 })
-    time_entry3 = time_entry_factory(3, { :user => User.current, :issue => @issue2 })
-    time_entry4 = time_entry_factory(4, { :user => User.current, :issue => @issue2 })
-    time_entry5 = time_entry_factory(5, { :user => User.current, :issue => @issue3 })
-
-    project1.should_receive(:issues).and_return([@issue1, @issue2, @issue3])
-    
-    time_entries = [
-                    time_entry1,
-                    time_entry2,
-                    time_entry3,
-                    time_entry4,
-                    time_entry5
-                   ]
-    
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue1).and_return([time_entry1, time_entry2])
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue2).and_return([time_entry3, time_entry4])
-    timesheet.should_receive(:issue_time_entries_for_all_users).with(@issue3).and_return([time_entry5])
-    
-    timesheet.fetch_time_entries
-    timesheet.time_entries.keys.should include(project1)
-  end
-end
-
-describe Timesheet,'.fetch_time_entries as an administrator' do
-  include TimesheetSpecHelper
-
-  it 'should collect time entries for all users on each project' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.stub!(:name).and_return('Project 1')
-    project2 = project_factory(2)
-    project2.stub!(:name).and_return('Project 2')
-
-    stub_admin_user
-    timesheet.projects = [project1, project2] 
-
-    timesheet.should_receive(:time_entries_for_all_users).with(project1).and_return([ ])
-    timesheet.should_receive(:time_entries_for_all_users).with(project2).and_return([ ])
-    timesheet.fetch_time_entries
-  end
-end
-
-describe Timesheet,'.fetch_time_entries as a user with see_project_timesheet permission on a project' do
-  include TimesheetSpecHelper
-
-  it 'should collect time entries for all users' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.stub!(:name).and_return('Project 1')
-    project2 = project_factory(2)
-    project2.stub!(:name).and_return('Project 2')
-    project3 = project_factory(3)
-    project3.stub!(:name).and_return('Project 3')
-
-    stub_manager_user([project1, project2])
-    # Make user a 'non-manager' on project3 
-    @current_user.stub!(:allowed_to?).with(:view_time_entries, project3).and_return(true)
-    @current_user.stub!(:allowed_to?).with(:see_project_timesheets, project3).and_return(false)
-    User.stub!(:current).and_return(@current_user)
-
-    timesheet.projects = [project1, project2, project3]
-
-    timesheet.should_receive(:time_entries_for_all_users).with(project1).and_return([ ])
-    timesheet.should_receive(:time_entries_for_all_users).with(project2).and_return([ ])
-    timesheet.should_receive(:time_entries_for_current_user).with(project3).and_return([ ])
-    timesheet.fetch_time_entries
-  end
-end
-
-describe Timesheet,'.fetch_time_entries as a user with view_time_entries permission on a project' do
-  include TimesheetSpecHelper
-
-  it 'should collect time entries for only themself' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.stub!(:name).and_return('Project 1')
-    project2 = project_factory(2)
-    project2.stub!(:name).and_return('Project 2')
-
-    stub_normal_user([project1, project2])
-    timesheet.projects = [project1, project2]
-
-    timesheet.should_receive(:time_entries_for_current_user).with(project1).and_return([ ])
-    timesheet.should_receive(:time_entries_for_current_user).with(project2).and_return([ ])
-    timesheet.fetch_time_entries
-  end
-end
-
-describe Timesheet,'.fetch_time_entries as a non-member of a project' do
-  include TimesheetSpecHelper
-
-  it 'should get no time entries' do
-    timesheet = timesheet_factory
-
-    project1 = project_factory(1)
-    project1.stub!(:name).and_return('Project 1')
-    project2 = project_factory(2)
-    project2.stub!(:name).and_return('Project 2')
-
-    stub_non_member_user([project1, project2])
-    timesheet.projects = [project1, project2]
-
-    timesheet.should_not_receive(:time_entries_for_current_user).with(project1).and_return([ ])
-    timesheet.should_not_receive(:time_entries_for_current_user).with(project2).and_return([ ])
-    timesheet.fetch_time_entries
-  end
-end
-
-describe Timesheet, '#period=' do
-  include TimesheetSpecHelper
-  describe 'should set the date_to and date_from for' do
-    before(:each) do
-      @date = Date.new(2009,2,4)
-      Date.stub!(:today).and_return(@date)
-      @timesheet = Timesheet.new(:period_type => Timesheet::ValidPeriodType[:default])
-    end
-    
-    it 'today' do
-      @timesheet.should_receive(:date_from=).with(@date)
-      @timesheet.should_receive(:date_to=).with(@date)
-      @timesheet.period = 'today'
-    end
-    
-    it 'yesterday' do
-      @timesheet.should_receive(:date_from=).with(@date.yesterday)
-      @timesheet.should_receive(:date_to=).with(@date.yesterday)
-      @timesheet.period = 'yesterday'
-    end
-    
-    it 'current_week' do
-      @timesheet.should_receive(:date_from=).with(Date.new(2009, 2, 2))
-      @timesheet.should_receive(:date_from).and_return(Date.new(2009, 2, 2))
-      @timesheet.should_receive(:date_to=).with(Date.new(2009, 2, 8))
-      @timesheet.period = 'current_week'
-    end
-    
-    it 'last_week' do
-      @timesheet.should_receive(:date_from=).with(Date.new(2009, 1, 26))
-      @timesheet.should_receive(:date_from).and_return(Date.new(2009, 1, 26))
-      @timesheet.should_receive(:date_to=).with(Date.new(2009, 2, 1))
-      @timesheet.period = 'last_week'
-    end
-    
-    it '7_days' do
-      @timesheet.should_receive(:date_from=).with(@date - 7)
-      @timesheet.should_receive(:date_to=).with(@date)
-      @timesheet.period = '7_days'
-    end
-    
-    it 'current_month' do
-      @timesheet.should_receive(:date_from=).with(Date.new(2009, 2, 1))
-      @timesheet.should_receive(:date_from).and_return(Date.new(2009, 2, 1))
-      @timesheet.should_receive(:date_to=).with(Date.new(2009, 2, 28))
-      @timesheet.period = 'current_month'
-    end
-    
-    it 'last_month' do
-      @timesheet.should_receive(:date_from=).with(Date.new(2009, 1, 1))
-      @timesheet.should_receive(:date_from).and_return(Date.new(2009, 1, 1))
-      @timesheet.should_receive(:date_to=).with(Date.new(2009, 1, 31))
-      @timesheet.period = 'last_month'
-    end
-    
-    it '30_days' do
-      @timesheet.should_receive(:date_from=).with(@date - 30)
-      @timesheet.should_receive(:date_to=).with(@date)
-      @timesheet.period = '30_days'
-    end
-    
-    it 'current_year' do
-      @timesheet.should_receive(:date_from=).with(Date.new(2009,1,1))
-      @timesheet.should_receive(:date_to=).with(Date.new(2009,12,31))
-      @timesheet.period = 'current_year'
-    end
-    
-    it 'all' do
-      @timesheet.should_receive(:date_from=).with(nil)
-      @timesheet.should_receive(:date_to=).with(nil)
-      @timesheet.period = 'all'
-    end
-  end
-end