Clear error after successful request

sevenval · Apr 5, 2017 · e449fa8 · e449fa8
1 parent 6354eeb
commit e449fa8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/__tests__/Collection.spec.js b/__tests__/Collection.spec.js
@@ -123,6 +123,16 @@ describe('Collection', () => {
           }
         })
 
+        it('clears the error', async () => {
+          reject()
+          try {
+            await collection.fetch()
+          } catch (e) {}
+          resolve([])()
+          await collection.fetch()
+          expect(collection.error).toBe(null)
+        })
+
         it('removes the model', async () => {
           try {
             await collection.create(newItem)
@@ -163,6 +173,15 @@ describe('Collection', () => {
             expect(collection.error.body).toBe(error)
           }
         })
+        it('clears the error', async () => {
+          reject()
+          try {
+            await collection.fetch()
+          } catch (e) {}
+          resolve([])()
+          await collection.fetch()
+          expect(collection.error).toBe(null)
+        })
       })
 
       describe('when it succeeds', () => {
@@ -211,6 +230,15 @@ describe('Collection', () => {
         expect(collection.models.length).toBe(2)
         expect(collection.at(1).get('name')).toBe('bob')
       })
+
+      it('clears the error', async () => {
+        try {
+          await collection.fetch()
+        } catch (e) {}
+        resolve([item, { id: 2, name: 'bob' }])()
+        await collection.fetch()
+        expect(collection.error).toBe(null)
+      })
     })
   })
 
@@ -291,6 +319,15 @@ describe('Collection', () => {
             expect(collection.error.body).toBe(error)
           }
         })
+
+        it('clears the error', async () => {
+          try {
+            await collection.fetch()
+          } catch (e) {}
+          resolve([])()
+          await collection.fetch()
+          expect(collection.error).toBe(null)
+        })
       })
 
       describe('when it succeeds', () => {

diff --git a/src/Collection.js b/src/Collection.js
@@ -235,6 +235,7 @@ export default class Collection<T: Model> {
         this.add([data])
       }
       this.request = null
+      this.error = null
     })
 
     return data
@@ -269,6 +270,7 @@ export default class Collection<T: Model> {
     runInAction('fetch-done', () => {
       this.set(data, options)
       this.request = null
+      this.error = null
     })
 
     return data
@@ -302,6 +304,7 @@ export default class Collection<T: Model> {
     }
 
     this.request = null
+    this.error = null
 
     return response
   }