golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "QA: Don't chain things that cannot be chained"

This commit is contained in:
jenkins-bot 2019-05-30 20:01:36 +00:00 committed by Gerrit Code Review
parent 797fadde48 94c0926614
commit bed22c9221
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/selenium/features/step_definitions/common_steps.js
View File

@ -20,11 +20,17 @@ const login = () => {
const createPages = ( pages ) => { const createPages = ( pages ) => {
const summary = 'edit by selenium test'; const summary = 'edit by selenium test';
browser.call( () => login() ); browser.call( () => login() );
browser.call( () => browser.call( () => {
api.batch( return api.batch(
pages.map( ( page ) => [ 'create' ].concat( page ).concat( [ summary ] ) ) pages.map( ( page ) => [ 'create' ].concat( page ).concat( [ summary ] ) )
) ).catch( ( err ) => {
); if ( err.code === 'articleexists' ) {
return;
}
throw err;
} );
} );
}; };
const createPage = ( title, wikitext ) => { const createPage = ( title, wikitext ) => {

18
tests/selenium/features/step_definitions/create_page_api_steps.js
View File

@ -23,13 +23,7 @@ const iAmInAWikiThatHasCategories = ( title ) => {
[ 'create', 'Category:Selenium artifacts', msg ], [ 'create', 'Category:Selenium artifacts', msg ],
[ 'create', 'Category:Test category', msg ], [ 'create', 'Category:Test category', msg ],
[ 'create', 'Category:Selenium hidden category', '__HIDDENCAT__' ] [ 'create', 'Category:Selenium hidden category', '__HIDDENCAT__' ]
] ) ] );
.catch( ( err ) => {
if ( err.code === 'articleexists' ) {
return;
}
throw err;
} );
// A pause is necessary to let the categories register with database before trying to use // A pause is necessary to let the categories register with database before trying to use
// them in an article // them in an article
@ -68,7 +62,10 @@ const iGoToAPageThatHasLanguages = () => {
[[es:Selenium language test page]] [[es:Selenium language test page]]
`; `;
return createPage( 'Selenium language test page', wikitext ).then( () => { browser.call( () => {
createPage( 'Selenium language test page', wikitext );
} );
browser.call( () => {
iAmOnPage( 'Selenium language test page' ); iAmOnPage( 'Selenium language test page' );
} ); } );
}; };
@ -85,7 +82,10 @@ const watch = ( title ) => {
const iAmViewingAWatchedPage = () => { const iAmViewingAWatchedPage = () => {
const title = `I am on the "Selenium mobile watched page test ${new Date().getTime()}`; const title = `I am on the "Selenium mobile watched page test ${new Date().getTime()}`;
createPage( title, 'watch test' ).then( () => { browser.call( () => {
createPage( title, 'watch test' );
} );
browser.call( () => {
watch( title ); watch( title );
// navigate away from page // navigate away from page
iAmOnPage( 'Main Page' ); iAmOnPage( 'Main Page' );