diff --git a/CHANGELOG.md b/CHANGELOG.md index 6546020..29652ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -[Unreleased] +[1.7.0] --------------------- ##### Added - Check for missing label elements. +##### Changed +- Updated appearances rules with new columns, columns-pack, no-buttons etc. + [1.6.1] - 2019-07-24 --------------------- ##### Changed diff --git a/package-lock.json b/package-lock.json index fd0dc76..15792dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "enketo-validate", - "version": "1.6.1", + "version": "1.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6f7777e..a2dfb6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "enketo-validate", - "version": "1.6.1", + "version": "1.7.0", "description": "An XForm validator around Enketo's form engine", "main": "src/validator.js", "bin": "./validate", diff --git a/src/appearances.json b/src/appearances.json index 5a1249f..5bf3151 100644 --- a/src/appearances.json +++ b/src/appearances.json @@ -22,29 +22,80 @@ "controls": [ "select1", "select" ] }, "horizontal": { - "controls": [ "select", "select1", "range", "input" ] + "controls": [ "range", "input" ] }, "vertical": "horizontal", + "no-buttons": { + "controls": [ "select", "select1" ], + "appearances": [ "columns", "columns-pack", "columns-1", "columns-2", "columns-3", "columns-4", "columns-5", "columns-6", "columns-7", "columns-8", "columns-9", "columns-10" ] + }, "compact": { - "controls": [ "select", "select1", "group" ] + "controls": [ "select", "select1" ], + "preferred": "columns-pack no-buttons" + }, + "columns": { + "controls": [ "select", "select1" ] + }, + "columns-pack": { + "controls": [ "select", "select1" ] }, "no-collapse": { "controls": [ "group" ] }, "horizontal-compact": { "controls": [ "select", "select1" ], - "preferred": "compact" - }, - "compact-1": "compact", - "compact-2": "compact", - "compact-3": "compact", - "compact-4": "compact", - "compact-5": "compact", - "compact-6": "compact", - "compact-7": "compact", - "compact-8": "compact", - "compact-9": "compact", - "compact-10": "compact", + "preferred": "columns-pack" + }, + "compact-1": { + "controls": [ "select", "select1" ], + "preferred": "columns-1 no-buttons" + }, + "compact-2": { + "controls": [ "select", "select1" ], + "preferred": "columns-2 no-buttons" + }, + "compact-3": { + "controls": [ "select", "select1" ], + "preferred": "columns-3 no-buttons" + }, + "compact-4": { + "controls": [ "select", "select1" ], + "preferred": "columns-4 no-buttons" + }, + "compact-5": { + "controls": [ "select", "select1" ], + "preferred": "columns-5 no-buttons" + }, + "compact-6": { + "controls": [ "select", "select1" ], + "preferred": "columns-6 no-buttons" + }, + "compact-7": { + "controls": [ "select", "select1" ], + "preferred": "columns-7 no-buttons" + }, + "compact-8": { + "controls": [ "select", "select1" ], + "preferred": "columns-8 no-buttons" + }, + "compact-9": { + "controls": [ "select", "select1" ], + "preferred": "columns-9 no-buttons" + }, + "compact-10": { + "controls": [ "select", "select1" ], + "preferred": "columns-10 no-buttons" + }, + "columns-1": "columns", + "columns-2": "columns", + "columns-3": "columns", + "columns-4": "columns", + "columns-5": "columns", + "columns-6": "columns", + "columns-7": "columns", + "columns-8": "columns", + "columns-9": "columns", + "columns-10": "columns", "quick": { "controls": [ "select", "select1" ] }, diff --git a/test/spec/xform.spec.js b/test/spec/xform.spec.js index 77fc75d..bb5b0aa 100644 --- a/test/spec/xform.spec.js +++ b/test/spec/xform.spec.js @@ -120,9 +120,12 @@ describe( 'XForm', () => { expect( arrContains( result.warnings, /"compact" for question "e"/i ) ).to.equal( true ); expect( arrContains( result.warnings, /"compact-19" for question "f"/i ) ).to.equal( true ); expect( arrContains( result.warnings, /"numbers" for question "g"/i ) ).to.equal( true ); - expect( arrContains( result.warnings, /"horizontal-compact" for question "k" .+ deprecated.+"compact"/i ) ).to.equal( true ); - expect( arrContains( result.warnings, /"field-list" for question "two"/i ) ).to.equal( true ); expect( arrContains( result.warnings, /"no-ticks" for question "g"/i ) ).to.equal( true ); + expect( arrContains( result.warnings, /"maps" for question "h"/i ) ).to.equal( true ); + expect( arrContains( result.warnings, /"signature" for question "h"/i ) ).to.equal( true ); + expect( arrContains( result.warnings, /"pulldown" for question "i"/i ) ).to.equal( true ); + expect( arrContains( result.warnings, /"horizontal-compact" for question "k" .+ deprecated.+"columns-pack"/i ) ).to.equal( true ); + expect( arrContains( result.warnings, /"field-list" for question "two"/i ) ).to.equal( true ); } ); it( 'outputs no errors', () => {