##// END OF EJS Templates
Merged r9050 from trunk....
Jean-Philippe Lang -
r9001:fc584eb3ada1
parent child
Show More
@@ -147,7 +147,6 class IssuesControllerTest < ActionController::TestCase
147 end
147 end
148
148
149 def test_index_with_short_filters
149 def test_index_with_short_filters
150
151 to_test = {
150 to_test = {
152 'status_id' => {
151 'status_id' => {
153 'o' => { :op => 'o', :values => [''] },
152 'o' => { :op => 'o', :values => [''] },
@@ -181,9 +180,9 class IssuesControllerTest < ActionController::TestCase
181 't-2' => { :op => 't-', :values => ['2'] }},
180 't-2' => { :op => 't-', :values => ['2'] }},
182 'created_on' => {
181 'created_on' => {
183 '>=2011-10-12' => { :op => '>=', :values => ['2011-10-12'] },
182 '>=2011-10-12' => { :op => '>=', :values => ['2011-10-12'] },
184 '<t+2' => { :op => '=', :values => ['<t+2'] },
183 '<t-2' => { :op => '<t-', :values => ['2'] },
185 '>t+2' => { :op => '=', :values => ['>t+2'] },
184 '>t-2' => { :op => '>t-', :values => ['2'] },
186 't+2' => { :op => 't', :values => ['+2'] }},
185 't-2' => { :op => 't-', :values => ['2'] }},
187 'cf_1' => {
186 'cf_1' => {
188 'c' => { :op => '=', :values => ['c'] },
187 'c' => { :op => '=', :values => ['c'] },
189 '!c' => { :op => '!', :values => ['c'] },
188 '!c' => { :op => '!', :values => ['c'] },
@@ -215,7 +214,6 class IssuesControllerTest < ActionController::TestCase
215 assert_equal(default_filter.merge({field => {:operator => expected[:op], :values => expected[:values]}}), query.filters)
214 assert_equal(default_filter.merge({field => {:operator => expected[:op], :values => expected[:values]}}), query.filters)
216 end
215 end
217 end
216 end
218
219 end
217 end
220
218
221 def test_index_with_project_and_empty_filters
219 def test_index_with_project_and_empty_filters
General Comments 0
You need to be logged in to leave comments. Login now