deckar01-task_list 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebe3bef10b2543060da20d370caf02673c1f682b
-  data.tar.gz: b1dd8cedf1c8a33d2136deb814e2f357d04bc7a3
+  metadata.gz: 34a7ec4b58a3243088a56807c0768fad5b43b74e
+  data.tar.gz: ca0e0a25dd71df16347cb2454ee979d0f77060cd
 SHA512:
-  metadata.gz: d187b31dcd76cafc0ba685ec87595baccd7d2dd278c52e6d0da320d77e9503a630c0ee3f2a7697596a756249433f5910abdfd83633981a955bce99df3b249550
-  data.tar.gz: 68be28b14fae6684279ba42fda7e086e2a424692c7cdc455e2cfd12dfc6dd26c801c43b6acc468074d11f7138410be1938993843d44aed81a4ce8211b9ee440a
+  metadata.gz: 7f48d4b5e01192b512b838d62d5bf2812b473fd5cb2b2d95317351e808ad13caf0cf92493fc76d1f9f02ff255d407a4336a13601f4bf6b4a2290249cb0ce8e87
+  data.tar.gz: 8821d7ec5c29e6629db2b8263ffde6919efe08727e9e6739c0eae84ec1f3ed575da5c9079b62471a41e655dd25620307f102ff40d42e7c77133e89f893a0a2c0

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
 sudo: false
+addons:
+  chrome: stable
 install:
   - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
   - ./script/bootstrap
@@ -9,6 +11,6 @@ rvm:
   - 2.1
   - 2.2
 env:
-  - TRAVIS_NODE_VERSION="7"
+  - TRAVIS_NODE_VERSION="11"
 notifications:
   email: false

data/README.md

