Skip to content

Commit

Permalink
Merge pull request #1315 from johngian/unblock-ci
Browse files Browse the repository at this point in the history 
ci: Fix test failures
  • Loading branch information
@johngian
johngian committed Feb 16, 2023
2 parents c1d391c + d27f246 commit 399e648
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
4 changes: 2 additions & 2 deletions test/features/pagecontent/language_variants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('Language variants', function() {
assert.deepEqual(res.status, 200);
assert.validateListHeader(res.headers.vary, { require: ['Accept', 'Accept-Language'] });
assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
assert.deepEqual(res.headers['content-language'], 'sr-ec');
assert.deepEqual(res.headers['content-language'], 'sr-Cyrl');
assert.checkString(res.headers.etag, /^"\d+\/[a-f0-9-]+"$/);
assert.deepEqual(/1\. Ово је тестна страница/.test(res.body), true);
assert.deepEqual(/2\. Ово је тестна страница/.test(res.body), true);
Expand All @@ -140,7 +140,7 @@ describe('Language variants', function() {
assert.deepEqual(res.status, 200);
assert.validateListHeader(res.headers.vary, { require: ['Accept', 'Accept-Language'] });
assert.deepEqual(res.headers['cache-control'], 'test_purged_cache_control');
assert.deepEqual(res.headers['content-language'], 'sr-el');
assert.deepEqual(res.headers['content-language'], 'sr-Latn');
assert.checkString(res.headers.etag, /^"\d+\/[a-f0-9-]+"$/);
assert.deepEqual(/1\. Ovo je testna stranica/.test(res.body), true);
assert.deepEqual(/2\. Ovo je testna stranica/.test(res.body), true);
Expand Down
28 changes: 19 additions & 9 deletions test/features/pagecontent/rerendering.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,23 @@ describe('page re-rendering', function() {
let r1etag1;
let r1etag2;
let r2etag1;
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic1}?stash=true`})
.then((res) => {
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic2}?stash=true`})
.then(async (res) => {
assert.deepEqual(res.status, 200);
r1etag1 = res.headers.etag;
hasTextContentType(res);

let purgeRes = await preq.post({
uri: `${server.config.apiURL('en.wikipedia.beta.wmflabs.org')}`,
body: {
action: "purge",
revids: "275851"
}
})
// delay for 1s to make sure that the timestamp differs on re-render
return P.delay(1500)
return P.delay(3000)
.then(() => {
return preq.get({
uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic1}?stash=true`,
uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic2}?stash=true`,
headers: { 'cache-control': 'no-cache' }
});
});
Expand All @@ -50,21 +56,25 @@ describe('page re-rendering', function() {
assert.notDeepEqual(r1etag2, r1etag1);
assert.notDeepEqual(r1etag2, undefined);
hasTextContentType(res);
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic1}}`});
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic2}}`});
})
.then((res) => {
assert.deepEqual(res.headers.etag, r1etag2);
hasTextContentType(res);
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic2}?stash=true`});
return preq.get({
uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic1}?stash=true`,
headers: { 'cache-control': 'no-cache' }
});
})
.then((res) => {
r2etag1 = res.headers.etag;
assert.deepEqual(res.status, 200);
hasTextContentType(res);
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic2}`});
return preq.get({uri: `${server.config.bucketURL('en.wikipedia.beta.wmflabs.org')}${dynamic1}`});
})
.then((res) => {
assert.deepEqual(res.headers.etag, r2etag1);
// old revisions are not cached
assert.notDeepEqual(res.headers.etag, r2etag1);
hasTextContentType(res);
});
});
Expand Down
8 changes: 4 additions & 4 deletions test/features/pcs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ describe('Page Content Service: transforms', () => {
return preq.post({
uri: `${server.config.baseURL('sr.wikipedia.beta.wmflabs.org')}/transform/wikitext/to/mobile-html/RESTBase_Testing_Page`,
headers: {
'accept-language': 'sr-ec'
'accept-language': 'sr-Cyrl'
},
body: { wikitext: 'Ово је тестна страница - 1\n\nOvo je testna stranica - 2' }
})
.then((res) => {
assert.deepEqual(res.status, 200);
assert.deepEqual(res.headers['content-language'], 'sr-ec');
assert.deepEqual(res.headers['content-language'], 'sr-Cyrl');
assert.checkString(res.headers['cache-control'], /private/, 'Must not be cached');
assert.checkString(res.body, /Ово је тестна страница - 1/, 'Must not convert cyrillic with cyrillic variant');
assert.checkString(res.body, /Ово је тестна страница - 2/, 'Must convert latin with cyrillic variant');
Expand All @@ -196,13 +196,13 @@ describe('Page Content Service: transforms', () => {
return preq.post({
uri: `${server.config.baseURL('sr.wikipedia.beta.wmflabs.org')}/transform/wikitext/to/mobile-html/RESTBase_Testing_Page`,
headers: {
'accept-language': 'sr-el'
'accept-language': 'sr-Latn'
},
body: { wikitext: 'Ово је тестна страница - 1\n\nOvo je testna stranica - 2' }
})
.then((res) => {
assert.deepEqual(res.status, 200);
assert.deepEqual(res.headers['content-language'], 'sr-el');
assert.deepEqual(res.headers['content-language'], 'sr-Latn');
assert.checkString(res.headers['cache-control'], /private/, 'Must not be cached');
assert.checkString(res.body, /Ovo je testna stranica - 1/, 'Must convert cyrillic with latin variant');
assert.checkString(res.body, /Ovo je testna stranica - 2/, 'Must not convert latin with latin variant');
Expand Down

0 comments on commit 399e648

Please sign in to comment.