Fix resolving requests of custom resources

peterquentin · peterquentin · commit 222addb70568 · 2019-02-26T21:03:39.000+01:00
diff --git a/src/Model.js b/src/Model.js
@@ -255,7 +255,7 @@ export default class Model extends StaticModel {
 
   get() {
     let base = this._fromResource || `${this.baseURL()}/${this.resource()}`
-    base = this._customResource || base
+    base = this._customResource ? `${this.baseURL()}/${this._customResource}` : base
     let url = `${base}${this._builder.query()}`
 
     return this.request({
diff --git a/tests/model.test.js b/tests/model.test.js
@@ -303,7 +303,7 @@ describe('Model methods', () => {
   test('a request with custom() method hits the right resource', async () => {
 
     axiosMock.onAny().reply((config) => {
-      expect(config.url).toBe('postz')
+      expect(config.url).toEqual(`http://localhost/postz`)
 
       return [200, {}]
     })
@@ -314,7 +314,7 @@ describe('Model methods', () => {
   test('custom() gracefully handles accidental / for string arguments', async () => {
 
     axiosMock.onAny().reply((config) => {
-      expect(config.url).toBe('postz/recent')
+      expect(config.url).toBe('http://localhost/postz/recent')
 
       return [200, {}]
     })
@@ -328,7 +328,7 @@ describe('Model methods', () => {
 
     axiosMock.onAny().reply((config) => {
       expect(config.method).toEqual('get')
-      expect(config.url).toEqual('users/1/postz/comments')
+      expect(config.url).toEqual('http://localhost/users/1/postz/comments')
 
       return [200, {}]
     })
