Skip to content

Clarify error message when importing web app files #842

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Clarify error message when importing web app files #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
852e5ec
clarify error message when importing web application files
isc-pbarton Aug 25, 2025
cfe18c3
refactor: tidier code in unit test
isc-pbarton Aug 25, 2025
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
3 changes: 2 additions & 1 deletion cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,7 @@ ClassMethod ImportCSPFile(InternalName As %String) As %Status
}
// Delete original if exists, otherwise create new file
if '(##class(%File).CopyFile(srcFile, cspFile, 1, .ret)) {
set sc = $$$ERROR($$$GeneralError,"Unable to copy CSP file from "_srcFile_" to "_cspFile_": return code "_ret)
set sc = $$$ERROR($$$GeneralError,"Unable to copy web application file from "_srcFile_" to "_cspFile_": return code "_ret)
}

Quit sc
Expand Down Expand Up @@ -3297,3 +3297,4 @@ ClassMethod IsSchemaStandard(pName As %String = "") As %Boolean [ Internal ]
}

}

8 changes: 5 additions & 3 deletions test/UnitTest/SourceControl/Git/ImportAll.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Class UnitTest.SourceControl.Git.ImportAll Extends UnitTest.SourceControl.Git.AbstractTest
{

Parameter WebAppName As STRING = "/csp/git/unittest/xsl";

Property WebAppPath As %String;

Method %OnNew(initvalue) As %Status
Expand All @@ -10,11 +12,11 @@ Method %OnNew(initvalue) As %Status
/// add mappings for MAC and CSP
Set settings = ##class(SourceControl.Git.Settings).%New()
Set settings.Mappings("MAC","*")="rtn/"
Set settings.Mappings("/CSP/","/csp/git/unittest/xsl")="csp/git/unittest/xsl"
Set settings.Mappings("/CSP/",..#WebAppName)="csp/git/unittest/xsl"
$$$ThrowOnError(settings.%Save())
set ..WebAppPath = ##class(%File).TempFilename()_"d"
do ##class(%File).CreateDirectoryChain(..WebAppPath)
do ..CreateTestWebApp("/csp/git/unittest/xsl", ..WebAppPath)
do ..CreateTestWebApp(..#WebAppName, ..WebAppPath)
return $$$OK
}

Expand Down Expand Up @@ -43,7 +45,7 @@ ClassMethod DeleteTestWebApp(name)

Method %OnClose() As %Status [ Private, ServerOnly = 1 ]
{
do ..DeleteTestWebApp("/csp/git/unittest/xsl")
do ..DeleteTestWebApp(..#WebAppName)
do ##class(%File).RemoveDirectoryTree(..WebAppPath)
quit ##super()
}
Expand Down
Loading