jenkins-bot has submitted this change and it was merged.
Change subject: GUI data: Actually do something useful with the normalized type
......................................................................
GUI data: Actually do something useful with the normalized type
Nothing uses normalizedType
Bug: T131971
Change-Id: Ic3103a1d6022cc35602dc7f13b8762eac8af7f80
---
M modules/ext.templateDataGenerator.data.js
M tests/ext.templateData.tests.js
2 files changed, 14 insertions(+), 3 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.templateDataGenerator.data.js
b/modules/ext.templateDataGenerator.data.js
index 31fc4b2..be65dc8 100644
--- a/modules/ext.templateDataGenerator.data.js
+++ b/modules/ext.templateDataGenerator.data.js
@@ -420,7 +420,8 @@
// Translate types
if ( data.type !== undefined ) {
- this.params[ key ].normalizedType =
this.constructor.static.translateObsoleteParamTypes( this.params[ key ].type );
+ data.type =
this.constructor.static.translateObsoleteParamTypes( data.type );
+ this.params[ key ].type = data.type;
}
// Get the deprecated value
diff --git a/tests/ext.templateData.tests.js b/tests/ext.templateData.tests.js
index abf38b1..9441d75 100644
--- a/tests/ext.templateData.tests.js
+++ b/tests/ext.templateData.tests.js
@@ -121,6 +121,9 @@
blah: resultDescBothLang.blah
},
type: undefined
+ },
+ newParam5: {
+ type: 'wiki-page-name'
}
};
finalJsonParams.date.description[ currLanguage ] = 'Timestamp of when
the comment was posted, in YYYY-MM-DD format.';
@@ -426,6 +429,13 @@
result: { name: 'newParam4',
description: resultDescBothLang },
description: 'Some string here in ' +
currLanguage + ' language.',
msg: 'Adding parameter with language
prop: original with multiple languages.'
+ },
+ {
+ key: 'newParam5',
+ data: { type: 'string/wiki-page-name' },
+ result: { name: 'newParam5', type:
'wiki-page-name' },
+ description: '',
+ msg: 'Adding parameter with obsolete
type'
}
],
paramChangeTest = [
@@ -568,7 +578,7 @@
model.reorderParamOrderKey( 'user', 3 );
assert.deepEqual(
model.paramOrder,
- [ 'date', 'year', 'user', 'month',
'comment', 'newParam1', 'newParam2', 'newParam3', 'newParam4' ],
+ [ 'date', 'year', 'user', 'month',
'comment', 'newParam1', 'newParam2', 'newParam3', 'newParam4', 'newParam5' ],
'Final templatedata output with
paramOrder'
);
@@ -576,7 +586,7 @@
model.reorderParamOrderKey( 'month', 2 );
assert.deepEqual(
model.paramOrder,
- [ 'date', 'year', 'month', 'user',
'comment', 'newParam1', 'newParam2', 'newParam3', 'newParam4' ],
+ [ 'date', 'year', 'month', 'user',
'comment', 'newParam1', 'newParam2', 'newParam3', 'newParam4', 'newParam5' ],
'Final templatedata output with
paramOrder'
);
--
To view, visit https://gerrit.wikimedia.org/r/282080
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3103a1d6022cc35602dc7f13b8762eac8af7f80
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TemplateData
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
