Skip to content

Commit 344076c

Browse files
knollearyknolleary
committed
Fix settings tests to remove nodeSettings reference
1 parent 710f1e2 commit 344076c

1 file changed

Lines changed: 30 additions & 28 deletions

File tree

‎test/red/runtime/settings_spec.js‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,18 @@ describe("red/settings", function() {
157157

158158
var safeSettings = {};
159159
settings.exportNodeSettings(safeSettings);
160-
safeSettings["nodeSettings"].should.have.property("injectColor", "red");
161-
safeSettings["nodeSettings"].should.have.property("injectSize", "100");
162-
safeSettings["nodeSettings"].should.not.have.property("mqttColor");
163-
safeSettings["nodeSettings"].should.have.property("mqttSize", "50");
164-
safeSettings["nodeSettings"].should.have.property("httpRequest1", "a1");
165-
safeSettings["nodeSettings"].should.have.property("httpRequest2", "a2");
166-
safeSettings["nodeSettings"].should.have.property("httpRequest3", "a3");
167-
safeSettings["nodeSettings"].should.have.property("mQtTColor", "purple");
168-
safeSettings["nodeSettings"].should.have.property("abc123", "def456");
169-
170-
safeSettings["nodeSettings"].should.have.property("noValueHasValue", "123");
171-
safeSettings["nodeSettings"].should.not.have.property("noValueNoValue");
160+
safeSettings.should.have.property("injectColor", "red");
161+
safeSettings.should.have.property("injectSize", "100");
162+
safeSettings.should.not.have.property("mqttColor");
163+
safeSettings.should.have.property("mqttSize", "50");
164+
safeSettings.should.have.property("httpRequest1", "a1");
165+
safeSettings.should.have.property("httpRequest2", "a2");
166+
safeSettings.should.have.property("httpRequest3", "a3");
167+
safeSettings.should.have.property("mQtTColor", "purple");
168+
safeSettings.should.have.property("abc123", "def456");
169+
170+
safeSettings.should.have.property("noValueHasValue", "123");
171+
safeSettings.should.not.have.property("noValueNoValue");
172172
});
173173

174174
it('prohibits registering the property whose name do not start with type name', function() {
@@ -188,10 +188,10 @@ describe("red/settings", function() {
188188
}).should.throw();
189189
var safeSettings = {};
190190
settings.exportNodeSettings(safeSettings);
191-
safeSettings["nodeSettings"].should.not.have.property("color");
192-
safeSettings["nodeSettings"].should.not.have.property("ab1Color", "blue");
193-
safeSettings["nodeSettings"].should.not.have.property("AB2Color");
194-
safeSettings["nodeSettings"].should.not.have.property("abcColor");
191+
safeSettings.should.not.have.property("color");
192+
safeSettings.should.not.have.property("ab1Color", "blue");
193+
safeSettings.should.not.have.property("AB2Color");
194+
safeSettings.should.not.have.property("abcColor");
195195
});
196196

197197
it('overwrites node settings with user settings', function() {
@@ -205,9 +205,9 @@ describe("red/settings", function() {
205205
settings.registerNodeSettings("ab", {abColor:{value:"red", exportable:false}} );
206206
var safeSettings = {};
207207
settings.exportNodeSettings(safeSettings);
208-
safeSettings["nodeSettings"].should.have.property("injectColor", "green");
209-
safeSettings["nodeSettings"].should.not.have.property("mqttColor");
210-
safeSettings["nodeSettings"].should.not.have.property("abColor");
208+
safeSettings.should.have.property("injectColor", "green");
209+
safeSettings.should.not.have.property("mqttColor");
210+
safeSettings.should.not.have.property("abColor");
211211
});
212212

213213
it('disables/enables node settings', function() {
@@ -219,23 +219,25 @@ describe("red/settings", function() {
219219
settings.registerNodeSettings("mqtt", {mqttColor:{value:"purple", exportable:true}} );
220220
settings.registerNodeSettings("http request", {httpRequestColor:{value:"yellow", exportable:true}} );
221221
settings.exportNodeSettings(safeSettings);
222-
safeSettings["nodeSettings"].should.have.property("injectColor", "red");
223-
safeSettings["nodeSettings"].should.have.property("mqttColor", "purple");
224-
safeSettings["nodeSettings"].should.have.property("httpRequestColor", "yellow");
222+
safeSettings.should.have.property("injectColor", "red");
223+
safeSettings.should.have.property("mqttColor", "purple");
224+
safeSettings.should.have.property("httpRequestColor", "yellow");
225225

226+
safeSettings = {};
226227
var types = ["inject", "mqtt"];
227228
settings.disableNodeSettings(types);
228229
settings.exportNodeSettings(safeSettings);
229-
safeSettings["nodeSettings"].should.not.have.property("injectColor");
230-
safeSettings["nodeSettings"].should.not.have.property("mqttColor");
231-
safeSettings["nodeSettings"].should.have.property("httpRequestColor", "yellow");
230+
safeSettings.should.not.have.property("injectColor");
231+
safeSettings.should.not.have.property("mqttColor");
232+
safeSettings.should.have.property("httpRequestColor", "yellow");
232233

234+
safeSettings = {};
233235
types = ["inject"];
234236
settings.enableNodeSettings(types);
235237
settings.exportNodeSettings(safeSettings);
236-
safeSettings["nodeSettings"].should.have.property("injectColor", "red");
237-
safeSettings["nodeSettings"].should.not.have.property("mqttColor");
238-
safeSettings["nodeSettings"].should.have.property("httpRequestColor", "yellow");
238+
safeSettings.should.have.property("injectColor", "red");
239+
safeSettings.should.not.have.property("mqttColor");
240+
safeSettings.should.have.property("httpRequestColor", "yellow");
239241
});
240242

241243
});

0 commit comments

Comments
 (0)