Merge branch '59570-remove-due-date-quick-action' into 'master'
Extract remove due date spec to shared example Closes #59570 See merge request gitlab-org/gitlab-ce!26922
This commit is contained in:
commit
ca72809cb0
2 changed files with 27 additions and 34 deletions
|
@ -43,7 +43,7 @@ describe 'Issues > User uses quick actions', :js do
|
||||||
describe 'issue-only commands' do
|
describe 'issue-only commands' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
let(:project) { create(:project, :public) }
|
let(:project) { create(:project, :public) }
|
||||||
let(:issue) { create(:issue, project: project) }
|
let(:issue) { create(:issue, project: project, due_date: Date.new(2016, 8, 28)) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
project.add_maintainer(user)
|
project.add_maintainer(user)
|
||||||
|
@ -57,6 +57,7 @@ describe 'Issues > User uses quick actions', :js do
|
||||||
end
|
end
|
||||||
|
|
||||||
it_behaves_like 'confidential quick action'
|
it_behaves_like 'confidential quick action'
|
||||||
|
it_behaves_like 'remove_due_date quick action'
|
||||||
|
|
||||||
describe 'adding a due date from note' do
|
describe 'adding a due date from note' do
|
||||||
let(:issue) { create(:issue, project: project) }
|
let(:issue) { create(:issue, project: project) }
|
||||||
|
@ -76,24 +77,6 @@ describe 'Issues > User uses quick actions', :js do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'removing a due date from note' do
|
|
||||||
let(:issue) { create(:issue, project: project, due_date: Date.new(2016, 8, 28)) }
|
|
||||||
|
|
||||||
it_behaves_like 'remove_due_date action available and due date can be removed'
|
|
||||||
|
|
||||||
context 'when the current user cannot update the due date' do
|
|
||||||
let(:guest) { create(:user) }
|
|
||||||
before do
|
|
||||||
project.add_guest(guest)
|
|
||||||
gitlab_sign_out
|
|
||||||
sign_in(guest)
|
|
||||||
visit project_issue_path(project, issue)
|
|
||||||
end
|
|
||||||
|
|
||||||
it_behaves_like 'remove_due_date action not available'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'toggling the WIP prefix from the title from note' do
|
describe 'toggling the WIP prefix from the title from note' do
|
||||||
let(:issue) { create(:issue, project: project) }
|
let(:issue) { create(:issue, project: project) }
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
shared_examples 'remove_due_date action not available' do
|
shared_examples 'remove_due_date quick action' do
|
||||||
it 'does not remove the due date' do
|
context 'remove_due_date action available and due date can be removed' do
|
||||||
add_note("/remove_due_date")
|
|
||||||
|
|
||||||
expect(page).not_to have_content 'Commands applied'
|
|
||||||
expect(page).not_to have_content '/remove_due_date'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
shared_examples 'remove_due_date action available and due date can be removed' do
|
|
||||||
it 'removes the due date accordingly' do
|
it 'removes the due date accordingly' do
|
||||||
add_note('/remove_due_date')
|
add_note('/remove_due_date')
|
||||||
|
|
||||||
|
@ -22,4 +14,22 @@ shared_examples 'remove_due_date action available and due date can be removed' d
|
||||||
expect(page).to have_content 'No due date'
|
expect(page).to have_content 'No due date'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'remove_due_date action not available' do
|
||||||
|
let(:guest) { create(:user) }
|
||||||
|
before do
|
||||||
|
project.add_guest(guest)
|
||||||
|
gitlab_sign_out
|
||||||
|
sign_in(guest)
|
||||||
|
visit project_issue_path(project, issue)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not remove the due date' do
|
||||||
|
add_note("/remove_due_date")
|
||||||
|
|
||||||
|
expect(page).not_to have_content 'Commands applied'
|
||||||
|
expect(page).not_to have_content '/remove_due_date'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue