| @@ -31,7 +31,13 class Group < Principal | |||
|
|
31 | 31 | lastname.to_s |
|
|
32 | 32 | end |
|
|
33 | 33 | |
|
|
34 | alias :name :to_s | |
|
|
34 | def name | |
|
|
35 | lastname | |
|
|
36 | end | |
|
|
37 | ||
|
|
38 | def name=(arg) | |
|
|
39 | self.lastname = arg | |
|
|
40 | end | |
|
|
35 | 41 | |
|
|
36 | 42 | def user_added(user) |
|
|
37 | 43 | members.each do |member| |
| @@ -1,7 +1,7 | |||
|
|
1 | 1 | <%= error_messages_for @group %> |
|
|
2 | 2 | |
|
|
3 | 3 | <div class="box tabular"> |
|
|
4 |
<p><%= f.text_field : |
|
|
|
4 | <p><%= f.text_field :name %></p> | |
|
|
5 | 5 | <% @group.custom_field_values.each do |value| %> |
|
|
6 | 6 | <p><%= custom_field_tag_with_label :group, value %></p> |
|
|
7 | 7 | <% end %> |
| @@ -40,11 +40,12 class GroupsControllerTest < ActionController::TestCase | |||
|
|
40 | 40 | get :new |
|
|
41 | 41 | assert_response :success |
|
|
42 | 42 | assert_template 'new' |
|
|
43 | assert_select 'input[name=?]', 'group[name]' | |
|
|
43 | 44 | end |
|
|
44 | 45 | |
|
|
45 | 46 | def test_create |
|
|
46 | 47 | assert_difference 'Group.count' do |
|
|
47 |
post :create, :group => {: |
|
|
|
48 | post :create, :group => {:name => 'New group'} | |
|
|
48 | 49 | end |
|
|
49 | 50 | assert_redirected_to '/groups' |
|
|
50 | 51 | group = Group.first(:order => 'id DESC') |
| @@ -54,7 +55,7 class GroupsControllerTest < ActionController::TestCase | |||
|
|
54 | 55 | |
|
|
55 | 56 | def test_create_and_continue |
|
|
56 | 57 | assert_difference 'Group.count' do |
|
|
57 |
post :create, :group => {: |
|
|
|
58 | post :create, :group => {:name => 'New group'}, :continue => 'Create and continue' | |
|
|
58 | 59 | end |
|
|
59 | 60 | assert_redirected_to '/groups/new' |
|
|
60 | 61 | group = Group.first(:order => 'id DESC') |
| @@ -63,7 +64,7 class GroupsControllerTest < ActionController::TestCase | |||
|
|
63 | 64 | |
|
|
64 | 65 | def test_create_with_failure |
|
|
65 | 66 | assert_no_difference 'Group.count' do |
|
|
66 |
post :create, :group => {: |
|
|
|
67 | post :create, :group => {:name => ''} | |
|
|
67 | 68 | end |
|
|
68 | 69 | assert_response :success |
|
|
69 | 70 | assert_template 'new' |
| @@ -79,14 +80,14 class GroupsControllerTest < ActionController::TestCase | |||
|
|
79 | 80 | |
|
|
80 | 81 | def test_update |
|
|
81 | 82 | new_name = 'New name' |
|
|
82 |
put :update, :id => 10, :group => {: |
|
|
|
83 | put :update, :id => 10, :group => {:name => new_name} | |
|
|
83 | 84 | assert_redirected_to '/groups' |
|
|
84 | 85 | group = Group.find(10) |
|
|
85 | 86 | assert_equal new_name, group.name |
|
|
86 | 87 | end |
|
|
87 | 88 | |
|
|
88 | 89 | def test_update_with_failure |
|
|
89 |
put :update, :id => 10, :group => {: |
|
|
|
90 | put :update, :id => 10, :group => {:name => ''} | |
|
|
90 | 91 | assert_response :success |
|
|
91 | 92 | assert_template 'edit' |
|
|
92 | 93 | end |
| @@ -21,7 +21,7 module ObjectHelpers | |||
|
|
21 | 21 | @generated_group_name ||= 'Group 0' |
|
|
22 | 22 | @generated_group_name.succ! |
|
|
23 | 23 | group = Group.new(attributes) |
|
|
24 |
group. |
|
|
|
24 | group.name = @generated_group_name if group.name.blank? | |
|
|
25 | 25 | yield group if block_given? |
|
|
26 | 26 | group.save! |
|
|
27 | 27 | group |
| @@ -31,8 +31,10 class GroupTest < ActiveSupport::TestCase | |||
|
|
31 | 31 | include Redmine::I18n |
|
|
32 | 32 | |
|
|
33 | 33 | def test_create |
|
|
34 |
g = Group.new(: |
|
|
|
34 | g = Group.new(:name => 'New group') | |
|
|
35 | 35 | assert g.save |
|
|
36 | g.reload | |
|
|
37 | assert_equal 'New group', g.name | |
|
|
36 | 38 | end |
|
|
37 | 39 | |
|
|
38 | 40 | def test_blank_name_error_message |
General Comments 0
You need to be logged in to leave comments.
Login now