Skip to content

'Not all tests inserted' fixes #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

'Not all tests inserted' fixes #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f04eb92
Code snippets use zero-based indexes, see index.hbs
dcodeIO Jan 13, 2017
e4dc2fc
UPDATE tests only if pageID, which is now included in posts, matches …
dcodeIO Jan 13, 2017
6bd79bd
Fixed an SQL injection vulnerability when updating tests
dcodeIO Jan 13, 2017
bd67371
UPDATE tests only if pageID, which is now included in posts, matches …
dcodeIO Jan 13, 2017
adcca65
Merge branch 'not-all-tests-inserted' of https://github.com/dcodeIO/j…
dcodeIO Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/_js/main.src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ $(function() {
$initHTML = $('#initHTML'),
$prepJS = $('#setup'),
$jsFields = $prepJS.add('#setup, #teardown'),
testHTML = '<h4>Code snippet 1</h4><div><label for="test[1][title]">Title <em title="This field is required">*</em> </label><input type="text" name="test[1][title]" id="test[1][title]"></div><div><label for="test[1][defer]">Async </label><label class="inline"><input type="checkbox" value="y" name="test[1][defer]" id="test[1][defer]"> (check if this is an <a href="/faq#async">asynchronous test</a>)</label></div><div><label for="test[1][code]">Code <em title="This field is required">*</em> </label><textarea name="test[1][code]" class="code-js" id="test[1][code]" maxlength="16777215"></textarea></div></fieldset>',
testHTML = '<h4>Code snippet 1</h4><div><label for="test[0][title]">Title <em title="This field is required">*</em> </label><input type="text" name="test[0][title]" id="test[0][title]"></div><div><label for="test[0][defer]">Async </label><label class="inline"><input type="checkbox" value="y" name="test[0][defer]" id="test[0][defer]"> (check if this is an <a href="/faq#async">asynchronous test</a>)</label></div><div><label for="test[0][code]">Code <em title="This field is required">*</em> </label><textarea name="test[0][code]" class="code-js" id="test[0][code]" maxlength="16777215"></textarea></div></fieldset>',
testCount = $('fieldset', $tests).length,
$addTest = $('<button id="add-test" title="Add another code snippet to the test case">Add code snippet</button>').insertBefore('.submit'),
$addjQuery = $('<button id="add-jquery" title="jQuery v1.x">jQuery</button>').addScript('jquery/1/jquery.min'),
Expand Down Expand Up @@ -90,7 +90,7 @@ $(function() {
}

$addTest.click(function(event) {
$(testHTML.replace(/1/g, ++testCount)).appendTo($tests);
$(testHTML.replace(/test\[0]/g, "test[" + (testCount++) + "]")).appendTo($tests);
event.preventDefault();
});

Expand Down
3 changes: 2 additions & 1 deletion server/lib/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ exports.testPage = Joi.object().keys({
title: Joi.string().required().trim().min(1).max(255),
defer: Joi.string().default('n').valid('y', 'n'),
code: Joi.string().required().trim().min(1).max(defaults.mediumTextLength),
testID: Joi.number().integer() // optional. only present when editing
testID: Joi.number().integer(), // optional. only present when editing
pageID: Joi.number().integer() // optional. only present when editing
}))
});

Expand Down
5 changes: 3 additions & 2 deletions server/repositories/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ exports.register = function (server, options, next) {
if (update && test.testID) {
queries.push(db.genericQuery(`DELETE FROM tests WHERE pageID = ${pageID} AND testID = ${test.testID}`));
}
// otherwise just skip the test
} else {
// Update test
if (test.testID) {
queries.push(db.genericQuery(`UPDATE tests SET title = ${db.escape(test.title)}, defer = ${db.escape(test.defer)} , code = ${db.escape(test.code)} WHERE pageID = ${pageID} AND testID = ${test.testID}`));
if (test.testID && test.pageID === pageID) {
queries.push(db.genericQuery(`UPDATE tests SET title = ${db.escape(test.title)}, defer = ${db.escape(test.defer)} , code = ${db.escape(test.code)} WHERE pageID = ${pageID} AND testID = ${db.escape(test.testID)}`));
} else {
queries.push(db.genericQuery(`INSERT INTO ?? (??) VALUES (${pageID}, ${db.escape(test.title)}, ${db.escape(test.defer)}, ${db.escape(test.code)})`, [table, columns]));
}
Expand Down
1 change: 1 addition & 0 deletions server/web/edit/index.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ This edit will create a new revision.
</label>
<textarea name="test[{{@index}}][code]" id="test[{{@index}}][code]" class="code-js" maxlength="{{mediumTextLength}}">{{code}}</textarea>
<input type="hidden" name="test[{{@index}}][testID]" value="{{testID}}">
<input type="hidden" name="test[{{@index}}][pageID]" value="{{pageID}}">
{{error codeError tag="p"}}
</div>
</fieldset>
Expand Down