@@ -144,6 +144,14 @@ At a high level, the Ruby components integrate with the [`html-pipeline`](https:
 
 [A polyfill for custom events](https://github.com/krambuhl/custom-event-polyfill) must be included to support IE10 and below.
 
+### Known issues
+
+The markdown parser used on the front end produces false positives when looking for checkboxes
+in some complex nesting situations. To combat this issue, you can enable the `sourcepos` option
+in your markdown parser. This will avoid parsing the markdown on the front end, because the line
+numbers will be provided as attributes on the HTML elements. `task_list` checks for the source
+position attribute and falls back to manually parsing the markown when needed.
+
 ### Upgrading
 
 #### 1.x to 2.x

data/app/assets/javascripts/task_list.coffee

@@ -150,7 +150,7 @@ class TaskList
 
     unless changeEvent.defaultPrevented
       { result, lineNumber, lineSource } =
-        TaskList.updateSource(@field.value, index, item.checked)
+        TaskList.updateSource(@field.value, index, item.checked, item)
 
       @field.value = result
       changeEvent = createEvent 'change'
@@ -220,16 +220,46 @@ class TaskList
   # given checked value.
   #
   # Returns the updated String text.
-  @updateSource: (source, itemIndex, checked) ->
+  @updateSource: (source, itemIndex, checked, item) ->
+    if item.parentElement.hasAttribute('data-sourcepos')
+      @_updateSourcePosition(source, item, checked)
+    else
+      @_updateSourceRegex(source, itemIndex, checked)
+
+  # If we have sourcepos information, that tells us which line the task
+  # is on without the need for parsing
+  @_updateSourcePosition: (source, item, checked) ->
+    result = source.split("\n")
+    sourcepos = item.parentElement.getAttribute('data-sourcepos')
+    lineNumber = parseInt(sourcepos.split(":")[0])
+    lineSource = result[lineNumber - 1]
+
+    line =
+      if checked
+        lineSource.replace(@incompletePattern, @complete)
+      else
+        lineSource.replace(@completePattern, @incomplete)
+
+    result[lineNumber - 1] = line
+
+    return {
+      result: result.join("\n")
+      lineNumber: lineNumber
+      lineSource: lineSource
+    }
+
+  @_updateSourceRegex: (source, itemIndex, checked) ->
+    split_source = source.split("\n")
+    lineNumber
+    lineSource
+
     clean = source.replace(/\r/g, '').
       replace(@itemsInParasPattern, '').
       split("\n")
     index = 0
     inCodeBlock = false
-    lineNumber
-    lineSource
 
-    result = for line, i in source.split("\n")
+    result = for line, i in split_source
       if inCodeBlock
         # Lines inside of a code block are ignored.
         if line.match(@endFencesPattern)
@@ -249,6 +279,7 @@ class TaskList
             else
               line.replace(@completePattern, @incomplete)
       line
+
     return {
       result: result.join("\n")
       lineNumber: lineNumber

data/lib/task_list/version.rb

@@ -1,3 +1,3 @@
 class TaskList
-  VERSION = [2, 2, 1].join('.')
+  VERSION = [2, 3, 0].join('.')
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckar01-task_list",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Markdown TaskList components",
   "main": "dist/task_list.js",
   "directories": {
@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "test": "script/cibuild",
-    "qunit": "phantomjs test/run-qunit.coffee http://localhost:4018/test/index.html",
+    "qunit": "karma start test/unit/config.js",
     "lint": "coffeelint app/assets/javascripts/task_list.coffee",
     "build:css": "node-sass -o dist/ app/assets/stylesheets/task_list.scss",
     "build:js": "webpack",
@@ -37,11 +37,19 @@
   "homepage": "https://github.com/deckar01/task_list#readme",
   "devDependencies": {
     "bower": "^1.8.0",
-    "coffee-loader": "^0.7.3",
-    "coffee-script": "^1.12.5",
+    "coffee-loader": "^0.9.0",
     "coffeelint": "^1.16.0",
+    "coffeescript": "^2.4.1",
+    "jquery": "^2.2.4",
+    "karma": "^4.4.1",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-qunit": "^4.0.0",
+    "karma-webpack": "^4.0.2",
     "node-sass": "^4.5.2",
     "phantomjs": "^1.9.19",
-    "webpack": "^2.5.1"
-  }
+    "qunit": "^2.9.3",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10"
+  },
+  "dependencies": {}
 }

data/script/cibuild

@@ -3,5 +3,5 @@
 # CI build script.
 
 npm run lint
-./script/testsuite 4018
+npm run qunit
 bundle exec rake test

data/test/functional/test_task_lists_behavior.html

@@ -71,6 +71,7 @@
 </head>
 <body>
   <div class="js-task-list-container js-task-list-enable">
+    <h2>Using Regex Parsing</h2>
     <div class="markdown">
       <ul class="task-list">
         <li>
@@ -104,6 +105,41 @@
     </form>
   </div>
 
+  <div class="js-task-list-container js-task-list-enable">
+    <h2>Using CommonMark Source Positioning</h2>
+    <div class="markdown">
+      <ul class="task-list" data-sourcepos="1:1-5:27">
+        <li data-sourcepos="1:1-1:8">
+          [ ]
+        </li>
+        <li class="task-list-item" data-sourcepos="2:1-2:26">
+          <input type="checkbox" class="task-list-item-checkbox" disabled />
+          I'm a task list item
+        </li>
+        <li class="task-list-item" data-sourcepos="3:1-3:30">
+          <input type="checkbox" class="task-list-item-checkbox" disabled />
+          with non-breaking space
+        </li>
+        <li class="task-list-item" data-sourcepos="4:1-4:22">
+          <input type="checkbox" class="task-list-item-checkbox" disabled checked />
+          completed, lower
+        </li>
+        <li class="task-list-item" data-sourcepos="5:1-5:27">
+          <input type="checkbox" class="task-list-item-checkbox" disabled checked />
+          completed capitalized
+        </li>
+      </ul>
+    </div>
+    <form action="/update" method="POST" data-remote data-type="json">
+      <textarea name="comment[body]" class="js-task-list-field" cols="40" rows="10">
+- [ ]  
+- [ ] I'm a task list item
+- [ ] with non-breaking space
+- [x] completed, lower
+- [X] completed capitalized</textarea>
+    </form>
+  </div>
+
   <ul class="log">
   </ul>
 </body>

data/test/unit/config.js

@@ -0,0 +1,87 @@
+// Karma configuration
+// Generated on Tue Nov 12 2019 10:22:49 GMT-0600 (Central Standard Time)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '../..',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['qunit'],
+
+
+    plugins: [
+      'karma-qunit',
+      'karma-webpack',
+      'karma-chrome-launcher',
+    ],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      'app/assets/javascripts/*.coffee',
+      'test/unit/*.coffee'
+    ],
+
+
+    // list of files / patterns to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      '**/*.coffee': ['webpack']
+    },
+ 
+    webpack: {
+      ...require('../../webpack.config.js'),
+      mode: 'development',
+    },
+ 
+    webpackMiddleware: {
+      stats: 'errors-only',
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['ChromeHeadless'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}

data/test/unit/test_events.coffee

@@ -1,8 +1,8 @@
-#= require jquery
-#= require task_list
+window.$ = window.jQuery = require('jquery')
+window.TaskList = require('../../app/assets/javascripts/task_list')
 
-module "TaskList events",
-  setup: ->
+QUnit.module "TaskList events",
+  beforeEach: ->
     @container = $ '<div>', class: 'js-task-list-container'
 
     @list = $ '<ul>', class: 'task-list'
@@ -24,74 +24,75 @@ module "TaskList events",
     $('#qunit-fixture').append(@container)
     @container.taskList()
 
-  teardown: ->
+  afterEach: ->
     $(document).off 'tasklist:enabled'
     $(document).off 'tasklist:disabled'
     $(document).off 'tasklist:change'
     $(document).off 'tasklist:changed'
 
-asyncTest "triggers a tasklist:change event before making task list item changes", ->
-  expect 1
+QUnit.test "triggers a tasklist:change event before making task list item changes", (assert) ->
+  done = assert.async()
+  assert.expect 1
 
   @field.on 'tasklist:change', (event, index, checked) ->
-    ok true
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok true
+    done()
 
   @checkbox.click()
 
-asyncTest "triggers a tasklist:changed event once a task list item changes", ->
-  expect 1
+QUnit.test "triggers a tasklist:changed event once a task list item changes", (assert) ->
+  done = assert.async()
+  assert.expect 1
 
   @field.on 'tasklist:changed', (event, index, checked) ->
-    ok true
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok true
+    done()
 
   @checkbox.click()
 
-asyncTest "can cancel a tasklist:changed event", ->
-  expect 2
+QUnit.test "can cancel a tasklist:changed event", (assert) ->
+  done = assert.async()
+  done2 = assert.async()
+  assert.expect 2
 
   @field.on 'tasklist:change', (event, index, checked) ->
-    ok true
+    assert.ok true
     event.preventDefault()
+    done2()
 
   @field.on 'tasklist:changed', (event, index, checked) ->
-    ok false
+    assert.ok false
 
   before = @checkbox.val()
   setTimeout =>
-    equal before, @checkbox.val()
-    start()
+    assert.ok true
+    done()
   , 20
 
   @checkbox.click()
 
-asyncTest "enables task list items when a .js-task-list-field is present", ->
-  expect 1
+QUnit.test "enables task list items when a .js-task-list-field is present", (assert) ->
+  done = assert.async()
+  assert.expect 1
 
   $(document).on 'tasklist:enabled', (event) ->
-    ok true
-
+    assert.ok true
+    done()
+  
   @container.taskList()
-  setTimeout ->
-    start()
-  , 20
 
-asyncTest "doesn't enable task list items when a .js-task-list-field is absent", ->
-  expect 0
+QUnit.test "doesn't enable task list items when a .js-task-list-field is absent", (assert) ->
+  done = assert.async()
+  assert.expect 1
 
   $(document).on 'tasklist:enabled', (event) ->
-    ok true
+    assert.ok false
 
   @field.remove()
 
   @container.taskList()
-  setTimeout ->
-    start()
+
+  setTimeout =>
+    assert.ok true
+    done()
   , 20

data/test/unit/test_updates.coffee

@@ -1,8 +1,8 @@
-#= require jquery
-#= require task_list
+window.$ = window.jQuery = require('jquery')
+window.TaskList = require('../../app/assets/javascripts/task_list')
 
-module "TaskList updates",
-  setup: ->
+QUnit.module "TaskList updates",
+  beforeEach: ->
     @container = $ '<div>', class: 'js-task-list-container'
 
     @list = $ '<ul>', class: 'task-list'
@@ -247,141 +247,185 @@ module "TaskList updates",
 
     @blockquote.append @field
 
+    @completeItemSourcePos = '1:1-1:14'
+    @incompleteItemSourcePos = '2:1-2:16'
+    @incompleteNBSPItemSourcePos = '3:1-3:27'
+    @quotedCompleteItemSourcePos = '4:3-4:23'
+    @quotedIncompleteItemSourcePos = '5:3-5:25'
+    @innerCompleteItemSourcePos = '6:4-6:23'
+    @innerIncompleteItemSourcePos = '7:5-7:26'
+    @orderedCompleteItemSourcePos = '8:3-8:25'
+    @orderedIncompleteItemSourcePos = '9:3-9:27'
+
     $('#qunit-fixture').append(@container)
     @container.taskList()
 
-  teardown: ->
+    @setSourcePosition = (item, pos) =>
+      item.attr('data-sourcepos', pos)
+
+    @onChanged = (assert) =>
+      utils =
+      test: (fn) =>
+        done = assert.async()
+        @field.on 'tasklist:changed', (event) =>
+          fn event
+          done()
+      eventHas: (name, value) =>
+        utils.test (event) =>
+          assert.equal event.detail[name], value
+      fieldIs: (value) =>
+        utils.test () =>
+          assert.equal @field.val(), value
+
+  afterEach: ->
     $(document).off 'tasklist:changed'
 
-asyncTest "updates the source, marking the incomplete item as complete", ->
-  expect 3
+QUnit.test "updates the source, marking the incomplete item as complete", (assert) ->
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @incompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toIncomplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, @incompleteItem.expectedIndex
-    equal @field.val(), @changes.toIncomplete
+  @incompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source, marking the incomplete item as complete (sourcepos)", (assert) ->
+  @setSourcePosition(@incompleteItem, @incompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @incompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toIncomplete)
 
   @incompleteCheckbox.click()
 
-asyncTest "updates the source, marking the complete item as incomplete", ->
-  expect 3
+QUnit.test "updates the source, marking the complete item as incomplete", (assert) ->
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @completeItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toComplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok !event.detail.checked
-    equal event.detail.index, @completeItem.expectedIndex
-    equal @field.val(), @changes.toComplete
+  @completeCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source, marking the complete item as incomplete (sourcepos)", (assert) ->
+  @setSourcePosition(@completeItem, @completeItemSourcePos)
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @completeItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toComplete)
 
   @completeCheckbox.click()
 
 # See: https://github.com/github/task-lists/pull/14
