Skip to content

Commit b9f5de6

Browse files
committed
chore(review): use more generic route for testing defaults and requirements
1 parent 1643633 commit b9f5de6

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

Resources/js/router.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ export class Router {
264264
host = token[1] + value + host;
265265
}
266266
});
267-
// Foo-bar!
267+
268268
url = this.context_.base_url + url;
269269

270270
if (route.requirements && ('_scheme' in route.requirements) && this.getScheme() != route.requirements['_scheme']) {

Resources/public/js/router.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ var Router = /*#__PURE__*/function () {
272272

273273
host = token[1] + value + host;
274274
}
275-
}); // Foo-bar!
276-
275+
});
277276
url = this.context_.base_url + url;
278277

279278
if (route.requirements && '_scheme' in route.requirements && this.getScheme() != route.requirements['_scheme']) {

Resources/ts/router.test-d.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,16 @@ Routing.setRoutingData({
5757
],
5858
schemes: []
5959
},
60-
bazinga_jstranslation_js: {
60+
feed_post: {
6161
tokens: [
6262
['variable', '.', 'js|json', '_format', true],
63-
['variable', '/', '[\\w]+', 'domain', true],
64-
['text', '/translations'],
63+
['text', '/feed/post']
6564
],
6665
defaults: {
67-
domain: 'messages',
68-
_format: 'js',
66+
_format: 'xml',
6967
},
7068
requirements: {
71-
_format: 'js|json',
72-
domain: '[\\w]+',
69+
_format: 'xml|json',
7370
},
7471
hosttokens: [],
7572
methods: ['GET'],

Resources/ts/routes.json

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"base_url": "",
33
"routes": {
4-
"bazinga_jstranslation_js": {
4+
"feed_post": {
55
"tokens": [
66
[
77
"variable",
@@ -10,25 +10,13 @@
1010
"_format",
1111
true
1212
],
13-
[
14-
"variable",
15-
"\/",
16-
"[\\w]+",
17-
"domain",
18-
true
19-
],
20-
[
21-
"text",
22-
"\/translations"
23-
]
13+
["text", "/feed/post"]
2414
],
2515
"defaults": {
26-
"domain": "messages",
27-
"_format": "js"
16+
"_format": "xml"
2817
},
2918
"requirements": {
30-
"_format": "js|json",
31-
"domain": "[\\w]+"
19+
"_format": "xml|json"
3220
},
3321
"hosttokens": [],
3422
"methods": [

0 commit comments

Comments
 (0)