diff options
Diffstat (limited to 'src/ngMock/angular-mocks.js')
| -rw-r--r-- | src/ngMock/angular-mocks.js | 70 | 
1 files changed, 47 insertions, 23 deletions
| diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 67decace..bb2ac754 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1178,7 +1178,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * Creates a new backend definition.     *     * @param {string} method HTTP method. -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives     *   data string and returns true if the data is as expected.     * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header @@ -1216,7 +1217,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for GET requests. For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(Object|function(Object))=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     * request is handled. @@ -1228,7 +1230,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for HEAD requests. For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(Object|function(Object))=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     * request is handled. @@ -1240,7 +1243,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for DELETE requests. For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(Object|function(Object))=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     * request is handled. @@ -1252,7 +1256,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for POST requests. For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives     *   data string and returns true if the data is as expected.     * @param {(Object|function(Object))=} headers HTTP headers. @@ -1266,7 +1271,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for PUT requests.  For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives     *   data string and returns true if the data is as expected.     * @param {(Object|function(Object))=} headers HTTP headers. @@ -1280,7 +1286,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new backend definition for JSONP requests. For more info see `when()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     * request is handled.     */ @@ -1294,7 +1301,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * Creates a new request expectation.     *     * @param {string} method HTTP method. -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that     *  receives data string and returns true if the data is as expected, or Object if request body     *  is in JSON format. @@ -1326,7 +1334,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for GET requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {Object=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     * request is handled. See #expect for more info. @@ -1338,7 +1347,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for HEAD requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {Object=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     *   request is handled. @@ -1350,7 +1360,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for DELETE requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {Object=} headers HTTP headers.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     *   request is handled. @@ -1362,7 +1373,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for POST requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that     *  receives data string and returns true if the data is as expected, or Object if request body     *  is in JSON format. @@ -1377,7 +1389,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for PUT requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that     *  receives data string and returns true if the data is as expected, or Object if request body     *  is in JSON format. @@ -1392,7 +1405,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for PATCH requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that     *  receives data string and returns true if the data is as expected, or Object if request body     *  is in JSON format. @@ -1407,7 +1421,8 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {     * @description     * Creates a new request expectation for JSONP requests. For more info see `expect()`.     * -   * @param {string|RegExp} url HTTP url. +   * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  +   *   and returns true if the url match the current definition.     * @returns {requestHandler} Returns an object with `respond` method that control how a matched     *   request is handled.     */ @@ -1531,6 +1546,7 @@ function MockHttpExpectation(method, url, data, headers) {    this.matchUrl = function(u) {      if (!url) return true;      if (angular.isFunction(url.test)) return url.test(u); +    if (angular.isFunction(url)) return url(u);      return url == u;    }; @@ -1808,7 +1824,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * Creates a new backend definition.   *   * @param {string} method HTTP method. - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(string|RegExp)=} data HTTP request body.   * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header   *   object and returns true if the headers match the current definition. @@ -1832,7 +1849,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for GET requests. For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that   *   control how a matched request is handled. @@ -1845,7 +1863,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for HEAD requests. For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that   *   control how a matched request is handled. @@ -1858,7 +1877,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for DELETE requests. For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that   *   control how a matched request is handled. @@ -1871,7 +1891,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for POST requests. For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(string|RegExp)=} data HTTP request body.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that @@ -1885,7 +1906,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for PUT requests.  For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(string|RegExp)=} data HTTP request body.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that @@ -1899,7 +1921,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for PATCH requests.  For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @param {(string|RegExp)=} data HTTP request body.   * @param {(Object|function(Object))=} headers HTTP headers.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that @@ -1913,7 +1936,8 @@ angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {   * @description   * Creates a new backend definition for JSONP requests. For more info see `when()`.   * - * @param {string|RegExp} url HTTP url. + * @param {string|RegExp|function(string)} url HTTP url or function that receives the url  + *   and returns true if the url match the current definition.   * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that   *   control how a matched request is handled.   */ | 
