Skip to content

Commit 2a2aca1

Browse files
committed
Роутер не добавляет дефолтный параметр
1 parent 088782c commit 2a2aca1

File tree

1 file changed

+58
-2
lines changed

1 file changed

+58
-2
lines changed

test/spec/ns.router2.js

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,56 @@ describe('router: new route parsing method', function() {
182182
});
183183
});
184184

185-
describe('ns.router.generateUrl()', function() {
185+
xdescribe('rebulus test', function() {
186+
187+
beforeEach(function() {
188+
ns.router.regexps.TRebulus = '\\d+|any-items';
189+
190+
ns.router.routes = {
191+
route: {
192+
'/view/{param:TRebulus}': 'view',
193+
'/journal/{startTimestamp:int=100}/{eventType:id=all-events}/{platform:id=all-plaforms}': 'view1'
194+
}
195+
};
196+
ns.router.init();
197+
});
198+
199+
it('1', function() {
200+
var route1 = ns.router('/view/1');
201+
console.log('/view/1', route1);
202+
203+
var route2 = ns.router('/view/any-items');
204+
console.log('/view/any-items', route2);
205+
206+
var route3 = ns.router('/view/foo');
207+
console.log('/view/foo', route3);
208+
209+
var route4 = ns.router('/view/5ny-items');
210+
console.log('/view/5ny-items', route4);
211+
212+
var route5 = ns.router('/view/any-item');
213+
console.log('/view/any-item', route5);
214+
});
215+
216+
it('2', function() {
217+
var route1 = ns.router('/journal/1');
218+
console.log('/journal/1', route1);
219+
220+
var route2 = ns.router('/journal/1/');
221+
console.log('/journal/1/', route2);
222+
223+
var route3 = ns.router.generateUrl('view1', {startTimestamp:2});
224+
console.log('{startTimestamp:2} -> ', route3);
225+
226+
var route4 = ns.router.generateUrl('view1', {eventType: 'a'});
227+
console.log('{eventType:1} -> ', route4);
228+
229+
230+
});
231+
232+
});
233+
234+
describe.only('ns.router.generateUrl()', function() {
186235
beforeEach(function() {
187236
ns.router.regexps.any = '.+?';
188237

@@ -193,7 +242,8 @@ describe('router: new route parsing method', function() {
193242
'/{context==top}/image/{id:int}': 'view',
194243
'/{context}/image/{id:int}': 'view',
195244
'/test/{id}': 'test',
196-
'/search/query={query:any}': 'encode'
245+
'/search/query={query:any}': 'encode',
246+
'/journal/{ts:int=100}/{type:id=any-type}': 'journal'
197247
}
198248
};
199249
ns.router.init();
@@ -236,6 +286,12 @@ describe('router: new route parsing method', function() {
236286
params: { context: 'new-context', id: 4 },
237287
result: '/new-context/image/4'
238288
},
289+
{
290+
name: 'generate route with default params',
291+
id: 'journal',
292+
params: { type: 'mytype' },
293+
result: '/journal/100/mytype'
294+
},
239295
{
240296
name: 'should encode only url values',
241297
id: 'encode',

0 commit comments

Comments
 (0)