fix: set _defaultRequired = true

Page default required (#48)

* Fix: Change _defaultRequired = true in ctor

* Test: Fix tests for new default setting

Author: erodewald

lib/pages/page.js

@@ -16,7 +16,7 @@ module.exports = class Page {
 		}
 
 		this._settingIds = []
-		this._defaultRequired = true
+		this._defaultRequired = false
 	}
 
 	async section(name, closure) {
@@ -67,6 +67,11 @@ module.exports = class Page {
 		return this
 	}
 
+	/**
+	 * Automatically applies the `required: true` field to all section settings
+	 * @param {Boolean} value defaults to false
+	 * @returns {Page} instance of Page
+	 */
 	defaultRequired(value) {
 		this._defaultRequired = value
 		return this

test/pagebuilder-i18n-spec.js

@@ -33,7 +33,6 @@ describe('pagebuilder-i18n-spec', () => {
 		expect(json.sections[0].settings[0].id).to.equal('contactSensor')
 		expect(json.sections[0].settings[0].name).to.equal('Sélectionnez un capteur d\'ouverture / fermeture')
 		expect(json.sections[0].settings[0].description).to.equal('Appuyez pour définir')
-		expect(json.sections[0].settings[0].required).to.equal(true)
 		expect(json.sections[0].settings[0].multiple).to.equal(false)
 		expect(json.sections[0].settings[0].type).to.equal('DEVICE')
 		expect(json.sections[0].settings[0].permissions[0]).to.equal('r')
@@ -44,7 +43,6 @@ describe('pagebuilder-i18n-spec', () => {
 		expect(json.sections[1].settings[0].id).to.equal('lights')
 		expect(json.sections[1].settings[0].name).to.equal('Sélectionnez une ou plusieurs lumières à contrôler')
 		expect(json.sections[0].settings[0].description).to.equal('Appuyez pour définir')
-		expect(json.sections[1].settings[0].required).to.equal(true)
 		expect(json.sections[1].settings[0].multiple).to.equal(true)
 		expect(json.sections[1].settings[0].type).to.equal('DEVICE')
 		expect(json.sections[1].settings[0].permissions[0]).to.equal('r')

test/pagebuilder-spec.js

@@ -13,7 +13,7 @@ describe('pagebuilder', () => {
 
 	it('should process one section', () => {
 		const page = new Page('mainPage')
-
+		page.defaultRequired(true)
 		page.section('When this door opens and closes', section => {
 			section.deviceSetting('contactSensor')
 				.capabilities(['contactSensor'])
@@ -37,7 +37,7 @@ describe('pagebuilder', () => {
 
 	it('should process two sections', () => {
 		const page = new Page('mainPage')
-
+		page.defaultRequired(true)
 		page.section('When this door opens and closes', section => {
 			section.deviceSetting('contactSensor')
 				.capabilities(['contactSensor'])
@@ -82,7 +82,7 @@ describe('pagebuilder', () => {
 
 	it('should process unnamed section', () => {
 		const page = new Page('mainPage')
-
+		page.defaultRequired(true)
 		page.section(section => {
 			section.deviceSetting('contactSensor')
 				.capabilities(['contactSensor'])
@@ -125,10 +125,8 @@ describe('pagebuilder', () => {
 
 	it('should honor default required', () => {
 		const page = new Page('mainPage')
-		page.defaultRequired(false)
-
+		page.defaultRequired(true)
 		page.section('When this door opens and closes', section => {
-			section.defaultRequired(true)
 			section.deviceSetting('contactSensor')
 				.capabilities(['contactSensor'])
 				.name('Select an open/close sensor')
@@ -150,7 +148,7 @@ describe('pagebuilder', () => {
 		// Console.log(JSON.stringify(json, null, 2))
 		expect(json.sections[0].settings[0].required).to.equal(true)
 		expect(json.sections[0].settings[1].required).to.equal(false)
-		expect(json.sections[1].settings[0].required).to.equal(false)
+		expect(json.sections[1].settings[0].required).to.equal(true)
 	})
 
 	it('options formats', () => {
@@ -199,4 +197,16 @@ describe('pagebuilder', () => {
 		expect(json.sections[0].settings[0].page).to.equal('anotherPage')
 		expect(json.sections[0].settings[0].required).to.equal(undefined)
 	})
+
+	it('page defaultRequired adds required:true', () => {
+		const page = new Page('mainPage')
+		page.defaultRequired(true)
+		page.section(section => {
+			section.paragraphSetting('mainParagraph')
+		})
+
+		const json = page.toJson()
+		// Console.log(JSON.stringify(json, null, 2))
+		expect(json.sections[0].settings[0].required).to.equal(true)
+	})
 })

test/smartapp-page-spec.js

@@ -10,13 +10,15 @@ describe('smartapp-page-spec', () => {
 			page.section('whenDoorOpensAndCloses', section => {
 				section.deviceSetting('contactSensor')
 					.capabilities(['contactSensor'])
+					.required(true)
 			})
 
 			page.section('turnLightsOnAndOff', section => {
 				section.deviceSetting('lights')
 					.capabilities(['switch'])
 					.multiple(true)
 					.permissions('rx')
+					.required(true)
 			})
 		})