Merge 7989dde into 83b4074

wikimedia · Aug 16, 2018 · 8655225 · 8655225
2 parents 83b4074 + 7989dde
commit 8655225
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/sys/page_revisions.js b/sys/page_revisions.js
@@ -542,7 +542,7 @@ class PRS {
                 action: 'query',
                 prop: 'info|revisions',
                 continue: '',
-                rvprop: 'ids|timestamp|user|userid|size|sha1|contentmodel|comment|tags'
+                rvprop: 'ids|timestamp|user|userid|size|sha1|comment|tags'
             }
         };
         if (/^[0-9]+$/.test(rp.revision)) {

diff --git a/test/features/errors/invalid_request.js b/test/features/errors/invalid_request.js
@@ -35,7 +35,7 @@ parallel('400 handling', function() {
                     action: 'query',
                     prop: 'info|revisions',
                     continue: '',
-                    rvprop: 'ids|timestamp|user|userid|size|sha1|contentmodel|comment|tags',
+                    rvprop: 'ids|timestamp|user|userid|size|sha1|comment|tags',
                     format: 'json',
                     formatversion: 2,
                     titles: 'Main_Page'

diff --git a/test/features/pagecontent/access_checks.js b/test/features/pagecontent/access_checks.js
@@ -25,7 +25,6 @@ describe('Access checks', () => {
                         'pageid': 49453581,
                         'ns': 0,
                         title,
-                        'contentmodel': 'wikitext',
                         'pagelanguage': 'en',
                         'touched': '2015-05-22T08:49:39Z',
                         'lastrevid': revision,
@@ -37,7 +36,6 @@ describe('Access checks', () => {
                             'timestamp': '2015-03-25T20:29:50Z',
                             'size': 2941,
                             'sha1': 'c47571122e00f28402d2a1b75cff77a22e7bfecd',
-                            'contentmodel': 'wikitext',
                             'comment': 'Test',
                             'tags': []
                         }]
@@ -253,14 +251,12 @@ describe('Access checks', () => {
                 "userid": 6591,
                 "timestamp": "2015-02-03T21:15:55Z",
                 "size": 7700,
-                "contentmodel": "wikitext",
                 "tags": []
             };
             const normalResponse = {
                 "pageid": 152993,
                 "ns": 3,
                 "title": pageTitle,
-                "contentmodel": "wikitext",
                 "pagelanguage": "en",
                 "pagelanguagehtmlcode": "en",
                 "pagelanguagedir": "ltr",

diff --git a/test/features/pagecontent/save_api.js b/test/features/pagecontent/save_api.js
@@ -256,7 +256,6 @@ describe('page save api', function() {
                     result: "Success",
                     pageid: 127114,
                     title: "Save test",
-                    contentmodel: "wikitext",
                     oldrevid: 275830,
                     newrevid: 275831,
                     newtimestamp: now
@@ -271,7 +270,6 @@ describe('page save api', function() {
                             'pageid': 127114,
                             'ns': 0,
                             'title': 'Save test',
-                            'contentmodel': 'wikitext',
                             'pagelanguage': 'en',
                             'touched': now,
                             'lastrevid': 275831,
@@ -283,7 +281,6 @@ describe('page save api', function() {
                                 'timestamp': now,
                                 'size': 2941,
                                 'sha1': 'c47571122e00f28402d2a1b75cff77a22e7bfecd',
-                                'contentmodel': 'wikitext',
                                 'comment': 'Test',
                                 'tags': []
                             }]
@@ -326,7 +323,6 @@ describe('page save api', function() {
                     result: "Success",
                     pageid: 127114,
                     title: "Save test",
-                    contentmodel: "wikitext",
                     nochange: true
                 }
             });
@@ -419,7 +415,6 @@ describe('page save api', function() {
                     result: "Success",
                     pageid: 46950417,
                     title: "Save_Test",
-                    contentmodel: "wikitext",
                     oldrevid: 680525605,
                     newrevid: 680525800,
                     newtimestamp: new Date().toISOString()