Merge branch...

Merge branch '30182-checkbox-with-no-text-causing-following-checkboxes-not-to-be-saved' into 'master'

Update `deckar01-task_list` gem to fix unrecognized task item

See merge request gitlab-org/gitlab!19724

Gemfile

@@ -136,7 +136,7 @@ gem 'faraday_middleware-aws-signers-v4'
 
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
+gem 'deckar01-task_list', '2.2.1'
 gem 'gitlab-markup', '~> 1.7.0'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.17'

Gemfile.lock

@@ -194,7 +194,7 @@ GEM
     database_cleaner (1.7.0)
     debug_inspector (0.0.3)
     debugger-ruby_core_source (1.3.8)
-    deckar01-task_list (2.2.0)
+    deckar01-task_list (2.2.1)
       html-pipeline
     declarative (0.0.10)
     declarative-option (0.1.0)
@@ -604,7 +604,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.3.1)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -1128,7 +1128,7 @@ DEPENDENCIES
   creole (~> 0.5.0)
   danger (~> 6.0)
   database_cleaner (~> 1.7.0)
-  deckar01-task_list (= 2.2.0)
+  deckar01-task_list (= 2.2.1)
   default_value_for (~> 3.3.0)
   derailed_benchmarks
   device_detector

changelogs/unreleased/30182-checkbox-with-no-text-causing-following-checkboxes-not-to-be-saved.yml

+---
+title: Fix checking task item when previous tasks contain only spaces
+merge_request: 19724
+author:
+type: fixed

package.json

@@ -75,7 +75,7 @@
     "d3-time-format": "^2.1.1",
     "d3-transition": "^1.1.1",
     "dateformat": "^3.0.3",
-    "deckar01-task_list": "^2.2.0",
+    "deckar01-task_list": "^2.2.1",
     "diff": "^3.4.0",
     "document-register-element": "1.13.1",
     "dropzone": "^4.2.0",

spec/frontend/fixtures/merge_requests.rb

@@ -8,7 +8,23 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
   let(:admin) { create(:admin) }
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
   let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') }
-  let(:merge_request) { create(:merge_request, :with_diffs, source_project: project, target_project: project, description: '- [ ] Task List Item') }
+
+  # rubocop: disable Layout/TrailingWhitespace
+  let(:merge_request) do
+    create(
+      :merge_request,
+      :with_diffs,
+      source_project: project,
+      target_project: project,
+      description: <<~MARKDOWN.strip_heredoc
+      - [ ] Task List Item
+      - [ ]   
+      - [ ] Task List Item 2
+      MARKDOWN
+    )
+  end
+  # rubocop: enable Layout/TrailingWhitespace
+
   let(:merged_merge_request) { create(:merge_request, :merged, source_project: project, target_project: project) }
   let(:pipeline) do
     create(

spec/javascripts/merge_request_spec.js

-/* eslint-disable no-return-assign */
-
 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
@@ -22,7 +20,8 @@ describe('MergeRequest', function() {
         .onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`)
         .reply(200, {});
 
-      return (this.merge = new MergeRequest());
+      this.merge = new MergeRequest();
+      return this.merge;
     });
 
     afterEach(() => {
@@ -34,10 +33,30 @@ describe('MergeRequest', function() {
       const changeEvent = document.createEvent('HTMLEvents');
       changeEvent.initEvent('change', true, true);
       $('input[type=checkbox]')
+        .first()
+        .attr('checked', true)[0]
+        .dispatchEvent(changeEvent);
+      setTimeout(() => {
+        expect($('.js-task-list-field').val()).toBe(
+          '- [x] Task List Item\n- [ ]   \n- [ ] Task List Item 2\n',
+        );
+        done();
+      });
+    });
+
+    it('ensure that task with only spaces does not get checked incorrectly', done => {
+      // fixed in 'deckar01-task_list', '2.2.1' gem
+      spyOn($, 'ajax').and.stub();
+      const changeEvent = document.createEvent('HTMLEvents');
+      changeEvent.initEvent('change', true, true);
+      $('input[type=checkbox]')
+        .last()
         .attr('checked', true)[0]
         .dispatchEvent(changeEvent);
       setTimeout(() => {
-        expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
+        expect($('.js-task-list-field').val()).toBe(
+          '- [ ] Task List Item\n- [ ]   \n- [x] Task List Item 2\n',
+        );
         done();
       });
     });
@@ -59,7 +78,7 @@ describe('MergeRequest', function() {
             `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`,
             {
               merge_request: {
-                description: '- [ ] Task List Item',
+                description: '- [ ] Task List Item\n- [ ]   \n- [ ] Task List Item 2\n',
                 lock_version: 0,
                 update_task: { line_number: lineNumber, line_source: lineSource, index, checked },
               },

yarn.lock

@@ -3614,10 +3614,10 @@ decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-deckar01-task_list@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz#5cc3ea06f01d3d786b1a667064a462eb5d069bd3"
-  integrity sha512-NUfu5ARoD9SC2k+fBT5cBer59iKfEdawPrmfqp5+zAahTECb8z9dsuS1Xnx7jzFAmCCLnEs3z/aYucYXzNrKkQ==
+deckar01-task_list@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz#e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b"
+  integrity sha512-aNAVYAYwONXezSQy2p5M67wjZE+U7JpPotdegbyy1Wq35V6jDhF3qndJYA1rYnY3aI9ifCep6EMGPav/UQaBZw==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"