updated normalize filter and added a test

Updated lib/normalize_title_filter.js to better follow format of lib/mwUtil.js Modified lib/mwUtil.js to use {term} if present Removed previous wiktionary test and replaced with one test that checks filter
wikimedia · Oct 26, 2018 · 259dd87 · 259dd87
1 parent 3fedd1b
commit 259dd87
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 44 deletions.
diff --git a/lib/mwUtil.js b/lib/mwUtil.js
@@ -341,7 +341,8 @@ mwUtil.createRelativeTitleRedirect = (path, req, options) => {
     const backString = Array.apply(null, { length: pathSuffixCount }).map(() => '../').join('');
     let location;
     if (!options.dropPathAfterTitle) {
-        const pathPatternAfterTitle = path.substring(path.indexOf('{title}') - 1);
+        let pathPatternAfterTitle = path.substring(path.indexOf(`{${titleParamName}`) - 1);
+        pathPatternAfterTitle = pathPatternAfterTitle.replace(/term/, 'title');
         location = backString
             + new URI(pathPatternAfterTitle, newReqParams, true).toString().substr(1)
             + mwUtil.getQueryString(req);

diff --git a/lib/normalize_title_filter.js b/lib/normalize_title_filter.js
@@ -29,7 +29,7 @@ module.exports = (hyper, req, next, options, specInfo) => {
             }
         });
     }
-    rp.title = rp[options.title] ? rp[options.title] : rp.title;
+    rp.title = (options.title && rp[options.title]) || rp.title;
     if (!rp.title) {
         return next(hyper, req);
     }
@@ -59,7 +59,9 @@ module.exports = (hyper, req, next, options, specInfo) => {
                 return P.resolve({
                     status: 301,
                     headers: {
-                        location: mwUtil.createRelativeTitleRedirect(specInfo.path, req),
+                        location: mwUtil.createRelativeTitleRedirect(specInfo.path, req, {
+                            titleParamName: options.title
+                        }),
                         'cache-control': options.redirect_cache_control || 'no-cache'
                     }
                 });

diff --git a/test/features/pagecontent/redirects.js b/test/features/pagecontent/redirects.js
@@ -9,53 +9,14 @@ describe('redirects', () => {
     before(() => { return server.start(); });
 
     describe('', () => {
-        it('should direct to a lowercase version of a title in wiktionary', () => {
-            return preq.get({
-                uri: `${server.config.wiktionaryURI}/page/definition/cat`,
-                followRedirect: false
-            })
-            .then((res) => {
-                assert.deepEqual(res.status, 200);
-                assert.deepEqual(res.headers['content-location'],
-                    'https://en.wiktionary.org/api/rest_v1/page/definition/cat');
-                assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
-            });
-        });
-
-        it('should direct to an uppercase version of a title in wiktionary', () => {
-            return preq.get({
-                uri: `${server.config.wiktionaryURI}/page/definition/Cat`,
-                followRedirect: false
-            })
-                .then((res) => {
-                    assert.deepEqual(res.status, 200);
-                    assert.deepEqual(res.headers['content-location'],
-                        'https://en.wiktionary.org/api/rest_v1/page/definition/Cat');
-                    assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
-                });
-        });
-
         it('should redirect to a normalized version of a title in wiktionary', () => {
             return preq.get({
-                uri: `${server.config.wiktionaryURI}/page/definition/Appendix%20Glossary`,
-                followRedirect: false
-            })
-                .then((res) => {
-                    assert.deepEqual(res.status, 301);
-                    assert.deepEqual(res.headers.location,
-                        '../../../en.wiktionary.org/v1/page/definition/Appendix%20Glossary');
-                    assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
-                });
-        });
-        it('should redirect to a normalized version of a title in wiktionary, #2', () => {
-            return preq.get({
-                uri: `${server.config.wiktionaryURI}/page/definition/Wiktionary%20ELE`,
+                uri: `${server.config.wiktionaryURI}/page/definition/weekend%20warrior`,
                 followRedirect: false
             })
                 .then((res) => {
                     assert.deepEqual(res.status, 301);
-                    assert.deepEqual(res.headers.location,
-                        '../../../en.wiktionary.org/v1/page/definition/Wiktionary%20ELE');
+                    assert.deepEqual(res.headers.location, 'weekend_warrior');
                     assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
                 });
         });
@@ -66,6 +27,7 @@ describe('redirects', () => {
                 followRedirect: false
             })
             .then((res) => {
+                console.log(res);
                 assert.deepEqual(res.status, 301);
                 assert.deepEqual(res.headers.location, 'Main_Page?test=mwAQ');
                 assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');