-asyncTest "updates the source for items with non-breaking spaces", ->
-  expect 3
+QUnit.test "updates the source for items with non-breaking spaces", (assert) ->
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @incompleteNBSPItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toIncompleteNBSP)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, @incompleteNBSPItem.expectedIndex
-    equal @field.val(), @changes.toIncompleteNBSP
+  @incompleteNBSPCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+# See: https://github.com/github/task-lists/pull/14
+QUnit.test "updates the source for items with non-breaking spaces (sourcepos)", (assert) ->
+  @setSourcePosition(@incompleteNBSPItem, @incompleteNBSPItemSourcePos)
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @incompleteNBSPItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toIncompleteNBSP)
 
   @incompleteNBSPCheckbox.click()
 
-asyncTest "updates the source of a quoted item, marking the incomplete item as complete", ->
-  expect 3
+QUnit.test "updates the source of a quoted item, marking the incomplete item as complete", (assert) ->
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @quotedIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toQuotedIncomplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, @quotedIncompleteItem.expectedIndex
-    equal @field.val(), @changes.toQuotedIncomplete
+  @quotedIncompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of a quoted item, marking the incomplete item as complete (sourcepos)", (assert) ->
+  @setSourcePosition(@quotedIncompleteItem, @quotedIncompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @quotedIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toQuotedIncomplete)
 
   @quotedIncompleteCheckbox.click()
 
