deckar01-task_list 2.3.2 → 2.3.4

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckar01-task_list",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Markdown TaskList components",
   "main": "dist/task_list.js",
   "directories": {
@@ -11,16 +11,16 @@
   ],
   "scripts": {
     "test": "script/cibuild",
-    "qunit": "karma start test/unit/config.js",
+    "unit": "web-test-runner bin/test/unit/*.js",
     "lint": "coffeelint app/assets/javascripts/task_list.coffee",
-    "build:css": "node-sass -o dist/ app/assets/stylesheets/task_list.scss",
-    "build:js": "webpack",
+    "build:css": "sass --no-source-map app/assets/stylesheets/task_list.scss dist/task_list.css",
+    "build:js": "node build.mjs",
     "build": "npm run build:css && npm run build:js",
-    "prepublish": "npm run build"
+    "prepare": "npm run build"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/deckar01/task_list.git"
+    "url": "git+https://gitlab.com/deckar01/task_list.git"
   },
   "keywords": [
     "task",
@@ -32,24 +32,19 @@
   "author": "Jared Deckard <jared.deckard@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/deckar01/task_list/issues"
+    "url": "https://gitlab.com/deckar01/task_list/issues"
   },
-  "homepage": "https://github.com/deckar01/task_list#readme",
+  "homepage": "https://gitlab.com/deckar01/task_list#task-lists",
   "devDependencies": {
-    "bower": "^1.8.0",
-    "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",
-    "qunit": "^2.9.3",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10"
-  },
-  "dependencies": {}
+    "@esm-bundle/chai": "^4.3.4-fix.0",
+    "@web/test-runner": "^0.17.0",
+    "bower": "^1.8.14",
+    "coffeelint": "^2.1.0",
+    "coffeescript": "^2.7.0",
+    "esbuild": "^0.19.0",
+    "esbuild-coffeescript": "^2.2.0",
+    "esbuild-plugin-umd-wrapper": "^1.0.7",
+    "jquery": "^3.7.0",
+    "sass": "^1.65.1"
+  }
 }

data/script/bootstrap

@@ -1,9 +1,16 @@
 #!/bin/sh
 set -e 0
 
+wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list
+curl -sL https://deb.nodesource.com/setup_19.x | bash - 
+apt-get update -qq && apt-get install -y nodejs google-chrome-stable
+
+gem install bundler
+
 if ! bundle check 1>/dev/null 2>&1; then
   bundle install --no-color --binstubs --path vendor/gems
 fi
 
 npm install
-./node_modules/bower/bin/bower install --no-color
+npm exec -- bower install --no-color

data/script/cibuild

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

data/task_list.gemspec

@@ -15,14 +15,21 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.homepage      = "https://gitlab.com/deckar01/task_list"
+  gem.license       = "MIT"
+  gem.metadata      = {
+    "homepage_uri"    => "https://gitlab.com/deckar01/task_list",
+    "bug_tracker_uri" => "https://gitlab.com/deckar01/task_list/-/issues",
+    "source_code_uri" => "https://gitlab.com/deckar01/task_list"
+  }
 
   gem.required_ruby_version = ">= 2.0.0"
 
   gem.add_dependency "activesupport", "~> 4.0" if RUBY_VERSION < '2.2.2'
   gem.add_dependency "nokogiri", "~> 1.6.0" if RUBY_VERSION < '2.1.0'
-  gem.add_dependency "html-pipeline"
+  gem.add_dependency "html-pipeline", "~> 2.0"
 
-  gem.add_development_dependency "commonmarker"
+  gem.add_development_dependency "commonmarker", "~> 0.23"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "coffee-script"
   gem.add_development_dependency "json"

data/test/task_list/filter_test.rb

@@ -113,6 +113,24 @@ class TaskList::FilterTest < Minitest::Test
     assert_equal 2, filter(text)[:output].css('.task-list-item .task-list-item .task-list-item').size
   end
 
+  def test_handles_nested_inside_regular_list_item
+    text = <<-md
+- Item one
+  - [ ] subitem one
+    md
+    assert item = filter(text)[:output].css('ul:not(.task-list) li:not(.task-list-item) ul.task-list .task-list-item').pop
+  end
+
+  def test_handles_nested_inside_multiple_regular_list_items
+    text = <<-md
+- Item one
+  - [ ] subitem one
+- Item two
+  - [ ] subitem two
+    md
+    assert_equal 2, filter(text)[:output].css('ul:not(.task-list) li:not(.task-list-item) ul.task-list .task-list-item').size
+  end
+
   # NOTE: This is an edge case experienced regularly by users using a Swiss
   # German keyboard.
   # See: https://github.com/github/github/pull/18362
