diff options
author | Samantha Ming <sming@gitlab.com> | 2019-07-25 19:30:50 -0700 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-20 15:15:18 -0500 |
commit | f1f34baf6f4e0866feb3f4c7523e3dccf5784b0b (patch) | |
tree | 0922f96df924d9e9bf99ccc3a047683b7586b9c7 /spec/serializers | |
parent | fd589be32f02c160812bbce0f5fb2178fb7142d3 (diff) | |
download | gitlab-ce-f1f34baf6f4e0866feb3f4c7523e3dccf5784b0b.tar.gz |
Improve UX multi assigness in MR
Add merge warning on avatar in:
- open view assigness
- collapsed view assigness
- dropdown (search) view assigness
Add can_merge option to MR sidebar entity
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/merge_request_sidebar_basic_entity_spec.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/serializers/merge_request_sidebar_basic_entity_spec.rb b/spec/serializers/merge_request_sidebar_basic_entity_spec.rb new file mode 100644 index 00000000000..b364b1a3306 --- /dev/null +++ b/spec/serializers/merge_request_sidebar_basic_entity_spec.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe MergeRequestSidebarBasicEntity do + let(:project) { create :project, :repository } + let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } + let(:user) { create(:user) } + + let(:request) { double('request', current_user: user, project: project) } + + let(:entity) { described_class.new(merge_request, request: request).as_json } + + describe '#current_user' do + it 'contains attributes related to the current user' do + expect(entity[:current_user].keys).to contain_exactly( + :id, :name, :username, :state, :avatar_url, :web_url, :todo, + :can_edit, :can_move, :can_admin_label, :can_merge + ) + end + end +end |