Skip to content

Validate needle timestamp upon saving #6748

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Validate needle timestamp upon saving #6748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions assets/javascripts/needleeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,10 @@ function updateToggleClickCoordinatesButton(hasClickCoorinates) {
function saveNeedle(overwrite) {
var form = document.getElementById('save_needle_form');
var errors = [];
var needle_name = document.getElementById('needleeditor_name').value;
if (!/-\d{8}$/.test(needle_name)) {
errors.push('No valid timestamp');
}
var tagSelection = window.needles[$('#tags_select').val()];
if (!tagSelection.tags.length) {
errors.push('No tags specified.');
Expand Down
11 changes: 7 additions & 4 deletions t/ui/12-needle-edit.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use Test::Warnings qw(:all :report_warnings);
use OpenQA::Test::TimeLimit '120';
use OpenQA::Test::Case;
use OpenQA::Test::Utils qw(assume_all_assets_exist shared_hash prepare_clean_needles_dir prepare_default_needle);
use OpenQA::Utils qw(ensure_timestamp_appended);
use Cwd 'abs_path';
use Mojo::File qw(path tempdir);
use Mojo::JSON 'decode_json';
Expand Down Expand Up @@ -343,7 +344,7 @@ subtest 'Needle editor layout' => sub {
};

my $needlename = 'test-newneedle';
my $needlename_from_candidate = "$needlename-from-candidate";
my $needlename_from_candidate = ensure_timestamp_appended("$needlename-from-candidate");
my $xoffset = my $yoffset = 200;

subtest 'Create new needle' => sub {
Expand Down Expand Up @@ -612,13 +613,15 @@ subtest 'Deletion of needle is handled gracefully' => sub {
) or always_explain \@warnings;
};

subtest 'areas/tags verified via JavaScript' => sub {
subtest 'areas/tags/timestamp verified via JavaScript' => sub {
$driver->get('/tests/99938/modules/logpackages/steps/1/edit');
$driver->find_element_by_id('needleeditor_name')->clear();
$driver->find_element_by_id('needleeditor_name')->send_keys('no-timestamp');
$driver->find_element_by_id('save')->click();
is(
$driver->find_element('.alert-danger span')->get_text(),
"Unable to save needle:\nNo tags specified.\nNo areas defined.",
'areas/tags verified via JavaScript'
"Unable to save needle:\nNo valid timestamp.\nNo tags specified.\nNo areas defined.",
'areas/tags/timestamp verified via JavaScript'
);
$driver->find_element('.alert-danger button')->click();
};
Expand Down