2015-09-11 14:41:01 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
describe 'Task Lists' do
|
2015-09-11 14:41:01 +05:30
|
|
|
include Warden::Test::Helpers
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
let(:project) { create(:project, :repository) }
|
2015-09-11 14:41:01 +05:30
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:user2) { create(:user) }
|
|
|
|
|
|
|
|
let(:markdown) do
|
|
|
|
<<-MARKDOWN.strip_heredoc
|
|
|
|
This is a task list:
|
|
|
|
|
|
|
|
- [ ] Incomplete entry 1
|
|
|
|
- [x] Complete entry 1
|
|
|
|
- [ ] Incomplete entry 2
|
|
|
|
- [x] Complete entry 2
|
|
|
|
- [ ] Incomplete entry 3
|
|
|
|
- [ ] Incomplete entry 4
|
|
|
|
MARKDOWN
|
|
|
|
end
|
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
let(:singleIncompleteMarkdown) do
|
|
|
|
<<-MARKDOWN.strip_heredoc
|
|
|
|
This is a task list:
|
|
|
|
|
|
|
|
- [ ] Incomplete entry 1
|
|
|
|
MARKDOWN
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:singleCompleteMarkdown) do
|
|
|
|
<<-MARKDOWN.strip_heredoc
|
|
|
|
This is a task list:
|
|
|
|
|
|
|
|
- [x] Incomplete entry 1
|
|
|
|
MARKDOWN
|
|
|
|
end
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
let(:nested_tasks_markdown_redcarpet) do
|
2017-08-17 22:00:37 +05:30
|
|
|
<<-EOT.strip_heredoc
|
|
|
|
- [ ] Task a
|
|
|
|
- [x] Task a.1
|
|
|
|
- [ ] Task a.2
|
|
|
|
- [ ] Task b
|
|
|
|
|
|
|
|
1. [ ] Task 1
|
|
|
|
1. [ ] Task 1.1
|
|
|
|
1. [x] Task 1.2
|
|
|
|
EOT
|
|
|
|
end
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
let(:nested_tasks_markdown) do
|
|
|
|
<<-EOT.strip_heredoc
|
|
|
|
- [ ] Task a
|
|
|
|
- [x] Task a.1
|
|
|
|
- [ ] Task a.2
|
|
|
|
- [ ] Task b
|
|
|
|
|
|
|
|
1. [ ] Task 1
|
|
|
|
1. [ ] Task 1.1
|
|
|
|
1. [x] Task 1.2
|
|
|
|
EOT
|
|
|
|
end
|
|
|
|
|
2015-09-11 14:41:01 +05:30
|
|
|
before do
|
|
|
|
Warden.test_mode!
|
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(user)
|
2018-03-17 18:26:18 +05:30
|
|
|
project.add_guest(user2)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
|
|
|
login_as(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
def visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_issue_path(project, issue)
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
describe 'for Issues' do
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'multiple tasks', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
let!(:issue) { create(:issue, description: markdown, author: user, project: project) }
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'renders' do
|
|
|
|
visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 6)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 2)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'contains the required selectors' do
|
|
|
|
visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('a.btn-close')
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'is only editable by author' do
|
|
|
|
visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
logout(:user)
|
2016-09-29 09:46:39 +05:30
|
|
|
login_as(user2)
|
|
|
|
visit current_path
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
expect(page).to have_selector(".wiki .task-list .task-list-item .task-list-item-checkbox")
|
2016-09-29 09:46:39 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on Issues#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_issues_path(project)
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("2 of 6 tasks completed")
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'single incomplete task', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
let!(:issue) { create(:issue, description: singleIncompleteMarkdown, author: user, project: project) }
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'renders' do
|
|
|
|
visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 0)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on Issues#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_issues_path(project)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("0 of 1 task completed")
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe 'single complete task', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
let!(:issue) { create(:issue, description: singleCompleteMarkdown, author: user, project: project) }
|
|
|
|
|
|
|
|
it 'renders' do
|
|
|
|
visit_issue(project, issue)
|
2017-09-10 17:25:29 +05:30
|
|
|
wait_for_requests
|
2016-09-29 09:46:39 +05:30
|
|
|
|
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 1)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on Issues#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_issues_path(project)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("1 of 1 task completed")
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
shared_examples 'shared nested tasks' do
|
2017-09-10 17:25:29 +05:30
|
|
|
before do
|
2018-11-08 19:23:39 +05:30
|
|
|
allow(Banzai::Filter::MarkdownFilter).to receive(:engine).and_return('Redcarpet')
|
2017-09-10 17:25:29 +05:30
|
|
|
visit_issue(project, issue)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'renders' do
|
|
|
|
expect(page).to have_selector('ul.task-list', count: 2)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 7)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 1)
|
|
|
|
expect(page).to have_selector('ol input[checked]', count: 1)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'solves tasks' do
|
|
|
|
expect(page).to have_content("2 of 7 tasks completed")
|
|
|
|
|
|
|
|
page.find('li.task-list-item', text: 'Task b').find('input').click
|
|
|
|
page.find('li.task-list-item ul li.task-list-item', text: 'Task a.2').find('input').click
|
|
|
|
page.find('li.task-list-item ol li.task-list-item', text: 'Task 1.1').find('input').click
|
|
|
|
|
|
|
|
expect(page).to have_content("5 of 7 tasks completed")
|
|
|
|
|
|
|
|
visit_issue(project, issue) # reload to see new system notes
|
|
|
|
|
|
|
|
expect(page).to have_content('marked the task Task b as complete')
|
|
|
|
expect(page).to have_content('marked the task Task a.2 as complete')
|
|
|
|
expect(page).to have_content('marked the task Task 1.1 as complete')
|
|
|
|
end
|
|
|
|
end
|
2018-11-08 19:23:39 +05:30
|
|
|
|
|
|
|
describe 'nested tasks', :js do
|
|
|
|
context 'with Redcarpet' do
|
|
|
|
let(:issue) { create(:issue, description: nested_tasks_markdown_redcarpet, author: user, project: project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow_any_instance_of(Banzai::Filter::MarkdownFilter).to receive(:engine).and_return('Redcarpet')
|
|
|
|
visit_issue(project, issue)
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'shared nested tasks'
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with CommonMark' do
|
|
|
|
let(:issue) { create(:issue, description: nested_tasks_markdown, author: user, project: project) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow_any_instance_of(Banzai::Filter::MarkdownFilter).to receive(:engine).and_return('CommonMark')
|
|
|
|
visit_issue(project, issue)
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'shared nested tasks'
|
|
|
|
end
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe 'for Notes' do
|
|
|
|
let!(:issue) { create(:issue, author: user, project: project) }
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'multiple tasks' do
|
|
|
|
let!(:note) do
|
|
|
|
create(:note, note: markdown, noteable: issue,
|
|
|
|
project: project, author: user)
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'renders for note body', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
visit_issue(project, issue)
|
|
|
|
|
|
|
|
expect(page).to have_selector('.note ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('.note li.task-list-item', count: 6)
|
|
|
|
expect(page).to have_selector('.note ul input[checked]', count: 2)
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'contains the required selectors', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
visit_issue(project, issue)
|
|
|
|
|
|
|
|
expect(page).to have_selector('.note .js-task-list-container')
|
|
|
|
expect(page).to have_selector('.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox')
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'is only editable by author', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
visit_issue(project, issue)
|
|
|
|
expect(page).to have_selector('.js-task-list-container')
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
gitlab_sign_out
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
gitlab_sign_in(user2)
|
2016-09-29 09:46:39 +05:30
|
|
|
visit current_path
|
|
|
|
expect(page).not_to have_selector('.js-task-list-container')
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'single incomplete task' do
|
|
|
|
let!(:note) do
|
|
|
|
create(:note, note: singleIncompleteMarkdown, noteable: issue,
|
|
|
|
project: project, author: user)
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'renders for note body', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
visit_issue(project, issue)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('.note ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('.note li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('.note ul input[checked]', count: 0)
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'single complete task' do
|
|
|
|
let!(:note) do
|
|
|
|
create(:note, note: singleCompleteMarkdown, noteable: issue,
|
|
|
|
project: project, author: user)
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
it 'renders for note body', :js do
|
2016-09-29 09:46:39 +05:30
|
|
|
visit_issue(project, issue)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('.note ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('.note li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('.note ul input[checked]', count: 1)
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'for Merge Requests' do
|
|
|
|
def visit_merge_request(project, merge)
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_merge_request_path(project, merge)
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'multiple tasks' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:project) { create(:project, :repository) }
|
2016-09-29 09:46:39 +05:30
|
|
|
let!(:merge) { create(:merge_request, :simple, description: markdown, author: user, source_project: project) }
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'renders for description' do
|
|
|
|
visit_merge_request(project, merge)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 6)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 2)
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'contains the required selectors' do
|
|
|
|
visit_merge_request(project, merge)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
container = '.detail-page-description .description.js-task-list-container'
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_selector(container)
|
|
|
|
expect(page).to have_selector("#{container} .wiki .task-list .task-list-item .task-list-item-checkbox")
|
|
|
|
expect(page).to have_selector("#{container} .js-task-list-field")
|
|
|
|
expect(page).to have_selector('form.js-issuable-update')
|
|
|
|
expect(page).to have_selector('a.btn-close')
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
it 'is only editable by author' do
|
|
|
|
visit_merge_request(project, merge)
|
|
|
|
expect(page).to have_selector('.js-task-list-container')
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
logout(:user)
|
2015-09-11 14:41:01 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
login_as(user2)
|
|
|
|
visit current_path
|
|
|
|
expect(page).not_to have_selector('.js-task-list-container')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on MergeRequests#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_merge_requests_path(project)
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("2 of 6 tasks completed")
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'single incomplete task' do
|
|
|
|
let!(:merge) { create(:merge_request, :simple, description: singleIncompleteMarkdown, author: user, source_project: project) }
|
|
|
|
|
|
|
|
it 'renders for description' do
|
|
|
|
visit_merge_request(project, merge)
|
|
|
|
|
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 0)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on MergeRequests#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_merge_requests_path(project)
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("0 of 1 task completed")
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
|
2016-09-29 09:46:39 +05:30
|
|
|
describe 'single complete task' do
|
|
|
|
let!(:merge) { create(:merge_request, :simple, description: singleCompleteMarkdown, author: user, source_project: project) }
|
|
|
|
|
|
|
|
it 'renders for description' do
|
|
|
|
visit_merge_request(project, merge)
|
|
|
|
|
|
|
|
expect(page).to have_selector('ul.task-list', count: 1)
|
|
|
|
expect(page).to have_selector('li.task-list-item', count: 1)
|
|
|
|
expect(page).to have_selector('ul input[checked]', count: 1)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'provides a summary on MergeRequests#index' do
|
2017-09-10 17:25:29 +05:30
|
|
|
visit project_merge_requests_path(project)
|
2016-09-29 09:46:39 +05:30
|
|
|
expect(page).to have_content("1 of 1 task completed")
|
|
|
|
end
|
2015-09-11 14:41:01 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|