From 829797a94a2c35909f7447452b0acd0ca711adc8 Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Sat, 21 Oct 2017 13:50:04 +0200
Subject: [PATCH] Added `method` parameter to stubRequest

The jsdoc comment mentioned the posibility to specify what method to
stub, but the actual code didn't support it. Now it does.

To match the documentation and other stub functions the `method`
parameter is the first parameter. To keep the code backwards
compatible this parameter needed to be optional. That unfortunately
made the actual implementation a litte bit messy.

Fixes #5
---
 index.js | 12 +++++++---
 test.js  | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 00c4433..d21e7c9 100644
--- a/index.js
+++ b/index.js
@@ -308,13 +308,19 @@ let moxios = {
 
   /**
    * Stub a response to be used to respond to a request matching a method and a URL or RegExp
+   * The first parameter is optional for backwards compatability reasons. It might change to
+   * a required parameter in the future. Please always specify a method
    *
-   * @param {String} method An axios command
+   * @param {String} [method] An axios command
    * @param {String|RegExp} urlOrRegExp A URL or RegExp to test against
    * @param {Object} response The response to use when a match is made
    */
-  stubRequest: function (urlOrRegExp, response) {
-    this.stubs.track({url: urlOrRegExp, response});
+  stubRequest: function(...args) {
+    if (args.length === 3) {
+      this.stubs.track({method: args[0], url: args[1], response: args[2]});
+    } else {
+      this.stubs.track({url: args[0], response: args[1]});
+    }
   },
 
   /**
diff --git a/test.js b/test.js
index 7b87db3..d383a89 100644
--- a/test.js
+++ b/test.js
@@ -131,6 +131,73 @@ describe('moxios', function () {
       })
     })
 
+    it('should stub GET requests', function (done) {
+      moxios.stubRequest('GET', '/users/12345', {
+        status: 200,
+        response: USER_FRED
+      })
+
+      axios.get('/users/12345').then(onFulfilled)
+
+      moxios.wait(function () {
+        let response = onFulfilled.getCall(0).args[0]
+        deepEqual(response.data, USER_FRED)
+        done()
+      })
+    })
+
+    it('should stub POST requests, but not GET requests', function (done) {
+      moxios.stubRequest('POST', '/users/', {
+        status: 200,
+        response: USER_FRED
+      })
+
+      axios.get('/users/').then(onFulfilled)
+      axios.post('/users/', USER_FRED).then(onFulfilled)
+
+      moxios.wait(function () {
+        equal(onFulfilled.calledOnce, true)
+        let response = onFulfilled.getCall(0).args[0]
+        deepEqual(response.data, USER_FRED)
+        done()
+      })
+    })
+
+    it('should pick the correct stub based on method', function (done) {
+      const USER_WILMA = {
+        id: 54321,
+        firstName: 'Wilma',
+        lastName: 'Flintstone'
+      }
+
+      moxios.stubRequest('GET', '/users/', {
+        status: 200,
+        response: USER_FRED
+      })
+
+      moxios.stubRequest('POST', '/users/', {
+        status: 200,
+        response: USER_WILMA
+      })
+
+      moxios.stubRequest('PUT', '/users/', {
+        status: 200,
+        response: USER_FRED
+      })
+
+      axios.put('/users/', USER_FRED).then(onFulfilled)
+      axios.post('/users/', USER_WILMA).then(onFulfilled)
+
+      moxios.wait(function () {
+        equal(onFulfilled.calledTwice, true)
+        let response = onFulfilled.getCall(0).args[0]
+        deepEqual(response.data, USER_FRED)
+        response = onFulfilled.getCall(1).args[0]
+        deepEqual(response.data, USER_WILMA)
+        done()
+      })
+    })
+
     it('should stub timeout', function (done) {
       moxios.stubTimeout('/users/12345')