-asyncTest "updates the source of a quoted item, marking the complete item as incomplete", ->
-  expect 3
+QUnit.test "updates the source of a quoted item, marking the complete item as incomplete", (assert) ->
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @quotedCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toQuotedComplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok !event.detail.checked
-    equal event.detail.index, @quotedCompleteItem.expectedIndex
-    equal @field.val(), @changes.toQuotedComplete
+  @quotedCompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of a quoted item, marking the complete item as incomplete (sourcepos)", (assert) ->
+  @setSourcePosition(@quotedCompleteItem, @quotedCompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @quotedCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toQuotedComplete)
 
   @quotedCompleteCheckbox.click()
 
-asyncTest "updates the source of a quoted quoted item, marking the incomplete item as complete", ->
-  expect 3
+QUnit.test "updates the source of a quoted quoted item, marking the incomplete item as complete", (assert) ->
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @innerIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toInnerIncomplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, @innerIncompleteItem.expectedIndex
-    equal @field.val(), @changes.toInnerIncomplete
+  @innerIncompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of a quoted quoted item, marking the incomplete item as complete (sourcepos)", (assert) ->
+  @setSourcePosition(@innerIncompleteItem, @innerIncompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @innerIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toInnerIncomplete)
 
   @innerIncompleteCheckbox.click()
 
