jenkins-bot has submitted this change and it was merged.
Change subject: Fix quantities without unit
......................................................................
Fix quantities without unit
Bug: T127316
Change-Id: I3eef55f694b516d9b1e5edb9e7732aa7de4f7ee5
---
M src/experts/QuantityInput.js
M tests/src/experts/QuantityInput.tests.js
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, but someone else must approve
Daniel Kinzler: Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/experts/QuantityInput.js b/src/experts/QuantityInput.js
index ebbd272..d3893b2 100644
--- a/src/experts/QuantityInput.js
+++ b/src/experts/QuantityInput.js
@@ -55,7 +55,7 @@
* @inheritdoc
*/
valueCharacteristics: function() {
- return { unit: this._unitSelector.getConceptUri() };
+ return { unit: this._unitSelector.getConceptUri() ||
null };
},
/**
diff --git a/tests/src/experts/QuantityInput.tests.js
b/tests/src/experts/QuantityInput.tests.js
index 6620284..e64980c 100644
--- a/tests/src/experts/QuantityInput.tests.js
+++ b/tests/src/experts/QuantityInput.tests.js
@@ -21,7 +21,7 @@
}
QUnit.test( 'valueCharacteristics', function( assert ) {
- assert.expect( 2 );
+ assert.expect( 3 );
var expert = newExpert(),
characteristics = expert.valueCharacteristics();
@@ -34,6 +34,10 @@
characteristics.unit === null || typeof
characteristics.unit === 'string',
'unit is null or a string'
);
+
+ assert.notOk(
+ characteristics.unit === '', 'unit should not be empty
string'
+ );
} );
}( jQuery, QUnit, jQuery.valueview ) );
--
To view, visit https://gerrit.wikimedia.org/r/271537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eef55f694b516d9b1e5edb9e7732aa7de4f7ee5
Gerrit-PatchSet: 4
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
