Fix addAction to pass through opts into _opts on functional call

 * Adds tests for #action(<id>) and #action(<params>) queries

Author: pik

fetch/karma.start.js

@@ -14,6 +14,7 @@ before(function () {
   }
   Test.sinon = sinon
   Test.JSData = JSData
+  Test.addAction = JSDataHttp.addAction
   Test.HttpAdapter = JSDataHttp.HttpAdapter
   Test.User = new JSData.Mapper({
     name: 'user'

karma.start.js

@@ -14,6 +14,7 @@ before(function () {
   }
   Test.sinon = sinon
   Test.JSData = JSData
+  Test.addAction = JSDataHttp.addAction
   Test.HttpAdapter = JSDataHttp.HttpAdapter
   Test.User = new JSData.Mapper({
     name: 'user'

node/mocha.start.js

@@ -18,6 +18,7 @@ before(function () {
   }
   Test.sinon = require('sinon')
   Test.JSData = require('js-data')
+  Test.addAction = require('./dist/js-data-http-node').addAction
   Test.HttpAdapter = require('./dist/js-data-http-node').HttpAdapter
   Test.User = new Test.JSData.Mapper({
     name: 'user'

src/index.js

@@ -1064,7 +1064,7 @@ Adapter.extend({
  *
  * // GET /reports/schools/:school_id/teachers
  * addAction('getTeacherReports', {
- *   basePath: 'reports/schools',
+ *   endpoint: 'reports/schools',
  *   pathname: 'teachers',
  *   method: 'GET'
  * })(store.getMapper('school'))
@@ -1098,42 +1098,39 @@ export function addAction (name, opts) {
     opts.response = opts.response || function (response) { return response }
     opts.responseError = opts.responseError || function (err) { return utils.reject(err) }
     mapper[name] = function (id, _opts) {
+      _opts = _opts || {}
       if (utils.isObject(id)) {
         _opts = id
       }
-      _opts = _opts || {}
-      let adapter = this.getAdapter(opts.adapter || this.defaultAdapter || 'http')
-      let config = {}
-      utils.fillIn(config, opts)
-      if (!_opts.hasOwnProperty('endpoint') && config.endpoint) {
-        _opts.endpoint = config.endpoint
-      }
+      utils.fillIn(_opts, opts)
+      let adapter = this.getAdapter(_opts.adapter || this.defaultAdapter || 'http')
+      const config = {}
+      config.mapper = this.name
+      utils.deepMixIn(config, _opts)
+      config.method = config.method || 'GET'
       if (typeof _opts.getEndpoint === 'function') {
         config.url = _opts.getEndpoint(this, _opts)
       } else {
         let args = [
           _opts.basePath || this.basePath || adapter.basePath,
-          adapter.getEndpoint(this, utils.isSorN(id) ? id : null, _opts)
+          adapter.getEndpoint(this, id, _opts)
         ]
         if (utils.isSorN(id)) {
           args.push(id)
         }
         args.push(opts.pathname || name)
         config.url = makePath.apply(null, args)
       }
-      config.method = config.method || 'GET'
-      config.mapper = this.name
-      utils.deepMixIn(config, _opts)
       return utils.resolve(config)
-        .then(_opts.request || opts.request)
+        .then(_opts.request)
         .then((config) => adapter.HTTP(config))
         .then((data) => {
           if (data && data.config) {
             data.config.mapper = this.name
           }
           return data
         })
-        .then(_opts.response || opts.response, _opts.responseError || opts.responseError)
+        .then(_opts.response, _opts.responseError)
     }
     return mapper
   }

test/static.addAction.test.js

@@ -1,3 +1,60 @@
 describe('static addAction', function () {
-  it('should addAction')
+  it('should addAction', function (done) {
+    var Test = this
+    var adapter = Test.adapter
+    var store = new Test.JSData.DataStore()
+    store.registerAdapter('http', adapter, { default: true })
+    var SchoolMapper = store.defineMapper('school', {})
+
+    // GET async/reports/schools/:school_id/teachers
+    Test.addAction('getTeacherReportsAsync', {
+      basePath: 'async/',
+      endpoint: 'reports/schools',
+      pathname: 'teachers',
+      method: 'GET'
+    })(SchoolMapper)
+
+    setTimeout(function () {
+      Test.requests[0].respond(200, { 'Content-Type': 'text/plain' }, '')
+    }, 5)
+
+    SchoolMapper.getTeacherReportsAsync(1234).then(function (response) {
+      Test.assert.equal(1, Test.requests.length)
+      Test.assert.equal(Test.requests[0].url, 'async/reports/schools/1234/teachers', 'Add action configures basePath, endpoint and pathname')
+      Test.assert.equal(Test.requests[0].method, 'GET')
+      done()
+    })
+  })
+
+  it('addAction action is callable with params instead of id', function (done) {
+    var Test = this
+    var adapter = Test.adapter
+    var store = new Test.JSData.DataStore()
+    store.registerAdapter('http', adapter, { default: true })
+    var SchoolMapper = store.defineMapper('school', {})
+
+    // GET async/reports/schools/teachers
+    Test.addAction('getAllTeacherReportsAsync', {
+      basePath: 'async/',
+      endpoint: 'reports/schools',
+      pathname: 'teachers',
+      method: 'GET'
+    })(SchoolMapper)
+
+    setTimeout(function () {
+      Test.requests[0].respond(200, { 'Content-Type': 'text/plain' }, '')
+    }, 5)
+
+    // GET async/reports/schools/teachers?<key>=<value>
+    SchoolMapper.getAllTeacherReportsAsync({
+      params: {
+        subject: 'esperanto'
+      }
+    }).then(function (response) {
+      Test.assert.equal(1, Test.requests.length)
+      Test.assert.equal(Test.requests[0].url, 'async/reports/schools/teachers?subject=esperanto', 'Add action configures basePath, endpoint, pathname, and querystring')
+      Test.assert.equal(Test.requests[0].method, 'GET')
+      done()
+    })
+  })
 })