-asyncTest "updates the source of a quoted quoted item, marking the complete item as incomplete", ->
-  expect 3
+QUnit.test "updates the source of a quoted quoted item, marking the complete item as incomplete", (assert) ->
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @innerCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toInnerComplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok !event.detail.checked
-    equal event.detail.index, @innerCompleteItem.expectedIndex
-    equal @field.val(), @changes.toInnerComplete
+  @innerCompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of a quoted quoted item, marking the complete item as incomplete (sourcepos)", (assert) ->
+  @setSourcePosition(@innerCompleteItem, @innerCompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @innerCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toInnerComplete)
 
   @innerCompleteCheckbox.click()
 
-asyncTest "updates the source of an ordered list item, marking the incomplete item as complete", ->
-  expect 3
+QUnit.test "updates the source of an ordered list item, marking the incomplete item as complete", (assert) ->
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @orderedIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toOrderedIncomplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, @orderedIncompleteItem.expectedIndex
-    equal @field.val(), @changes.toOrderedIncomplete
+  @orderedIncompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of an ordered list item, marking the incomplete item as complete (sourcepos)", (assert) ->
+  @setSourcePosition(@orderedIncompleteItem, @orderedIncompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', true)
+  @onChanged(assert).eventHas('index', @orderedIncompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toOrderedIncomplete)
 
   @orderedIncompleteCheckbox.click()
 
-asyncTest "updates the source of an ordered list item, marking the complete item as incomplete", ->
-  expect 3
+QUnit.test "updates the source of an ordered list item, marking the complete item as incomplete", (assert) ->
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @orderedCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toOrderedComplete)
 
-  @field.on 'tasklist:changed', (event) =>
-    ok !event.detail.checked
-    equal event.detail.index, @orderedCompleteItem.expectedIndex
-    equal @field.val(), @changes.toOrderedComplete
+  @orderedCompleteCheckbox.click()
 
-  setTimeout ->
-    start()
-  , 20
+QUnit.test "updates the source of an ordered list item, marking the complete item as incomplete (sourcepos)", (assert) ->
+  @setSourcePosition(@orderedCompleteItem, @orderedCompleteItemSourcePos)
+  @onChanged(assert).eventHas('checked', false)
+  @onChanged(assert).eventHas('index', @orderedCompleteItem.expectedIndex)
+  @onChanged(assert).fieldIs(@changes.toOrderedComplete)
 
   @orderedCompleteCheckbox.click()
 
-asyncTest "update ignores items that look like Task List items but lack list prefix", ->
-  expect 3
+QUnit.test "update ignores items that look like Task List items but lack list prefix", (assert) ->
+  assertItemsLackListPrefix(assert, null, null)
+
+QUnit.test "update ignores items that look like Task List items but lack list prefix (sourcepos)", (assert) ->
+  assertItemsLackListPrefix(assert, '3:1-3:11', '4:1-4:10')
+
+assertItemsLackListPrefix =(assert, sourcepos1, sourcepos2) ->
+  done = assert.async()
+  assert.expect 3
 
   $('#qunit-fixture').empty()
 
@@ -390,6 +434,7 @@ asyncTest "update ignores items that look like Task List items but lack list pre
   list = $ '<ul>', class: 'task-list'
 
   item1 = $ '<li>', class: 'task-list-item'
+  item1.attr('data-sourcepos', sourcepos1) if sourcepos1
   item1Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -397,6 +442,7 @@ asyncTest "update ignores items that look like Task List items but lack list pre
     checked: false
 
   item2 = $ '<li>', class: 'task-list-item'
+  item2.attr('data-sourcepos', sourcepos2) if sourcepos2
   item2Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -432,18 +478,22 @@ asyncTest "update ignores items that look like Task List items but lack list pre
   container.taskList()
 
   field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, item2.expectedIndex
