diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-07 08:36:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-07 08:36:49 +0000 |
| commit | 171581da7e5301470d72efc91e713c375290d7b8 (patch) | |
| tree | 7c3bc882c7937e2e896930a4b05beb7a5d6ab096 /test/unit/project_test.rb | |
| parent | 8b58c952128860600636ebfb3fa4ebc779dd0bd8 (diff) | |
| download | redmine-171581da7e5301470d72efc91e713c375290d7b8.tar.gz redmine-171581da7e5301470d72efc91e713c375290d7b8.zip | |
Project.activities should always return a ActiveRecord::Relation (#15983).
git-svn-id: http://svn.redmine.org/redmine/trunk@12854 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/unit/project_test.rb')
| -rw-r--r-- | test/unit/project_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 7a2817d17..0dc3a54f1 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -730,6 +730,7 @@ class ProjectTest < ActiveSupport::TestCase def test_activities_should_use_the_system_activities project = Project.find(1) assert_equal project.activities, TimeEntryActivity.where(:active => true).all + assert_kind_of ActiveRecord::Relation, project.activities end @@ -739,6 +740,7 @@ class ProjectTest < ActiveSupport::TestCase assert overridden_activity.save! assert project.activities.include?(overridden_activity), "Project specific Activity not found" + assert_kind_of ActiveRecord::Relation, project.activities end def test_activities_should_not_include_the_inactive_project_specific_activities |