Skip to content

Commit

Permalink
Merge release into master (#20113)
Browse files Browse the repository at this point in the history 
* Fixing Task201014UpdateColumnsValueInIdentifierTableTest (#20026)

* Fixing test

* run-all

* Refactoring validations after code review suggestion

* run-all

Co-authored-by: Nollymar Longa <>

* Updating core-web version

* new core-web artifact

* 19992 rebuild es client on illegal state exception (#20014)

* #1992 Rebuild REST High Level Client if Reactor stopped

* #1992 remove not-needed code

* #1992 remove not-needed code

* #19992 Default impl for rebuildClient. Move rebuilding to seperate catch

* #19992 Rebuild client on IllegalState Reactor wrapped and unwrapped

* #19992 null-check

Co-authored-by: Daniel Silva <daniel.silva@dotcms.com>

* Update coreWebReleaseVersion

* Issue 20038 samesite strict (#20051)

* #20038 redirect using html form

* #20038 html based redirect

* Updating starter version to 20210305

* new core-web version

* Update coreWebReleaseVersion

* #19772 Avoid Login when a logout request is sent (#20037)

* #19772 Avoid Login when a logout request is sent

* #19772 Add test to the MainSuite

* #20058 turn on security options (#20061)

* Upgrade saml to 21.03 (#20070)

* #20063 sending cookies httponly and secure (#20065)

* Issue 19934 adding folder to root throws a jsp error (#20073)

* If folder is newly not show the permission tab

* #19934 Format

* Fix tests oracle (#20054)

* Fix ContentletWebAPIImplIntegrationTest

* replace null with empty string

* Remove extra folder extension

* run-all

* Upgrade saml 21.03 (#20076)

* Upgrade saml to 21.03

* upgrade saml to 21.03.1

* Change order of Mapping test. Decrease time in other tests. Move IT t… (#20072)

* Change order of Mapping test. Decrease time in other tests. Move IT to Unit

* Attempt removing getting-started-layout by id and name

* Missing changes

* #19683 Create endpoint to get the create content url

* Fixing test (#20086)

* Fixing test

* Fixing test

* Update .gitmodules

* Find getting started layout by name instead of id (#20092)

* Changing the logic to get the Getting Starter portlet layout. Now, it searches by name instead of id

* Updating starter version

Co-authored-by: Nollymar Longa <>

* Updte image api url in gs portlet

* Issue 20098 send page mimetype if is page (#20099)

* #20058 turn on security options

* #20098 this sets the mime type to a page if the url is a page in dotCMS

* Remove same height container fix

* Update .gitmodules

* Update gradle.properties

* Update gradle.properties

Co-authored-by: Nollymar Longa <nollymar.longa@dotcms.com>
Co-authored-by: Nollymar Longa <>
Co-authored-by: Will Ezell <will@dotcms.com>
Co-authored-by: Freddy Montes <freddymontes@gmail.com>
Co-authored-by: dotcmsbuild <dotcmsbuild@dotcms.com>
Co-authored-by: Freddy Rodriguez <freddy0309@gmail.com>
Co-authored-by: Jonathan <jonathan.sanchez@dotcms.com>
Co-authored-by: erickgonzalez <erick.gonzalez@dotcms.com>
  • Loading branch information
@dsilvam @nollymar
@wezell @fmontes @freddyDOTCMS @jdotcms @erickgonzalez
8 people committed Mar 18, 2021
1 parent 8818995 commit adb9db0
Show file tree
Hide file tree
Showing 35 changed files with 669 additions and 224 deletions.
4 changes: 2 additions & 2 deletions dotCMS/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ dependencies {
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
felix group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '0.2'

felix group: 'com.dotcms.samlbundle', name: 'com.dotcms.samlbundle', version: '21.02'
felix group: 'com.dotcms.samlbundle.fragment', name: 'com.dotcms.samlbundle.fragment', version: '21.02'
felix group: 'com.dotcms.samlbundle', name: 'com.dotcms.samlbundle', version: '21.03.1'
felix group: 'com.dotcms.samlbundle.fragment', name: 'com.dotcms.samlbundle.fragment', version: '21.03.1'
/**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/
compile fileTree("src/main/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar')

Expand Down
146 changes: 137 additions & 9 deletions dotCMS/src/curl-test/PortletResource.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info": {
"_postman_id": "9a7824b9-51c6-469f-9eb1-c67648483106",
"_postman_id": "4b9e97f2-79d6-44c1-a728-6c0afda68da1",
"name": "PortletResource",
"description": "Contains test for portlet resources",
"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
Expand All @@ -15,7 +15,6 @@
{
"listen": "test",
"script": {
"id": "3d718533-3328-4be3-9aa0-fa5fd6d86ed2",
"exec": [
"pm.test(\"Status code should be 200\", function () {",
" pm.response.to.have.status(200);",
Expand Down Expand Up @@ -80,7 +79,6 @@
{
"listen": "test",
"script": {
"id": "89afc569-5628-410b-b062-604a8a08191e",
"exec": [
"pm.test(\"Status code should be 200\", function () {",
" pm.response.to.have.status(200);",
Expand Down Expand Up @@ -139,13 +137,77 @@
},
"response": []
},
{
"name": "Get webpagecontent success Case insensitive",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test(\"Status code should be 200\", function () {",
" pm.response.to.have.status(200);",
"});",
"",
"var jsonData = pm.response.json().entity;",
"",
"pm.test(\"Check edit_contentlet is present since contentType is anything but Event\", function () {",
" pm.expect(jsonData).to.include(\"edit_contentlet\")",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"auth": {
"type": "basic",
"basic": [
{
"key": "password",
"value": "admin",
"type": "string"
},
{
"key": "username",
"value": "admin@dotcms.com",
"type": "string"
},
{
"key": "saveHelperData",
"type": "any"
},
{
"key": "showPassword",
"value": false,
"type": "boolean"
}
]
},
"method": "GET",
"header": [],
"url": {
"raw": "{{serverURL}}/api/v1/portlet/_actionurl/WeBpAGecONTEnt",
"host": [
"{{serverURL}}"
],
"path": [
"api",
"v1",
"portlet",
"_actionurl",
"WeBpAGecONTEnt"
]
},
"description": "get the create content url sending the contentType variable name using mixed case"
},
"response": []
},
{
"name": "Get contentType not exsits NotFound",
"event": [
{
"listen": "test",
"script": {
"id": "025ec348-ce44-4703-945b-267524f71200",
"exec": [
"pm.test(\"Status code should be 404\", function () {",
" pm.response.to.have.status(404);",
Expand Down Expand Up @@ -197,18 +259,85 @@
}
},
"response": []
},
{
"name": "invalidateSession",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test(\"Status code is 200\", function () {",
" pm.response.to.have.status(200);",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"method": "GET",
"header": [],
"url": {
"raw": "{{serverURL}}/api/v1/logout",
"host": [
"{{serverURL}}"
],
"path": [
"api",
"v1",
"logout"
]
}
},
"response": []
},
{
"name": "Get webpagecontent no user sent",
"event": [
{
"listen": "test",
"script": {
"exec": [
"pm.test(\"Status code should be 401\", function () {",
" pm.response.to.have.status(401);",
"});"
],
"type": "text/javascript"
}
}
],
"request": {
"auth": {
"type": "noauth"
},
"method": "GET",
"header": [],
"url": {
"raw": "{{serverURL}}/api/v1/portlet/_actionurl/webpagecontent",
"host": [
"{{serverURL}}"
],
"path": [
"api",
"v1",
"portlet",
"_actionurl",
"webpagecontent"
]
}
},
"response": []
}
],
"description": "Tests for the getCreateContentUrl endpoint",
"protocolProfileBehavior": {}
"description": "Tests for the getCreateContentUrl endpoint"
},
{
"name": "doesUserHaveAccessToPortlet",
"event": [
{
"listen": "test",
"script": {
"id": "a4a8e9d5-41bd-4fd3-a38a-d03b6e17ead7",
"exec": [
"pm.test(\"Status code should be 200\", function () {",
" pm.response.to.have.status(200);",
Expand Down Expand Up @@ -260,6 +389,5 @@
},
"response": []
}
],
"protocolProfileBehavior": {}
]
}
5 changes: 3 additions & 2 deletions dotCMS/src/integration-test/java/com/dotcms/MainSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import com.dotcms.translate.GoogleTranslationServiceIntegrationTest;
import com.dotcms.uuid.shorty.LegacyShortyIdApiTest;
import com.dotmarketing.business.helper.PermissionHelperTest;
import com.dotmarketing.filters.AutoLoginFilterTest;
import com.dotmarketing.cache.FolderCacheImplIntegrationTest;
import com.dotmarketing.image.focalpoint.FocalPointAPITest;
import com.dotmarketing.osgi.GenericBundleActivatorTest;
Expand Down Expand Up @@ -94,6 +95,7 @@

@RunWith(MainBaseSuite.class)
@SuiteClasses({
com.dotcms.content.elasticsearch.business.ESMappingAPITest.class,
org.apache.velocity.runtime.parser.node.SimpleNodeTest.class,
com.liferay.portal.ejb.UserLocalManagerTest.class,
com.liferay.portal.ejb.UserUtilTest.class,
Expand Down Expand Up @@ -128,7 +130,6 @@
com.dotcms.content.elasticsearch.business.IndiciesFactoryTest.class,
com.dotcms.content.elasticsearch.business.ESIndexSpeedTest.class,
com.dotcms.content.elasticsearch.business.ESSiteSearchAPITest.class,
com.dotcms.content.elasticsearch.business.ESMappingAPITest.class,
com.dotcms.content.elasticsearch.business.ContentletIndexAPIImplTest.class,
com.dotcms.content.elasticsearch.business.ES6UpgradeTest.class,
com.dotcms.content.elasticsearch.business.ESContentFactoryImplTest.class,
Expand Down Expand Up @@ -161,7 +162,6 @@
com.dotcms.contenttype.model.field.layout.FieldLayoutTest.class,
com.dotcms.workflow.helper.TestSystemActionMappingsHandlerMerger.class,
com.dotcms.concurrent.lock.DotKeyLockManagerTest.class,
com.dotcms.concurrent.DotConcurrentFactoryTest.class,
com.dotcms.rendering.velocity.VelocityMacroCacheTest.class,
com.dotcms.rendering.velocity.VelocityUtilTest.class,
com.dotcms.rendering.velocity.viewtools.navigation.NavToolTest.class,
Expand Down Expand Up @@ -390,6 +390,7 @@
WorkflowBundlerTest.class,
PublisherAPIImplTest.class,
LegacyShortyIdApiTest.class,
AutoLoginFilterTest.class,
FolderCacheImplIntegrationTest.class,
Task210218MigrateUserProxyTableTest.class,
com.dotmarketing.startup.runonce.Task210316UpdateLayoutIconsTest.class
Expand Down
Loading

0 comments on commit adb9db0

Please sign in to comment.