feat(timeout/retry): allow retry limit to be changed (#83)

contentful · Sep 18, 2019 · 6e70a49 · 6e70a49
1 parent dfd8528
commit 6e70a49
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/lib/create-http-client.js b/lib/create-http-client.js
@@ -131,6 +131,6 @@ export default function createHttpClient (axios, options) {
       ...newParams
     })
   }
-  rateLimit(instance, axiosOptions)
+  rateLimit(instance, axiosOptions, config.retryLimit)
   return instance
 }
diff --git a/test/unit/rate-limit-test.js b/test/unit/rate-limit-test.js
@@ -9,15 +9,15 @@ const logHandlerStub = sinon.stub()
 
 const mock = new MockAdapter(axios)
 
-function setup () {
-  const client = axios.create({
+function setup (options = {}) {
+  const client = axios.create(Object.assign({
     logHandler: logHandlerStub,
     retryOnError: true
-  })
+  }, options))
   rateLimit(client, {
     logHandler: logHandlerStub,
     retryOnError: true
-  })
+  }, options.retryLimit)
   return { client }
 }
 
@@ -92,6 +92,34 @@ test('Retry on 5** - multiple errors', (t) => {
   })
 })
 
+test('Retry on 5** - multiple errors - reach/exceed limit', (t) => {
+  const { client } = setup({ retryLimit: 7 })
+  mock.onGet('/rate-limit-me').replyOnce(500, 'Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(500, 'Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(503, 'Another Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(500, 'Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(503, 'Another Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(500, 'Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(503, 'Another Server Error', { 'x-contentful-request-id': 12345 })
+  mock.onGet('/rate-limit-me').replyOnce(200, 'works')
+  mock.onGet('/rate-limit-me').replyOnce(500, 'Server Error', { 'x-contentful-request-id': 12345 })
+
+  t.plan(3)
+
+  return client.get('/rate-limit-me').then((response) => {
+    t.ok(response.data)
+    t.equals(response.data, 'works')
+  }).then(() => {
+    return client.get('/rate-limit-me').then(() => {
+      t.fail('Promise should reject not resolve')
+      teardown()
+    }).catch((error) => {
+      t.equals(error.message, 'Request failed with status code 500')
+      teardown()
+    })
+  })
+})
+
 test('Retry on network error', (t) => {
   const { client } = setupWithOneRetry()
   mock.onGet('/rate-limit-me').networkError()