Merge branch 'rs-task_list' into 'master'

Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. :clap:

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599

2 files changed, 163 insertions, 3 deletions

diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index 57d01236505..1746ce128e4 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -24,6 +24,7 @@ require 'erb'
 #               -> Rinku (http, https, ftp)
 #               -> Other schemes
 #             -> References
+#             -> TaskList
 #           -> `html_safe`
 #           -> Template
 #
@@ -279,6 +280,15 @@ describe 'GitLab Markdown' do
         expect(body).to have_selector('a.gfm.gfm-label', count: 3)
       end
     end
+
+    describe 'Task Lists' do
+      it 'generates task lists' do
+        body = get_section('task-lists')
+        expect(body).to have_selector('ul.task-list', count: 2)
+        expect(body).to have_selector('li.task-list-item', count: 7)
+        expect(body).to have_selector('input[checked]', count: 3)
+      end
+    end
   end
 end
 
@@ -289,9 +299,8 @@ end
 # once. Unfortunately RSpec will not let you access `let`s in a `before(:all)`
 # block, so we fake it by encapsulating all the shared setup in this class.
 #
-# The class contains the raw Markup used in the test, dynamically substituting
-# real objects, created from factories and setup on-demand, when referenced in
-# the Markdown.
+# The class renders `spec/fixtures/markdown.md.erb` using ERB, allowing for
+# reference to the factory-created objects.
 class MarkdownFeature
   include FactoryGirl::Syntax::Methods
 
diff --git a/spec/features/task_lists_spec.rb b/spec/features/task_lists_spec.rb
new file mode 100644
index 00000000000..2099fc40cca
--- /dev/null
+++ b/spec/features/task_lists_spec.rb
@@ -0,0 +1,151 @@
+require 'spec_helper'
+
+feature 'Task Lists' do
+  include Warden::Test::Helpers
+
+  let(:project) { create(:project) }
+  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
+
+  before do
+    Warden.test_mode!
+
+    project.team << [user, :master]
+    project.team << [user2, :guest]
+
+    login_as(user)
+  end
+
+  def visit_issue(project, issue)
+    visit namespace_project_issue_path(project.namespace, project, issue)
+  end
+
+  describe 'for Issues' do
+    let!(:issue) { create(:issue, description: markdown, author: user, project: project) }
+
+    it 'renders' do
+      visit_issue(project, issue)
+
+      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)
+
+      container = '.issue-details .description.js-task-list-container'
+
+      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-issue-update')
+      expect(page).to have_selector('a.btn-close')
+    end
+
+    it 'is only editable by author' do
+      visit_issue(project, issue)
+      expect(page).to have_selector('.js-task-list-container')
+
+      logout(:user)
+
+      login_as(user2)
+      visit current_path
+      expect(page).not_to have_selector('.js-task-list-container')
+    end
+
+    it 'provides a summary on Issues#index' do
+      visit namespace_project_issues_path(project.namespace, project)
+      expect(page).to have_content("6 tasks (2 completed, 4 remaining)")
+    end
+  end
+
+  describe 'for Notes' do
+    let!(:issue) { create(:issue, author: user, project: project) }
+    let!(:note)  { create(:note, note: markdown, noteable: issue, author: user) }
+
+    it 'renders for note body' do
+      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
+
+    it 'contains the required selectors' do
+      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')
+      expect(page).to have_selector('.note .js-task-list-container .js-task-list-field')
+    end
+
+    it 'is only editable by author' do
+      visit_issue(project, issue)
+      expect(page).to have_selector('.js-task-list-container')
+
+      logout(:user)
+
+      login_as(user2)
+      visit current_path
+      expect(page).not_to have_selector('.js-task-list-container')
+    end
+  end
+
+  describe 'for Merge Requests' do
+    def visit_merge_request(project, merge)
+      visit namespace_project_merge_request_path(project.namespace, project, merge)
+    end
+
+    let!(:merge) { create(:merge_request, :simple, description: markdown, 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: 6)
+      expect(page).to have_selector('ul input[checked]', count: 2)
+    end
+
+    it 'contains the required selectors' do
+      visit_merge_request(project, merge)
+
+      container = '.merge-request-details .description.js-task-list-container'
+
+      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-merge-request-update')
+      expect(page).to have_selector('a.btn-close')
+    end
+
+    it 'is only editable by author' do
+      visit_merge_request(project, merge)
+      expect(page).to have_selector('.js-task-list-container')
+
+      logout(:user)
+
+      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
+      visit namespace_project_merge_requests_path(project.namespace, project)
+      expect(page).to have_content("6 tasks (2 completed, 4 remaining)")
+    end
+  end
+end