Browse Source
Merge pull request #26347 from abpframework/auto-merge-forward/rel-10.7-to-dev-107
Auto-merge forward rel-10.7 → dev
pull/26348/head
Volosoft Agent
3 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
11 additions and
2 deletions
-
npm/ng-packs/packages/schematics/src/commands/proxy-remove/schema.json
-
npm/ng-packs/packages/schematics/src/tests/action-to-body-mapper.spec.ts
|
|
|
@ -62,6 +62,15 @@ |
|
|
|
"index": 5 |
|
|
|
}, |
|
|
|
"x-prompt": "Please enter target Angular project to place the generated code. (default: workspace \"defaultProject\")" |
|
|
|
}, |
|
|
|
"serviceType": { |
|
|
|
"description": "Service type to the generated code", |
|
|
|
"type": "string", |
|
|
|
"enum": [ |
|
|
|
"application", |
|
|
|
"integration", |
|
|
|
"all" |
|
|
|
] |
|
|
|
} |
|
|
|
}, |
|
|
|
"required": [] |
|
|
|
|
|
|
|
@ -617,7 +617,7 @@ describe('proxy service template emission', () => { |
|
|
|
}); |
|
|
|
|
|
|
|
test('emits Accept header conditional', () => { |
|
|
|
expect(template).toMatch(/headers:\s*\{\s*Accept:/); |
|
|
|
expect(template).toMatch(/headerEntries\.push\("Accept: '"/); |
|
|
|
}); |
|
|
|
|
|
|
|
test('emits responseType only for non-json httpResponseType', () => { |
|
|
|
@ -708,7 +708,7 @@ describe('createActionToBodyMapper — multipart FormData uploads', () => { |
|
|
|
buildAction({ |
|
|
|
httpMethod: 'POST', |
|
|
|
parameters: [ |
|
|
|
{ name: 'Name', nameOnMethod: 'name', type: 'System.String', typeSimple: 'string', bindingSourceId: eBindingSourceId.Body } as any, |
|
|
|
{ name: 'Name', nameOnMethod: 'name', type: 'My.Project.UserDto', typeSimple: 'My.Project.UserDto', bindingSourceId: eBindingSourceId.Body } as any, |
|
|
|
], |
|
|
|
} as Partial<Action>), |
|
|
|
); |
|
|
|
|