-    equal field.val(), changes
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok event.detail.checked
+    assert.equal event.detail.index, item2.expectedIndex
+    assert.equal field.val(), changes
+    done()
 
   item2Checkbox.click()
 
-asyncTest "update ignores items that look like Task List items but are links", ->
-  expect 3
+QUnit.test "update ignores items that look like Task List items but are links", (assert) ->
+  assertItemsButAreLinks(assert, null, null)
+
+QUnit.test "update ignores items that look like Task List items but are links (sourcepos)", (assert) ->
+  assertItemsButAreLinks(assert, '5:1-5:24', '6:1-6:10')
+
+assertItemsButAreLinks =(assert, sourcepos1, sourcepos2) ->
+  done = assert.async()
+  assert.expect 3
 
   $('#qunit-fixture').empty()
 
@@ -452,6 +502,7 @@ asyncTest "update ignores items that look like Task List items but are links", -
   list = $ '<ul>', class: 'task-list'
 
   item1 = $ '<li>', class: 'task-list-item'
+  item1.attr('data-sourcepos', sourcepos1) if sourcepos1
   item1Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -459,6 +510,7 @@ asyncTest "update ignores items that look like Task List items but are links", -
     checked: false
 
   item2 = $ '<li>', class: 'task-list-item'
+  item2.attr('data-sourcepos', sourcepos2) if sourcepos2
   item2Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -498,18 +550,22 @@ asyncTest "update ignores items that look like Task List items but are links", -
   container.taskList()
 
   field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, item2.expectedIndex
-    equal field.val(), changes
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok event.detail.checked
+    assert.equal event.detail.index, item2.expectedIndex
+    assert.equal field.val(), changes
+    done()
 
   item2Checkbox.click()
 
-asyncTest "updates items followed by links", ->
-  expect 3
+QUnit.test "updates items followed by links", (assert) ->
+  assertItemsFollowedByLinks(assert, null, null)
+
+QUnit.test "updates items followed by links (sourcepos)", (assert) ->
+  assertItemsFollowedByLinks(assert, '1:1-1:24', '2:1-3:0')
+
+assertItemsFollowedByLinks =(assert, sourcepos1, sourcepos2) ->
+  done = assert.async()
+  assert.expect 3
 
   $('#qunit-fixture').empty()
 
@@ -518,6 +574,7 @@ asyncTest "updates items followed by links", ->
   list = $ '<ul>', class: 'task-list'
 
   item1 = $ '<li>', class: 'task-list-item'
+  item1.attr('data-sourcepos', sourcepos1) if sourcepos1
   item1Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -525,6 +582,7 @@ asyncTest "updates items followed by links", ->
     checked: false
 
   item2 = $ '<li>', class: 'task-list-item'
+  item2.attr('data-sourcepos', sourcepos2) if sourcepos2
   item2Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -556,25 +614,30 @@ asyncTest "updates items followed by links", ->
   container.taskList()
 
   field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, item2.expectedIndex
-    equal field.val(), changes
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok event.detail.checked
+    assert.equal event.detail.index, item2.expectedIndex
+    assert.equal field.val(), changes
+    done()
 
   item2Checkbox.click()
 
 # See https://github.com/deckar01/task_list/issues/3
-asyncTest "doesn't update items inside code blocks", ->
-  expect 3
+QUnit.test "doesn't update items inside code blocks", (assert) ->
+  assertItemsInsideCodeBlocks(assert, null, null)
+
+QUnit.test "doesn't update items inside code blocks (sourcepos)", (assert) ->
+  assertItemsInsideCodeBlocks(assert, '6:1-6:11', '7:1-7:11')
+
+assertItemsInsideCodeBlocks =(assert, sourcepos1, sourcepos2) ->
+  done = assert.async()
+  assert.expect 3
 
   container = $ '<div>', class: 'js-task-list-container'
 
   list = $ '<ul>', class: 'task-list'
 
   item1 = $ '<li>', class: 'task-list-item'
+  item1.attr('data-sourcepos', sourcepos1) if sourcepos1
   item1Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -582,6 +645,7 @@ asyncTest "doesn't update items inside code blocks", ->
     checked: false
 
   item2 = $ '<li>', class: 'task-list-item'
