@@ -11,22 +11,28 @@ const {cache} = resolveAddon
1111
1212describe ( 'addons:info' , function ( ) {
1313 let api : nock . Scope
14+ let apiSdk : nock . Scope
1415
1516 beforeEach ( function ( ) {
1617 api = nock ( 'https://api.heroku.com' )
18+ apiSdk = nock ( 'https://api.heroku.com' , {
19+ reqheaders : {
20+ Accept : 'application/vnd.heroku+json; version=3.sdk' ,
21+ 'Accept-Expansion' : 'addon_service,plan' ,
22+ } ,
23+ } )
1724 cache . clear ( )
1825 } )
1926
2027 afterEach ( function ( ) {
2128 api . done ( )
29+ apiSdk . done ( )
2230 nock . cleanAll ( )
2331 } )
32+
2433 context ( 'with add-ons' , function ( ) {
2534 beforeEach ( function ( ) {
26- nock ( 'https://api.heroku.com' , { reqheaders : {
27- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
28- 'Accept-Expansion' : 'addon_service,plan' ,
29- } } )
35+ apiSdk
3036 . post ( '/actions/addons/resolve' , { addon : 'www-db' , app : null } )
3137 . reply ( 200 , [ fixtures . addons [ 'www-db' ] ] )
3238 api . get ( `/addons/${ fixtures . addons [ 'www-db' ] . id } /addon-attachments` ) . reply ( 200 , [ fixtures . attachments [ 'acme-inc-www::DATABASE' ] ] )
@@ -51,10 +57,7 @@ State: created\n
5157
5258 context ( 'with app add-ons' , function ( ) {
5359 beforeEach ( function ( ) {
54- nock ( 'https://api.heroku.com' , { reqheaders : {
55- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
56- 'Accept-Expansion' : 'addon_service,plan' ,
57- } } )
60+ apiSdk
5861 . post ( '/actions/addons/resolve' , { addon : 'www-db' , app : 'example' } )
5962 . reply ( 200 , [ fixtures . addons [ 'www-db' ] ] )
6063 nock ( 'https://api.heroku.com' , {
@@ -90,10 +93,7 @@ State: created\n
9093 } )
9194 context ( 'with app but not an app add-on' , function ( ) {
9295 beforeEach ( function ( ) {
93- nock ( 'https://api.heroku.com' , { reqheaders : {
94- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
95- 'Accept-Expansion' : 'addon_service,plan' ,
96- } } )
96+ apiSdk
9797 . post ( '/actions/addons/resolve' , { addon : 'www-db' , app : 'example' } )
9898 . reply ( 200 , [ fixtures . addons [ 'www-db' ] ] )
9999 nock ( 'https://api.heroku.com' , { reqheaders : { 'Accept-Expansion' : 'addon_service,plan' } } )
@@ -133,10 +133,7 @@ State: created\n
133133 beforeEach ( function ( ) {
134134 const addon = fixtures . addons [ 'dwh-db' ]
135135 addon . billed_price = { cents : 10000 }
136- nock ( 'https://api.heroku.com' , { reqheaders : {
137- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
138- 'Accept-Expansion' : 'addon_service,plan' ,
139- } } )
136+ apiSdk
140137 . post ( '/actions/addons/resolve' , { addon : 'dwh-db' , app : null } )
141138 . reply ( 200 , [ addon ] )
142139 nock ( 'https://api.heroku.com' , {
@@ -172,10 +169,7 @@ State: created\n
172169 beforeEach ( function ( ) {
173170 const addon = fixtures . addons [ 'dwh-db' ]
174171 addon . billed_price = { cents : 0 , contract : true }
175- nock ( 'https://api.heroku.com' , { reqheaders : {
176- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
177- 'Accept-Expansion' : 'addon_service,plan' ,
178- } } )
172+ apiSdk
179173 . post ( '/actions/addons/resolve' , { addon : 'dwh-db' , app : null } )
180174 . reply ( 200 , [ addon ] )
181175 nock ( 'https://api.heroku.com' , {
@@ -210,10 +204,7 @@ State: created\n
210204 context ( 'provisioning add-on' , function ( ) {
211205 beforeEach ( function ( ) {
212206 const provisioningAddon = fixtures . addons [ 'www-redis' ]
213- nock ( 'https://api.heroku.com' , { reqheaders : {
214- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
215- 'Accept-Expansion' : 'addon_service,plan' ,
216- } } )
207+ apiSdk
217208 . post ( '/actions/addons/resolve' , { addon : 'www-redis' , app : null } )
218209 . reply ( 200 , [ provisioningAddon ] )
219210 nock ( 'https://api.heroku.com' , { reqheaders : { 'Accept-Expansion' : 'addon_service,plan' } } )
@@ -244,10 +235,7 @@ State: creating\n
244235 context ( 'deprovisioning add-on' , function ( ) {
245236 beforeEach ( function ( ) {
246237 const deprovisioningAddon = fixtures . addons [ 'www-redis-2' ]
247- nock ( 'https://api.heroku.com' , { reqheaders : {
248- Accept : 'application/vnd.heroku+json; version=3.sdk' ,
249- 'Accept-Expansion' : 'addon_service,plan' ,
250- } } )
238+ apiSdk
251239 . post ( '/actions/addons/resolve' , { addon : 'www-redis-2' , app : null } )
252240 . reply ( 200 , [ deprovisioningAddon ] )
253241 nock ( 'https://api.heroku.com' , { reqheaders : { 'Accept-Expansion' : 'addon_service,plan' } } )
0 commit comments