@@ -141,6 +159,15 @@ class TaskList::FilterTest < Minitest::Test
     assert_equal 2, filter(text)[:output].css("[checked]").size
   end
 
+  def test_dangling_checkbox
+    text = <<-md
+- one
+  - foo
+    [ ] bar
+    md
+    assert_equal 0, filter(text)[:output].css(@item_selector).size
+  end
+
   protected
 
   def filter(input, context = @context, result = nil)

data/test/unit/test_events.coffee

@@ -1,8 +1,8 @@
 window.$ = window.jQuery = require('jquery')
-window.TaskList = require('../../app/assets/javascripts/task_list')
+window.TaskList = require('../../app/assets/javascripts/task_list.coffee')
 
-QUnit.module "TaskList events",
-  beforeEach: ->
+describe "TaskList events", ->
+  beforeEach ->
     @container = $ '<div>', class: 'js-task-list-container'
 
     @list = $ '<ul>', class: 'task-list'
@@ -21,78 +21,56 @@ QUnit.module "TaskList events",
 
     @container.append @field
 
-    $('#qunit-fixture').append(@container)
+    $('body').append @container
     @container.taskList()
 
-  afterEach: ->
+  afterEach ->
     $(document).off 'tasklist:enabled'
     $(document).off 'tasklist:disabled'
     $(document).off 'tasklist:change'
     $(document).off 'tasklist:changed'
+    @container.remove()
 
-QUnit.test "triggers a tasklist:change event before making task list item changes", (assert) ->
-  done = assert.async()
-  assert.expect 1
+  it "triggers a tasklist:change event before making task list item changes", (done) ->
+    @field.on 'tasklist:change', -> done()
 
-  @field.on 'tasklist:change', (event, index, checked) ->
-    assert.ok true
-    done()
+    @checkbox.click()
 
-  @checkbox.click()
+  it "triggers a tasklist:changed event once a task list item changes", (done) ->
+    @field.on 'tasklist:changed', -> done()
 
-QUnit.test "triggers a tasklist:changed event once a task list item changes", (assert) ->
-  done = assert.async()
-  assert.expect 1
+    @checkbox.click()
 
-  @field.on 'tasklist:changed', (event, index, checked) ->
-    assert.ok true
-    done()
+  it "can cancel a tasklist:changed event", ->
+    event1 = new Promise (resolve) =>
+      @field.on 'tasklist:change', (event) ->
+        event.preventDefault()
+        resolve()
 
-  @checkbox.click()
+    flush = null
+    event2 = new Promise (resolve, reject) =>
+      @field.on 'tasklist:changed', -> reject()
+      flush = resolve
 
-QUnit.test "can cancel a tasklist:changed event", (assert) ->
-  done = assert.async()
-  done2 = assert.async()
-  assert.expect 2
+    @checkbox.click()
 
-  @field.on 'tasklist:change', (event, index, checked) ->
-    assert.ok true
-    event.preventDefault()
-    done2()
+    await event1
+    flush()
+    await event2
 
-  @field.on 'tasklist:changed', (event, index, checked) ->
-    assert.ok false
-
-  before = @checkbox.val()
-  setTimeout =>
-    assert.ok true
-    done()
-  , 20
-
-  @checkbox.click()
-
-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) ->
-    assert.ok true
-    done()
-  
-  @container.taskList()
-
-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) ->
-    assert.ok false
+  it "enables task list items when a .js-task-list-field is present", (done) ->
+    $(document).on 'tasklist:enabled', -> done()
+    
+    @container.taskList()
 
-  @field.remove()
+  it "doesn't enable task list items when a .js-task-list-field is absent", ->
+    flush = null
+    event = new Promise (resolve, reject) ->
+      $(document).on 'tasklist:enabled', -> reject()
+      flush = resolve
 
-  @container.taskList()
+    @field.remove()
+    @container.taskList()
 
-  setTimeout =>
-    assert.ok true
-    done()
-  , 20
+    flush()
+    await event