Skip to content

Commit

Permalink
remove 3 unused parameters from AFCH.addTalkPageBanners
Browse files Browse the repository at this point in the history
  • Loading branch information
@NovemLinguae
NovemLinguae committed Aug 23, 2024
1 parent 0f274a0 commit 3a60f43
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 127 deletions.
10 changes: 2 additions & 8 deletions src/modules/core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1648,17 +1648,11 @@
* @param {Array} newWikiProjects Value of the "Add WikiPrjects" part of the form. The <input> is a chips interface called jquery.chosen. Note that if there are existing WikiProject banners on the page, the form will auto-add those to the "Add WikiProjects" part of the form when it first loads.
* @param {string} lifeStatus Value of "Is the subject alive?" dropdown list ("unknown", "living", "dead")
* @param {string} subjectName Value of the "Subject name (last, first)" text input, or "" if blank
* @param {Array<Object>} existingWikiProjects An array of associative arrays. The associative arrays contain the keys:
* 1) {string} displayName (example: Somalia),
* 2) {string} templateName (example: WikiProject Somalia),
* 3) {boolean} alreadyOnPage
* @param {boolean} alreadyHasWPBio
* @param {null} existingWPBioTemplateName
* @return {Object}
* 1) {string} talkText
* 2) {number} wikiProjectBannerCount
*/
addTalkPageBanners: function ( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName ) {
addTalkPageBanners: function ( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName ) {
// build an array of all banners already on page
var bannerTemplates = 'wikiproject (?!banner)|football|oka';
var bannerTemplateRegEx = new RegExp( '{{(?:' + bannerTemplates + ')[^}]+}}', 'gi' );
Expand All @@ -1674,7 +1668,7 @@
var bannerShellRegEx = new RegExp( '{{(?:' + bannerShellTemplates + ')[^}]*}}', 'is' );
talkText = talkText.replace( bannerShellRegEx, '' );

// trim
// trim. makes unit tests more stable
talkText = talkText.trim();

// add AFC banner to array
Expand Down
5 changes: 1 addition & 4 deletions src/modules/submissions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2395,10 +2395,7 @@
data.isBiography,
data.newWikiProjects,
data.lifeStatus,
data.subjectName,
data.existingWikiProjects,
data.alreadyHasWPBio,
data.existingWPBioTemplateName
data.subjectName
);
talkText = results.talkText;

Expand Down
128 changes: 13 additions & 115 deletions tests/test-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,7 @@ describe( 'AFCH.addTalkPageBanners', function () {
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{subst:WPAFC/article|oldid=592485}}
Expand All @@ -152,10 +149,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{subst:WPAFC/article|oldid=592485}}
Expand All @@ -178,10 +172,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -192,7 +183,6 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
expect( output.wikiProjectBannerCount ).toBe( 2 );
} );

// FIXME: we probably need to write code that cuts every existing WikiProject banner template and pastes it at the top of the page
it( 'talk page has existing templates, WikiProject banners on bottom', function () {
var talkText =
`{{translated page|ar|بحيرة كناو|version=|small=no|insertversion=|section=}}
Expand All @@ -204,10 +194,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -227,10 +214,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -251,26 +235,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Somalia', 'WikiProject Women', 'WikiProject Women\'s sport' ];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [
{
displayName: 'Somalia',
templateName: 'WikiProject Somalia',
alreadyOnPage: true
},
{
displayName: 'Women',
templateName: 'WikiProject Women',
alreadyOnPage: true
},
{
displayName: 'Women\'s sport',
templateName: 'WikiProject Women\'s sport',
alreadyOnPage: true
}
];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -295,26 +260,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Somalia', 'WikiProject Women', 'WikiProject Women\'s sport' ];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [
{
displayName: 'Somalia',
templateName: 'WikiProject Somalia',
alreadyOnPage: true
},
{
displayName: 'Women',
templateName: 'WikiProject Women',
alreadyOnPage: true
},
{
displayName: 'Women\'s sport',
templateName: 'WikiProject Women\'s sport',
alreadyOnPage: true
}
];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -340,13 +286,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Romania' ];
var lifeStatus = 'living';
var subjectName = 'Lazarut, Raluca';
// FIXME: existing WikiProject detection is broken. i don't think this is used to modify the draft talk wikicode in any way. but i do think it might be used to populate the existing WikiProject chips on the accept screen. for this test case, there were no chips, when there should have been 4 (film, biography, women, television).
var existingWikiProjects = [];
// FIXME: is there even a way for this to be set to true? no test case uses it. delete?
var alreadyHasWPBio = false;
// FIXME: is there even a way for this to be set to not null? no test case uses it. delete?
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Film}}
Expand All @@ -373,26 +313,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Women', 'WikiProject Women\'s sport' ];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [
{
displayName: 'Somalia',
templateName: 'WikiProject Somalia',
alreadyOnPage: true
},
{
displayName: 'Women',
templateName: 'WikiProject Women',
alreadyOnPage: true
},
{
displayName: 'Women\'s sport',
templateName: 'WikiProject Women\'s sport',
alreadyOnPage: true
}
];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Women}}
Expand All @@ -412,10 +333,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Africa', 'WikiProject Alabama' ];
var lifeStatus = 'living';
var subjectName = 'Jones, Bob';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|class=B|
{{subst:WPAFC/article|oldid=592496}}
Expand All @@ -435,10 +353,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'dead';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{subst:WPAFC/article|oldid=592496}}
Expand All @@ -459,21 +374,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [ 'WikiProject Biography', 'WikiProject Somalia' ];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [
{
displayName: 'Biography',
templateName: 'WikiProject Biography',
alreadyOnPage: true
},
{
displayName: 'Somalia',
templateName: 'WikiProject Somalia',
alreadyOnPage: true
}
];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|
{{WikiProject Somalia}}
Expand All @@ -491,10 +392,7 @@ I have a question. Can you help answer it? –[[User:Novem Linguae|<span style="
var newWikiProjects = [];
var lifeStatus = 'unknown';
var subjectName = '';
var existingWikiProjects = [];
var alreadyHasWPBio = false;
var existingWPBioTemplateName = null;
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName, existingWikiProjects, alreadyHasWPBio, existingWPBioTemplateName );
var output = AFCH.addTalkPageBanners( talkText, newAssessment, revId, isBiography, newWikiProjects, lifeStatus, subjectName );
expect( output.talkText ).toBe(
`{{WikiProject banner shell|class=disambig|
{{subst:WPAFC/article|oldid=592681}}
Expand Down

0 comments on commit 3a60f43

Please sign in to comment.