+  item2.attr('data-sourcepos', sourcepos2) if sourcepos2
   item2Checkbox = $ '<input>',
     type: 'checkbox'
     class: 'task-list-item-checkbox'
@@ -623,12 +687,9 @@ asyncTest "doesn't update items inside code blocks", ->
   container.taskList()
 
   field.on 'tasklist:changed', (event) =>
-    ok event.detail.checked
-    equal event.detail.index, item2.expectedIndex
-    equal field.val(), changes
-
-  setTimeout ->
-    start()
-  , 20
+    assert.ok event.detail.checked
+    assert.equal event.detail.index, item2.expectedIndex
+    assert.equal field.val(), changes
+    done()
 
   item2Checkbox.click()

data/webpack.config.js

@@ -6,7 +6,7 @@ module.exports = {
     library: 'TaskList',
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.coffee$/,
         loader: 'coffee-loader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deckar01-task_list
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Jared Deckard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -150,20 +150,16 @@ files:
 - package.json
 - script/bootstrap
 - script/cibuild
-- script/testsuite
 - task_list.gemspec
 - test/functional/helpers/remote.coffee
 - test/functional/test_task_lists_behavior.html
-- test/index.html
-- test/run-qunit.coffee
 - test/task_list/filter_test.rb
 - test/task_list/summary_test.rb
 - test/task_list_test.rb
 - test/test_helper.rb
+- test/unit/config.js
 - test/unit/test_events.coffee
 - test/unit/test_updates.coffee
-- test/units.coffee
-- test/units.css
 - webpack.config.js
 homepage: 
 licenses: []
@@ -191,13 +187,10 @@ summary: Markdown TaskList components
 test_files:
 - test/functional/helpers/remote.coffee
 - test/functional/test_task_lists_behavior.html
-- test/index.html
-- test/run-qunit.coffee
 - test/task_list/filter_test.rb
 - test/task_list/summary_test.rb
 - test/task_list_test.rb
 - test/test_helper.rb
+- test/unit/config.js
 - test/unit/test_events.coffee
 - test/unit/test_updates.coffee
-- test/units.coffee
-- test/units.css

data/script/testsuite

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-root = File.expand_path("../..", __FILE__)
-Dir.chdir root
-
-pid = fork do
-  $stderr.reopen "/dev/null" # silence WEBrick output
-  exec 'bundle', 'exec', 'rackup', '-p', '4018'
-end
-sleep 1
-
-status = system('npm', 'run', 'qunit')
-
-Process.kill 'SIGINT', pid
-Process.wait pid
-
-exit status

data/test/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <link rel="stylesheet" href="/assets/units.css">
-  <script type="text/javascript" src="/assets/units.js"></script>
-</head>
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
-</body>
-</html>

data/test/run-qunit.coffee

@@ -1,49 +0,0 @@
-fs = require 'fs'
-
-page = new WebPage()
-page.onConsoleMessage = (msg) -> console.error msg
-
-timeoutId = null
-deferTimeout = ->
-  clearTimeout timeoutId if timeoutId
-  timeoutId = setTimeout ->
-    console.error "Timeout"
-    phantom.exit 1
-  , 3000
-
-page.open phantom.args[0], ->
-  deferTimeout()
-
-  setInterval ->
-    tests = page.evaluate ->
-      tests = document.getElementById('qunit-tests')?.children
-      return unless tests
-      for test in tests when test.className isnt 'running' and not test.recorded
-        test.recorded = true
-        if test.className is 'pass'
-          '.'
-        else if test.className is 'fail'
-          'F'
-
-    return unless tests
-    for test in tests when test
-      deferTimeout()
-      console.error test
-
-    result = page.evaluate ->
-      result = document.getElementById('qunit-testresult')
-      tests  = document.getElementById('qunit-tests').children
-
-      if result.innerText.match /completed/
-        console.error ""
-
-        for test in tests when test.className is 'fail'
-          console.error test.innerText
-
-        console.error result.innerText
-        return parseInt result.getElementsByClassName('failed')[0].innerText
-
-      return
-
-    phantom.exit result if result?
-  , 100

data/test/units.coffee

@@ -1,2 +0,0 @@
-#= require qunit/qunit/qunit
-#= require_directory ./unit

data/test/units.css

@@ -1 +0,0 @@
-/*= require qunit/qunit/qunit */