Ensuring stable sort of route rules used for matching URLs.

Author: cdriscol

Diff for: src/urlRouter.js

@@ -64,6 +64,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    */
   this.rule = function (rule) {
     if (!isFunction(rule)) throw new Error("'rule' must be a function");
+    rule.position = rules.length;
     rules.push(rule);
     return this;
   };
@@ -304,11 +305,12 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
       listener = listener || $rootScope.$on('$locationChangeSuccess', update);
       return listener;
     }
-
+    
     rules.sort(function(ruleA, ruleB) {
       var aLength = ruleA.prefix ? ruleA.prefix.length : 0;
       var bLength = ruleB.prefix ? ruleB.prefix.length : 0;
-      return bLength - aLength;
+      var lengthDiff = bLength - aLength;
+      return lengthDiff !== 0 ? lengthDiff : ruleA.position - ruleB.position;
     });
 
     if (!interceptDeferred) listen();

Diff for: test/urlRouterSpec.js

@@ -59,7 +59,31 @@ describe("UrlRouter", function () {
           match = ['/foo/bar', $match];
         }).when('/bar', function($match) {
           match = ['/bar', $match];
-        });
+        }).when('/', function() { 
+          match = '/home';
+        }).when('/abc', function() { 
+          match = '/abc/step1';
+        }).when('/abc', function() { 
+          match = '/abc/step2';
+        }).when('/defg', function() { 
+          match = '/defg';
+        }).when('/hij', function() { 
+          match = '/hij/step1';
+        }).when('/hij', function() { 
+          match = '/hij/step2';
+        }).when('/hij', function() { 
+          match = '/hij/step3';
+        }).when('/hij', function() { 
+          match = '/hij/step4';
+        }).when('/klmno', function() { 
+          match = '/klmno/step1';
+        }).when('/klmno', function() { 
+          match = '/klmno/step2';
+        }).when('/pqr', function() { 
+          match = '/pqr/step1';
+        }).when('/pqr', function() { 
+          match = '/pqr/step2';}
+        );
       });
 
       module('ui.router.router', 'ui.router.router.test');
@@ -84,6 +108,12 @@ describe("UrlRouter", function () {
       expect(match[0]).toBe("/foo/:param");
       expect(match[1]).toEqual({param: 'baz'});
     });
+    
+    it('should default to the first rule defined for same url', function() {
+        location.path('/hij');
+        scope.$emit('$locationChangeSuccess');
+        expect(match).toBe('/hij/step1');
+    });
 
     it("should execute rewrite rules", function () {
       location.path("/foo");
@@ -261,4 +291,4 @@ describe("UrlRouter", function () {
     });
   });
 
-});
+});