fix(ngMock/$httpBackend): correctly ignore query params in {expect,when}Route

Fixes angular#14173

Author: thorn0

src/ngMock/angular-mocks.js

@@ -1481,8 +1481,9 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
    *      ```
    *    – The respond method takes a set of static data to be returned or a function that can
    *    return an array containing response status (number), response data (Array|Object|string),
-   *    response headers (Object), and the text for the status (string). The respond method returns
-   *    the `requestHandler` object for possible overrides.
+   *    response headers (Object), HTTP status text (string), and XMLHttpRequest status (string:
+   *    `complete`, `error`, `timeout` or `abort`). The respond method returns the `requestHandler`
+   *    object for possible overrides.
    */
   $httpBackend.when = function(method, url, data, headers, keys) {
 
@@ -1680,14 +1681,14 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
           + (optional ? '' : slash)
           + '(?:'
           + (optional ? slash : '')
-          + (star && '(.+?)' || '([^/]+)')
+          + (star ? '(.+?)' : '([^/?]+)')
           + (optional || '')
           + ')'
           + (optional || '');
       })
       .replace(/([/$*])/g, '\\$1');
 
-    ret.regexp = new RegExp('^' + url, 'i');
+    ret.regexp = new RegExp('^' + url + '(?:$|\\?)', 'i');
     return ret;
   }
 
@@ -1711,14 +1712,15 @@ function createHttpBackendMock($rootScope, $timeout, $delegate, $browser) {
    *  order to change how a matched request is handled.
    *
    *  - respond –
-   *    ```
-   *    { function([status,] data[, headers, statusText])
-   *    | function(function(method, url, data, headers, params)}
-   *    ```
+   *      ```js
+   *      {function([status,] data[, headers, statusText])
+   *      | function(function(method, url, data, headers, params)}
+   *      ```
    *    – The respond method takes a set of static data to be returned or a function that can
    *    return an array containing response status (number), response data (Array|Object|string),
-   *    response headers (Object), and the text for the status (string). The respond method returns
-   *    the `requestHandler` object for possible overrides.
+   *    response headers (Object), HTTP status text (string), and XMLHttpRequest status (string:
+   *    `complete`, `error`, `timeout` or `abort`). The respond method returns the `requestHandler`
+   *    object for possible overrides.
    */
   $httpBackend.expect = function(method, url, data, headers, keys) {
 

test/ngMock/angular-mocksSpec.js

@@ -1943,10 +1943,30 @@ describe('ngMock', function() {
         );
         they('should ignore query param when matching in ' + routeShortcut + ' $prop method', methods,
           function() {
-            hb[routeShortcut](this, '/route/:id').respond('path');
+            var paramsSpy = jasmine.createSpy('paramsSpy');
+            hb[routeShortcut](this, '/route/:id').respond(function(method, url, data, headers, params) {
+              paramsSpy(params);
+              // status, response, headers, statusText, xhrStatus
+              return [200, 'path', { 'x-header': 'foo' }, 'OK', 'complete'];
+            });
             hb(this, '/route/123?q=str&foo=bar', undefined, callback);
             hb.flush();
-            expect(callback).toHaveBeenCalledOnceWith(200, 'path', '', '', 'complete');
+            expect(callback).toHaveBeenCalledOnceWith(200, 'path', 'x-header: foo', 'OK', 'complete');
+            expect(paramsSpy).toHaveBeenCalledOnceWith({id: '123', q: 'str', foo: 'bar'});
+          }
+        );
+        they('should ignore query param when matching eager parameters in ' + routeShortcut + ' $prop method', methods,
+          function() {
+            var paramsSpy = jasmine.createSpy('paramsSpy');
+            hb[routeShortcut](this, '/route/:id*').respond(function(method, url, data, headers, params) {
+              paramsSpy(params);
+              // status, response, headers, statusText, xhrStatus
+              return [200, 'path', { 'x-header': 'foo' }, 'OK', 'complete'];
+            });
+            hb(this, '/route/123/456?q=str&foo=bar', undefined, callback);
+            hb.flush();
+            expect(callback).toHaveBeenCalledOnceWith(200, 'path', 'x-header: foo', 'OK', 'complete');
+            expect(paramsSpy).toHaveBeenCalledOnceWith({id: '123/456', q: 'str', foo: 'bar'});
           }
         );
       });