@@ -28,12 +28,22 @@ const project = {
2828/**
2929 * @param {string } id
3030 * @param {string } status
31+ * @param {'Issue'|'PullRequest' } type
32+ * @param {number } number
33+ * @param {string } repository
3134 *
3235 * @returns {object }
3336 */
34- function projectItem ( id , status ) {
37+ function projectItem ( id , status , type = 'Issue' , number = 1 , repository = 'php-fast-forward/dev-tools' ) {
3538 return {
3639 id,
40+ content : {
41+ __typename : type ,
42+ number,
43+ repository : {
44+ nameWithOwner : repository ,
45+ } ,
46+ } ,
3747 project : {
3848 id : project . id ,
3949 } ,
@@ -157,27 +167,10 @@ async function withEnvironment(env, callback) {
157167
158168test ( 'moves items from multiple source statuses to the release status' , async ( ) => {
159169 const projectItems = [
160- {
161- ...projectItem ( 'current-pr' , 'Release Prepared' ) ,
162- content : {
163- __typename : 'PullRequest' ,
164- number : 10 ,
165- } ,
166- } ,
167- {
168- ...projectItem ( 'merged-pr' , 'Merged' ) ,
169- content : {
170- __typename : 'PullRequest' ,
171- number : 9 ,
172- } ,
173- } ,
174- {
175- ...projectItem ( 'backlog-issue' , 'Backlog' ) ,
176- content : {
177- __typename : 'Issue' ,
178- number : 8 ,
179- } ,
180- } ,
170+ projectItem ( 'current-pr' , 'Release Prepared' , 'PullRequest' , 10 ) ,
171+ projectItem ( 'merged-pr' , 'Merged' , 'PullRequest' , 9 ) ,
172+ projectItem ( 'foreign-merged-pr' , 'Merged' , 'PullRequest' , 7 , 'php-fast-forward/enum' ) ,
173+ projectItem ( 'backlog-issue' , 'Backlog' , 'Issue' , 8 ) ,
181174 ] ;
182175 const { github, mutations} = createGithub ( projectItems ) ;
183176 const { core, outputs} = createCore ( ) ;
@@ -209,18 +202,12 @@ test('moves items from multiple source statuses to the release status', async ()
209202 assert . deepEqual ( mutations . map ( ( mutation ) => mutation . itemId ) , [ 'current-pr' , 'merged-pr' ] ) ;
210203 assert . equal ( outputs [ 'source-statuses' ] , 'Release Prepared,Merged' ) ;
211204 assert . equal ( outputs [ 'moved-count' ] , '2' ) ;
212- assert . equal ( outputs [ 'skipped-count' ] , '1 ' ) ;
205+ assert . equal ( outputs [ 'skipped-count' ] , '2 ' ) ;
213206} ) ;
214207
215208test ( 'keeps the legacy from-status input supported' , async ( ) => {
216209 const projectItems = [
217- {
218- ...projectItem ( 'merged-issue' , 'Merged' ) ,
219- content : {
220- __typename : 'Issue' ,
221- number : 8 ,
222- } ,
223- } ,
210+ projectItem ( 'merged-issue' , 'Merged' , 'Issue' , 8 ) ,
224211 ] ;
225212 const { github, mutations} = createGithub ( projectItems ) ;
226213 const { core, outputs} = createCore ( ) ;
0 commit comments