@@ -13,12 +13,15 @@ const range = (start, end, step = 1) => {
1313 ) ;
1414} ;
1515
16- const limitPaginationOptions = [
16+ const noOptions = [
1717 {
1818 testName : 'No options' ,
1919 userDefinedOptions : { } ,
2020 expectedItems : range ( 0 , 2500 ) ,
2121 } ,
22+ ] ;
23+
24+ const limitPaginationOptions = [
2225 {
2326 testName : 'User limit' ,
2427 userDefinedOptions : { limit : 1100 } ,
@@ -72,11 +75,11 @@ describe('Collection clients list method as async iterable', () => {
7275 const maxItemsPerPage = 1000 ;
7376
7477 const allCollectionClients = [
78+ client . actor ( 'some-id' ) . version ( 'some-version' ) . envVars ( ) , // Does not support options
79+ client . actor ( 'some-id' ) . versions ( ) , // Does not support options
7580 client . store ( ) , // Does not support desc
76- client . actors ( ) ,
77- client . actor ( 'some-id' ) . version ( 'some-version' ) . envVars ( ) ,
78- client . actor ( 'some-id' ) . versions ( ) ,
7981 client . actor ( 'some-id' ) . builds ( ) ,
82+ client . actors ( ) ,
8083 client . datasets ( ) , // Supports unnamed
8184 client . keyValueStores ( ) , // Supports unnamed
8285 client . requestQueues ( ) , // Supports unnamed
@@ -95,17 +98,22 @@ describe('Collection clients list method as async iterable', () => {
9598 ] ;
9699
97100 // Create valid tests cases for each client based on the pagination options it is supporting.
98- const commonTestCases = generateTestCases ( allCollectionClients , [
99- ...limitPaginationOptions ,
100- ...offsetPaginationOptions ,
101- ] ) ;
101+ const noOptionsTestCases = generateTestCases ( allCollectionClients , noOptions ) ;
102+
103+ const commonTestCases = generateTestCases (
104+ allCollectionClients . slice ( 2 ) , // without envVars and versions
105+ [ ...limitPaginationOptions , ...offsetPaginationOptions ] ,
106+ ) ;
102107 const unnamedTestCases = generateTestCases (
103108 [ client . datasets ( ) , client . keyValueStores ( ) , client . requestQueues ( ) ] ,
104109 unnamedPaginationOptions ,
105110 ) ;
106- const descTestCases = generateTestCases ( allCollectionClients . slice ( 1 ) , descPaginationOptions ) ;
111+ const descTestCases = generateTestCases (
112+ allCollectionClients . slice ( 3 ) , // without envVars, versions and store
113+ descPaginationOptions ,
114+ ) ;
107115
108- test . each ( [ ...commonTestCases , ...unnamedTestCases , ...descTestCases ] ) (
116+ test . each ( [ ...noOptionsTestCases , ... commonTestCases , ...unnamedTestCases , ...descTestCases ] ) (
109117 '$clientName: $testName' ,
110118 async ( { resourceClient, userDefinedOptions, expectedItems } ) => {
111119 const mockedPlatformLogic = async ( request ) => {
0 commit comments