From 4971b85a52ccbca3ebd7ac3516d78b2fd94b0aec Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Thu, 7 Sep 2017 17:53:52 +0200 Subject: add feature specs for discussion lock --- .../merge_requests/discussion_lock_spec.rb | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 spec/features/merge_requests/discussion_lock_spec.rb (limited to 'spec/features/merge_requests') diff --git a/spec/features/merge_requests/discussion_lock_spec.rb b/spec/features/merge_requests/discussion_lock_spec.rb new file mode 100644 index 00000000000..85fd221a567 --- /dev/null +++ b/spec/features/merge_requests/discussion_lock_spec.rb @@ -0,0 +1,49 @@ +require 'spec_helper' + +describe 'Discussion Lock', :js do + let(:user) { create(:user) } + let(:merge_request) { create(:merge_request, source_project: project, author: user) } + let(:project) { create(:project, :public, :repository) } + + before do + sign_in(user) + end + + context 'when the discussion is locked' do + before do + merge_request.update_attribute(:discussion_locked, true) + end + + context 'when a user is a team member' do + before do + project.add_developer(user) + visit project_merge_request_path(project, merge_request) + end + + it 'the user can create a comment' do + page.within('.issuable-discussion #notes .js-main-target-form') do + fill_in 'note[note]', with: 'Some new comment' + click_button 'Comment' + end + + wait_for_requests + + expect(find('.issuable-discussion #notes')).to have_content('Some new comment') + end + end + + context 'when a user is not a team member' do + before do + visit project_merge_request_path(project, merge_request) + end + + it 'the user can not create a comment' do + page.within('.issuable-discussion #notes') do + expect(page).not_to have_selector('js-main-target-form') + expect(page.find('.disabled-comment')). + to have_content('This merge request is locked. Only project members can comment.') + end + end + end + end +end -- cgit v1.2.1 From eb0c7092869ac2eb0782f60d6935f0dc3fe33501 Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova Date: Wed, 27 Sep 2017 08:30:40 +0200 Subject: fix code style --- spec/features/merge_requests/discussion_lock_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/features/merge_requests') diff --git a/spec/features/merge_requests/discussion_lock_spec.rb b/spec/features/merge_requests/discussion_lock_spec.rb index 85fd221a567..7bbd3b1e69e 100644 --- a/spec/features/merge_requests/discussion_lock_spec.rb +++ b/spec/features/merge_requests/discussion_lock_spec.rb @@ -40,8 +40,8 @@ describe 'Discussion Lock', :js do it 'the user can not create a comment' do page.within('.issuable-discussion #notes') do expect(page).not_to have_selector('js-main-target-form') - expect(page.find('.disabled-comment')). - to have_content('This merge request is locked. Only project members can comment.') + expect(page.find('.disabled-comment')) + .to have_content('This merge request is locked. Only project members can comment.') end end end -- cgit v1.2.1