Skip to content

Commit 3818bb2

Browse files
authored
Merge branch 'master' into master
2 parents 8bef30d + 04f4f1f commit 3818bb2

File tree

8 files changed

+538
-354
lines changed

8 files changed

+538
-354
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ We'd love to have your helping hand on this ecosystem! Please see [CONTRIBUTING.
3333

3434
## Packages
3535

36-
:warning: **Typescript SDK** is moved to a new [`repository`](https://github.com/commercetools/commercetools-typescript-sdks) now, this package will be deleted soon from the current repository.
37-
3836
### SDK
3937

4038
| Package | Version | Dependencies |
@@ -46,7 +44,6 @@ We'd love to have your helping hand on this ecosystem! Please see [CONTRIBUTING.
4644
| [`sdk-middleware-logger`](/packages/sdk-middleware-logger) | [![sdk-middleware-logger Version][sdk-middleware-logger-icon]][sdk-middleware-logger-version] | [![sdk-middleware-logger Dependencies Status][sdk-middleware-logger-dependencies-icon]][sdk-middleware-logger-dependencies] |
4745
| [`sdk-middleware-queue`](/packages/sdk-middleware-queue) | [![sdk-middleware-queue Version][sdk-middleware-queue-icon]][sdk-middleware-queue-version] | [![sdk-middleware-queue Dependencies Status][sdk-middleware-queue-dependencies-icon]][sdk-middleware-queue-dependencies] |
4846
| [`sdk-middleware-user-agent`](/packages/sdk-middleware-user-agent) | [![sdk-middleware-user-agent Version][sdk-middleware-user-agent-icon]][sdk-middleware-user-agent-version] | [![sdk-middleware-user-agent Dependencies Status][sdk-middleware-user-agent-dependencies-icon]][sdk-middleware-user-agent-dependencies] |
49-
| [`typescript-sdk`](/packages/typescript-sdk) | [![typescript-sdk Version][typescript-sdk-icon]][typescript-sdk-version] | [![typescript-sdk Dependencies Status][typescript-sdk-dependencies-icon]][typescript-sdk-dependencies] |
5047

5148
[sdk-auth-version]: https://www.npmjs.com/package/@commercetools/sdk-auth
5249
[sdk-auth-icon]: https://img.shields.io/npm/v/@commercetools/sdk-auth.svg?style=flat-square

jest.test.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ module.exports = {
2626
'/integration-tests/',
2727
'/packages/.*/node_modules',
2828
'/packages/.*/dist',
29-
'/packages/.*/li',
29+
'/packages/.*/lib',
3030
],
3131
}

packages/csv-parser-orders/src/parsers/line-item-state.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ export default class LineItemStateParser extends AbstractParser {
4646
toState: data.toState,
4747
}
4848

49+
if (data.actualTransitionDate) {
50+
state.actualTransitionDate = data.actualTransitionDate
51+
}
52+
4953
if (data._fromStateQty)
5054
state._fromStateQty = parseInt(data._fromStateQty, 10)
5155

packages/csv-parser-orders/test/line-item-state.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ describe('LineItemStateParser', () => {
9494
fromState: 'order',
9595
toState: 'shipped',
9696
_fromStateQty: 100,
97+
actualTransitionDate: '2016-11-01T08:01:19+0000',
9798
},
9899
],
99100
},
@@ -128,6 +129,7 @@ describe('LineItemStateParser', () => {
128129
fromState: 'picking',
129130
quantity: 1,
130131
toState: 'picked',
132+
actualTransitionDate: '2017-11-14T14:17:18+01:00',
131133
},
132134
],
133135
},
@@ -139,6 +141,7 @@ describe('LineItemStateParser', () => {
139141
fromState: 'open',
140142
quantity: 1,
141143
toState: 'picking',
144+
actualTransitionDate: '2017-11-14T14:17:18+01:00',
142145
},
143146
],
144147
},

packages/sdk-middleware-http/src/http.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ export default function createHttpMiddleware({
147147
return
148148
}
149149

150-
res.json().then((result: Object) => {
150+
res.text().then((result: Object) => {
151151
const parsedResponse: Object = {
152152
...response,
153-
body: result,
153+
body: result.length > 0 ? JSON.parse(result) : {},
154154
statusCode: res.status,
155155
}
156156

packages/sdk-middleware-http/test/http.spec.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,4 +952,34 @@ describe('Http', () => {
952952

953953
httpMiddleware(next)(request, response)
954954
}))
955+
956+
test('execute a post request with empty 202 response', () =>
957+
new Promise((resolve, reject) => {
958+
const request = createTestRequest({
959+
uri: '/foo/bar',
960+
method: 'POST',
961+
})
962+
const response = { resolve, reject }
963+
const next = (req, res) => {
964+
expect(res).toEqual({
965+
...response,
966+
body: {},
967+
statusCode: 202,
968+
})
969+
resolve()
970+
}
971+
// Use default options
972+
const httpMiddleware = createHttpMiddleware({
973+
host: testHost,
974+
fetch,
975+
})
976+
nock(testHost)
977+
.defaultReplyHeaders({
978+
'Content-Type': 'application/json',
979+
})
980+
.post('/foo/bar')
981+
.reply(202, undefined)
982+
983+
httpMiddleware(next)(request, response)
984+
}))
955985
})

packages/typescript-sdk/README.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
# typescript-sdk
2-
3-
A typescript sdk for commercetools platform API
4-
5-
https://commercetools.github.io/nodejs/sdk/api/typescriptSdk.html
6-
7-
## Install
8-
9-
```bash
10-
npm install --save @commercetools/typescript-sdk
11-
```
1+
- :warning: **Typescript SDK** is moved to a new [`repository`](https://github.com/commercetools/commercetools-typescript-sdks) now, this package will be deleted soon from the current repository.

0 commit comments

Comments
 (0)