diff options
author | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-08-01 18:21:24 +0300 |
commit | 83a0db0c551236518bdec1a7ae3a1ed1d05f5aaa (patch) | |
tree | e13ad022ea223e7bde5202a31ee81169225fec99 /spec/controllers | |
parent | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (diff) | |
parent | 12095251c3777c5231cab97854d5dca69d31cc5d (diff) |
Merge branch 'bvl-user-status-message-35463' into 'master'
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/profiles_controller_spec.rb | 9 | ||||
-rw-r--r-- | spec/controllers/projects/issues_controller_spec.rb | 23 |
2 files changed, 32 insertions, 0 deletions
diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb index 4530a301d4d..360c536c667 100644 --- a/spec/controllers/profiles_controller_spec.rb +++ b/spec/controllers/profiles_controller_spec.rb @@ -78,6 +78,15 @@ describe ProfilesController, :request_store do expect(ldap_user.name).not_to eq('John') expect(ldap_user.location).to eq('City, Country') end + + it 'allows setting a user status' do + sign_in(user) + + put :update, user: { status: { message: 'Working hard!' } } + + expect(user.reload.status.message).to eq('Working hard!') + expect(response).to have_gitlab_http_status(302) + end end describe 'PUT update_username' do diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index ff1835a34c2..5b347b1109a 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -993,6 +993,29 @@ describe Projects::IssuesController do expect(json_response.first.keys).to match_array(%w[id reply_id expanded notes diff_discussion discussion_path individual_note resolvable resolved resolved_at resolved_by resolved_by_push commit_id for_commit project_id]) end + it 'renders the author status html if there is a status' do + create(:user_status, user: discussion.author) + + get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + + note_json = json_response.first['notes'].first + + expect(note_json['author']['status_tooltip_html']).to be_present + end + + it 'does not cause an extra query for the status' do + control = ActiveRecord::QueryRecorder.new do + get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid + end + + create(:user_status, user: discussion.author) + second_discussion = create(:discussion_note_on_issue, noteable: issue, project: issue.project, author: create(:user)) + create(:user_status, user: second_discussion.author) + + expect { get :discussions, namespace_id: project.namespace, project_id: project, id: issue.iid } + .not_to exceed_query_limit(control) + end + context 'with cross-reference system note', :request_store do let(:new_issue) { create(:issue) } let(:cross_reference) { "mentioned in #{new_issue.to_reference(issue.project)}" } |