Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 3 deletions server/frontend/src/components/Bugs/PublicationForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,7 @@

<div v-if="isBugTemplateCreation" class="row">
<div class="form-group col-md-6">
<label for="testcase_filename"
>Filename that will be used for the testcase</label
>
<label for="testcase_filename">Testcase basename</label>
<input
id="testcase_filename"
v-model="fileName"
Expand Down
26 changes: 11 additions & 15 deletions server/frontend/src/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,12 @@ export function formatMonthly(d) {
}

/**
* Parse a testcase file path into basename and extension
* @param {string} testcasePath - Full path to the testcase file (e.g. "/path/to/test.txt")
* @param {string|null} templateFilename - Optional template filename to use instead of original
* @returns {{basename: string, extension: string|null}} Object with basename and extension
* Parse a testcase file path into basename and extension.
* @param {string} testcasePath - Testcase file path.
* @param {string|null} templateBasename - Optional template basename.
* @returns {{basename: string, extension: string|null}} Object with basename and extension.
*/
export function parseFilename(testcasePath, templateFilename = null) {
export function parseFilename(testcasePath, templateBasename = null) {
const pathParts = testcasePath.split("/");
const originalFilename = pathParts[pathParts.length - 1];
const originalParts = originalFilename.split(".");
Expand All @@ -238,12 +238,8 @@ export function parseFilename(testcasePath, templateFilename = null) {
: null;

let basename;
if (templateFilename) {
const templateParts = templateFilename.split(".");
basename =
templateParts.length > 1
? templateParts.slice(0, -1).join(".")
: templateParts[0];
if (templateBasename) {
basename = templateBasename;
} else {
basename = hasExtension
? originalParts.slice(0, -1).join(".")
Expand All @@ -254,10 +250,10 @@ export function parseFilename(testcasePath, templateFilename = null) {
}

/**
* Build a filename from basename and extension
* @param {string} basename - The base filename without extension
* @param {string|null} extension - Optional file extension (without dot)
* @returns {string} Complete filename with extension if provided
* Build a filename from basename and extension.
* @param {string} basename - The file basename.
* @param {string|null} extension - Optional file extension.
* @returns {string}
*/
export function buildFilename(basename, extension) {
return extension ? `${basename}.${extension}` : basename;
Expand Down
8 changes: 4 additions & 4 deletions server/frontend/tests/helpers.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ describe("parseFilename", () => {
[
"testcase with file extension",
"tests/test.txt",
"testcase.zip",
"testcase",
{ basename: "testcase", extension: "txt" },
],
[
"testcase without an extension",
"tests/original",
"template_name.html",
"template_name",
{ basename: "template_name", extension: null },
],
[
Expand All @@ -38,8 +38,8 @@ describe("parseFilename", () => {
null,
{ basename: "test.min", extension: "js" },
],
])("%s", (_description, testcasePath, templateFilename, expected) => {
const result = parseFilename(testcasePath, templateFilename);
])("%s", (_description, testcasePath, templateBasename, expected) => {
const result = parseFilename(testcasePath, templateBasename);
expect(result).toEqual(expected);
});
});
Expand Down