diff test/functional/issues_controller_test.rb @ 929:5f33065ddc4b redmine-1.3

Update to Redmine SVN rev 9414 on 1.3-stable branch
author Chris Cannam
date Wed, 27 Jun 2012 14:54:18 +0100
parents cbb26bc654de
children 433d4f72a19b
line wrap: on
line diff
--- a/test/functional/issues_controller_test.rb	Fri Feb 24 19:09:32 2012 +0000
+++ b/test/functional/issues_controller_test.rb	Wed Jun 27 14:54:18 2012 +0100
@@ -147,7 +147,6 @@
   end
 
   def test_index_with_short_filters
-
     to_test = {
       'status_id' => {
         'o' => { :op => 'o', :values => [''] },
@@ -181,9 +180,9 @@
         't-2' => { :op => 't-', :values => ['2'] }},
       'created_on' => {
         '>=2011-10-12' => { :op => '>=', :values => ['2011-10-12'] },
-        '<t+2' => { :op => '=', :values => ['<t+2'] },
-        '>t+2' => { :op => '=', :values => ['>t+2'] },
-        't+2' => { :op => 't', :values => ['+2'] }},
+        '<t-2' => { :op => '<t-', :values => ['2'] },
+        '>t-2' => { :op => '>t-', :values => ['2'] },
+        't-2' => { :op => 't-', :values => ['2'] }},
       'cf_1' => {
         'c' => { :op => '=', :values => ['c'] },
         '!c' => { :op => '!', :values => ['c'] },
@@ -215,7 +214,6 @@
         assert_equal(default_filter.merge({field => {:operator => expected[:op], :values => expected[:values]}}), query.filters)
       end
     end
-
   end
 
   def test_index_with_project_and_empty_filters
@@ -933,7 +931,7 @@
   def test_post_new_with_group_assignment
     group = Group.find(11)
     project = Project.find(1)
-    project.members << Member.new(:principal => group, :roles => [Role.first])
+    project.members << Member.new(:principal => group, :roles => [Role.givable.first])
 
     with_settings :issue_group_assignment => '1' do
       @request.session[:user_id] = 2
@@ -1803,7 +1801,7 @@
   def test_bulk_update_with_group_assignee
     group = Group.find(11)
     project = Project.find(1)
-    project.members << Member.new(:principal => group, :roles => [Role.first])
+    project.members << Member.new(:principal => group, :roles => [Role.givable.first])
 
     @request.session[:user_id] = 2
     # update issues assignee