mirror of
https://github.com/redmine/redmine.git
synced 2025-11-11 15:56:03 +01:00
fix source indent of IssuesCustomFieldsVisibilityTest
git-svn-id: http://svn.redmine.org/redmine/trunk@20297 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -70,9 +70,7 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
def test_show_should_show_visible_custom_fields_only
|
def test_show_should_show_visible_custom_fields_only
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :show, :params => {
|
get(:show, :params => {:id => @issue.id})
|
||||||
:id => @issue.id
|
|
||||||
}
|
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
assert_select '.value', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name}"
|
assert_select '.value', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name}"
|
||||||
@@ -86,12 +84,15 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
def test_show_should_show_visible_custom_fields_only_in_api
|
def test_show_should_show_visible_custom_fields_only_in_api
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
with_settings :rest_api_enabled => '1' do
|
with_settings :rest_api_enabled => '1' do
|
||||||
get :show, :params => {
|
get(
|
||||||
|
:show,
|
||||||
|
:params => {
|
||||||
:id => @issue.id,
|
:id => @issue.id,
|
||||||
:format => 'xml',
|
:format => 'xml',
|
||||||
:include => 'custom_fields',
|
:include => 'custom_fields',
|
||||||
:key => user.api_key
|
:key => user.api_key
|
||||||
}
|
}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
@@ -110,9 +111,7 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
|
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :show, :params => {
|
get(:show, :params => {:id => @issue.id})
|
||||||
:id => @issue.id
|
|
||||||
}
|
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
assert_select 'ul.details i', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name} change"
|
assert_select 'ul.details i', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name} change"
|
||||||
@@ -130,12 +129,15 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
|
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
with_settings :rest_api_enabled => '1' do
|
with_settings :rest_api_enabled => '1' do
|
||||||
get :show, :params => {
|
get(
|
||||||
|
:show,
|
||||||
|
:params => {
|
||||||
:id => @issue.id,
|
:id => @issue.id,
|
||||||
:format => 'xml',
|
:format => 'xml',
|
||||||
:include => 'journals',
|
:include => 'journals',
|
||||||
:key => user.api_key
|
:key => user.api_key
|
||||||
}
|
}
|
||||||
|
)
|
||||||
end
|
end
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
@@ -152,9 +154,7 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
|
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :edit, :params => {
|
get(:edit, :params => {:id => @issue.id})
|
||||||
:id => @issue.id
|
|
||||||
}
|
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
assert_select 'input[value=?]', "Value#{i}", 1, "User #{user.id} was not able to edit #{field.name}"
|
assert_select 'input[value=?]', "Value#{i}", 1, "User #{user.id} was not able to edit #{field.name}"
|
||||||
@@ -170,16 +170,19 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
|
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
put :update, :params => {
|
put(
|
||||||
|
:update,
|
||||||
|
:params => {
|
||||||
:id => @issue.id,
|
:id => @issue.id,
|
||||||
:issue => {
|
:issue => {
|
||||||
:custom_field_values => {
|
:custom_field_values => {
|
||||||
@field1.id.to_s => "User#{user.id}Value0",
|
@field1.id.to_s => "User#{user.id}Value0",
|
||||||
@field2.id.to_s => "User#{user.id}Value1",
|
@field2.id.to_s => "User#{user.id}Value1",
|
||||||
@field3.id.to_s => "User#{user.id}Value2",
|
@field3.id.to_s => "User#{user.id}Value2",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
)
|
||||||
@issue.reload
|
@issue.reload
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
@@ -194,9 +197,12 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
def test_index_should_show_visible_custom_fields_only
|
def test_index_should_show_visible_custom_fields_only
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :index, :params => {
|
get(
|
||||||
:c => (["subject"] + @fields.map{|f| "cf_#{f.id}"})
|
:index,
|
||||||
|
:params => {
|
||||||
|
:c => (["subject"] + @fields.map{|f| "cf_#{f.id}"})
|
||||||
}
|
}
|
||||||
|
)
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
assert_select 'td', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name}"
|
assert_select 'td', {:text => "Value#{i}", :count => 1}, "User #{user.id} was not able to view #{field.name}"
|
||||||
@@ -210,10 +216,13 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
def test_index_as_csv_should_show_visible_custom_fields_only
|
def test_index_as_csv_should_show_visible_custom_fields_only
|
||||||
@users_to_test.each do |user, fields|
|
@users_to_test.each do |user, fields|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :index, :params => {
|
get(
|
||||||
:c => (["subject"] + @fields.map{|f| "cf_#{f.id}"}),
|
:index,
|
||||||
:format => 'csv'
|
:params => {
|
||||||
|
:c => (["subject"] + @fields.map{|f| "cf_#{f.id}"}),
|
||||||
|
:format => 'csv'
|
||||||
}
|
}
|
||||||
|
)
|
||||||
@fields.each_with_index do |field, i|
|
@fields.each_with_index do |field, i|
|
||||||
if fields.include?(field)
|
if fields.include?(field)
|
||||||
assert_include "Value#{i}", response.body, "User #{user.id} was not able to view #{field.name} in CSV"
|
assert_include "Value#{i}", response.body, "User #{user.id} was not able to view #{field.name} in CSV"
|
||||||
@@ -238,29 +247,31 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'})
|
Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'})
|
||||||
|
|
||||||
@request.session[:user_id] = user.id
|
@request.session[:user_id] = user.id
|
||||||
get :index, :params => {
|
get(
|
||||||
:c => ["subject", "cf_#{@field2.id}"]
|
:index,
|
||||||
|
:params => {
|
||||||
|
:c => ["subject", "cf_#{@field2.id}"]
|
||||||
}
|
}
|
||||||
|
)
|
||||||
assert_select 'td', :text => 'ValueA'
|
assert_select 'td', :text => 'ValueA'
|
||||||
assert_select 'td', :text => 'ValueB', :count => 0
|
assert_select 'td', :text => 'ValueB', :count => 0
|
||||||
assert_select 'td', :text => 'ValueC'
|
assert_select 'td', :text => 'ValueC'
|
||||||
|
|
||||||
get :index, :params => {
|
get(:index, :params => {:sort => "cf_#{@field2.id}"})
|
||||||
:sort => "cf_#{@field2.id}"
|
|
||||||
}
|
|
||||||
# ValueB is not visible to user and ignored while sorting
|
# ValueB is not visible to user and ignored while sorting
|
||||||
assert_equal %w(ValueB ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
assert_equal %w(ValueB ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
||||||
|
|
||||||
get :index, :params => {
|
get(
|
||||||
:set_filter => '1', "cf_#{@field2.id}" => '*',
|
:index,
|
||||||
:sort => "cf_#{@field2.id}"
|
:params => {
|
||||||
|
:set_filter => '1', "cf_#{@field2.id}" => '*',
|
||||||
|
:sort => "cf_#{@field2.id}"
|
||||||
}
|
}
|
||||||
|
)
|
||||||
assert_equal %w(ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
assert_equal %w(ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
||||||
|
|
||||||
CustomField.update_all(:field_format => 'list')
|
CustomField.update_all(:field_format => 'list')
|
||||||
get :index, :params => {
|
get(:index, :params => {:group => "cf_#{@field2.id}"})
|
||||||
:group => "cf_#{@field2.id}"
|
|
||||||
}
|
|
||||||
assert_equal %w(ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
assert_equal %w(ValueA ValueC), issues_in_list.map{|i| i.custom_field_value(@field2)}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -272,7 +283,9 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
@request.session[:user_id] = 1
|
@request.session[:user_id] = 1
|
||||||
with_settings :bcc_recipients => '1' do
|
with_settings :bcc_recipients => '1' do
|
||||||
assert_difference 'Issue.count' do
|
assert_difference 'Issue.count' do
|
||||||
post :create, :params => {
|
post(
|
||||||
|
:create,
|
||||||
|
:params => {
|
||||||
:project_id => 1,
|
:project_id => 1,
|
||||||
:issue => {
|
:issue => {
|
||||||
:tracker_id => 1,
|
:tracker_id => 1,
|
||||||
@@ -280,12 +293,14 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
:subject => 'New issue',
|
:subject => 'New issue',
|
||||||
:priority_id => 5,
|
:priority_id => 5,
|
||||||
:custom_field_values => {
|
:custom_field_values => {
|
||||||
@field1.id.to_s => 'Value0', @field2.id.to_s => 'Value1', @field3.id.to_s => 'Value2'
|
@field1.id.to_s => 'Value0',
|
||||||
|
@field2.id.to_s => 'Value1',
|
||||||
|
@field3.id.to_s => 'Value2'
|
||||||
},
|
},
|
||||||
:watcher_user_ids => users_to_test.keys.map(&:id)
|
:watcher_user_ids => users_to_test.keys.map(&:id)
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
)
|
||||||
assert_response 302
|
assert_response 302
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -316,15 +331,19 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
ActionMailer::Base.deliveries.clear
|
ActionMailer::Base.deliveries.clear
|
||||||
@request.session[:user_id] = 1
|
@request.session[:user_id] = 1
|
||||||
with_settings :bcc_recipients => '1' do
|
with_settings :bcc_recipients => '1' do
|
||||||
put :update, :params => {
|
put(
|
||||||
|
:update,
|
||||||
|
:params => {
|
||||||
:id => @issue.id,
|
:id => @issue.id,
|
||||||
:issue => {
|
:issue => {
|
||||||
:custom_field_values => {
|
:custom_field_values => {
|
||||||
@field1.id.to_s => 'NewValue0', @field2.id.to_s => 'NewValue1', @field3.id.to_s => 'NewValue2'
|
@field1.id.to_s => 'NewValue0',
|
||||||
|
@field2.id.to_s => 'NewValue1',
|
||||||
|
@field3.id.to_s => 'NewValue2'
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
)
|
||||||
assert_response 302
|
assert_response 302
|
||||||
end
|
end
|
||||||
assert_equal users_to_test.keys.size, ActionMailer::Base.deliveries.size
|
assert_equal users_to_test.keys.size, ActionMailer::Base.deliveries.size
|
||||||
@@ -353,15 +372,17 @@ class IssuesCustomFieldsVisibilityTest < Redmine::ControllerTest
|
|||||||
ActionMailer::Base.deliveries.clear
|
ActionMailer::Base.deliveries.clear
|
||||||
@request.session[:user_id] = 1
|
@request.session[:user_id] = 1
|
||||||
with_settings :bcc_recipients => '1' do
|
with_settings :bcc_recipients => '1' do
|
||||||
put :update, :params => {
|
put(
|
||||||
|
:update,
|
||||||
|
:params => {
|
||||||
:id => @issue.id,
|
:id => @issue.id,
|
||||||
:issue => {
|
:issue => {
|
||||||
:custom_field_values => {
|
:custom_field_values => {
|
||||||
@field2.id.to_s => 'NewValue1', @field3.id.to_s => 'NewValue2'
|
@field2.id.to_s => 'NewValue1', @field3.id.to_s => 'NewValue2'
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
)
|
||||||
assert_response 302
|
assert_response 302
|
||||||
end
|
end
|
||||||
users_to_test.each do |user, fields|
|
users_to_test.each do |user, fields|
|
||||||
|
|||||||
Reference in New Issue
Block a user