diff --git a/tests/integration_tests/Test/PM/Integration/CPFMerge.cls b/tests/integration_tests/Test/PM/Integration/CPFMerge.cls index 26b0874d..27e29184 100644 --- a/tests/integration_tests/Test/PM/Integration/CPFMerge.cls +++ b/tests/integration_tests/Test/PM/Integration/CPFMerge.cls @@ -23,8 +23,13 @@ Method TestCPFMerge() Do $$$AssertEquals(packageMap.Database, "USER") // Test role - // Somehow the role cannot be created. Something's wrong with create-roles.cpf - Do $$$AssertTrue(##class(Security.Roles).Exists("MyTestRole", .role)) + Do $$$AssertTrue(##class(Security.Roles).Exists("MyTestRole")) + + // Test Resource + Do $$$AssertTrue(##class(Security.Resources).Exists("MyTestResource")) + + // Test Web Application + Do $$$AssertTrue(##class(Security.Applications).Exists("/csp/my-test-webapp")) } } diff --git a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/actions.cpf b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/actions.cpf new file mode 100644 index 00000000..46903ff7 --- /dev/null +++ b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/actions.cpf @@ -0,0 +1,5 @@ +[Actions] +CreateRole:Name=MyTestRole +CreateResource:Name=MyTestResource,PublicPermission=R +CreateApplication:Name=/csp/my-test-webapp + diff --git a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/create-roles.cpf b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/create-roles.cpf deleted file mode 100644 index 579d753a..00000000 --- a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/custom-cpf-directory/create-roles.cpf +++ /dev/null @@ -1,2 +0,0 @@ -[Actions] -CreateRole:Name=MyTestRole \ No newline at end of file diff --git a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml index 5066c8b8..4e31be84 100644 --- a/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml +++ b/tests/integration_tests/Test/PM/Integration/_data/cpf-merge/module.xml @@ -6,7 +6,7 @@ 0.0.1 module - +