Skip to content

Commit 3e95501

Browse files
petersirkapetersirka
committed
fixed: package views
1 parent 1d7576a commit 3e95501

4 files changed

Lines changed: 43 additions & 6 deletions

File tree

‎index.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function Framework() {
123123

124124
this.id = null;
125125
this.version = 1700;
126-
this.version_header = '1.7.0 (build: 21)';
126+
this.version_header = '1.7.0 (build: 22)';
127127
this.versionNode = parseInt(process.version.replace('v', '').replace(/\./g, ''), 10);
128128

129129
this.config = {
@@ -10392,7 +10392,6 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
1039210392
var skip = c === '/' ? 1 : c === '~' ? 2 : c === '@' ? 3 : 0;
1039310393
var filename = name;
1039410394
var isLayout = self.isLayout;
10395-
1039610395
self.isLayout = false;
1039710396

1039810397
if (!self.isLayout && skip === 0)
@@ -10402,7 +10401,7 @@ Controller.prototype.view = function(name, model, headers, isPartial) {
1040210401
filename = name.substring(1);
1040310402

1040410403
if (skip === 3)
10405-
filename = framework.path.package(filename);
10404+
filename = '.' + framework.path.package(filename);
1040610405

1040710406
var generator = framework_internal.generateView(name, filename);
1040810407
if (generator === null) {

‎test/packages/testpackage.package‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/index.js :H4sIAAAAAAAAA0utKMgvKinWy8wrLknMyVGwVUgrzUsuyczP00grSsxNLc8vytZUqOZSAILk/Lzi/JxUvZz8dA31AEdnb0d3V3VNa65aawD0Z6oYRgAAAA==
2-
/layout.html :H4sIAAAAAAAAA7NJySyz80mszC8tsdEHsbkcqpPyUyprAdgdZDkZAAAA
3-
/test.html :H4sIAAAAAAAAA3OozkmszC8t0VB3KEktLilITM5OTE/Vhwiqa9Zy2aRkltmFuAaH2OiDWAAMOw9CMAAAAA==
1+
/index.js :H4sIAAAAAAAAA0WLQQqAIBQF953CnQqhB4igq0j8SioV/WYQ3r0MrFkNj3lwOusxCG0Cqm0jPZmiGVFbwyavdkjWr5xcDXn4BuFtRGBUOjWuagZJ2/9W6wIuOohDQ2J0QAhY++KUd2+XeZO7Gz9GQDCHAAAA
2+
/layout.html :H4sIAAAAAAAAA7NJySyzC3B09nZ0d/VxjPQPDbHRBwk5VCflp1TWAgDiWX2wHwAAAA==
3+
/test.html :H4sIAAAAAAAAA3OozkmszC8t0VB3KEktLilITM5OTE/Vhwiqa9Zy2aRkltkFODp7O7q7hnm6htvogwQA78+CxDcAAAA=
44
/test.js :H4sIAAAAAAAAA0vOzyvOz0nVy8lP11AvSS0uUde0BgAYM45aFAAAAA==

‎test/test-framework-debug.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,16 @@ function test_routing(next) {
152152
});
153153
});
154154

155+
156+
async.await('package/', function(complete) {
157+
utils.request(url + 'package/', 'GET', null, function(error, data, code, headers) {
158+
if (error)
159+
throw error;
160+
assert.ok(data === '<div>PACKAGELAYOUT</div><div>PACKAGEVIEW</div>', 'package view problem');
161+
complete();
162+
});
163+
});
164+
155165
async.await('precompile', function(complete) {
156166
utils.request(url + 'precompile/', 'GET', null, function(error, data, code, headers) {
157167
if (error)

‎test/test-framework-release.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,16 @@ function test_routing(next) {
152152
});
153153
});
154154

155+
156+
async.await('package/', function(complete) {
157+
utils.request(url + 'package/', 'GET', null, function(error, data, code, headers) {
158+
if (error)
159+
throw error;
160+
assert.ok(data === '<div>PACKAGELAYOUT</div><div>PACKAGEVIEW</div>', 'package view problem');
161+
complete();
162+
});
163+
});
164+
155165
async.await('precompile', function(complete) {
156166
utils.request(url + 'precompile/', 'GET', null, function(error, data, code, headers) {
157167
if (error)
@@ -221,6 +231,24 @@ function test_routing(next) {
221231
});
222232
});
223233

234+
async.await('post-schema', function(complete) {
235+
utils.request(url + 'post/schema/', ['post'], 'name=Peter123456789012345678901234567890#', function(error, data, code, headers) {
236+
if (error)
237+
throw error;
238+
assert(data === '{"name":"Peter12345","type":"schema"}', 'post-schema');
239+
complete();
240+
});
241+
});
242+
243+
async.await('post-schema-error', function(complete) {
244+
utils.request(url + 'post/schema/', ['post'], 'age=Peter123456789012345678901234567890#', function(error, data, code, headers) {
245+
if (error)
246+
throw error;
247+
assert(data === '[{"name":"name","error":"default","path":"User.name"}]', 'post-schema');
248+
complete();
249+
});
250+
});
251+
224252
async.await('post-json', function(complete) {
225253
utils.request(url + 'post/json/', ['json', 'post'], { name: 'total.js' }, function(error, data, code, headers) {
226254
if (error)

0 commit comments

Comments
 (0)