Commit 2999ad13 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-addActivityEmbeddedContent' into 'dev' 

Añade tests para nuevo contenido de actividad

See merge request redmic-project/server/library/elasticsearch!15
parents fcbc9646 ee04860f

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>elasticsearch</artifactId>

	<packaging>jar</packaging>

	<version>0.10.0</version>

	<version>0.10.0-feature-addActivityEmbeddedContent</version>

	<name>ElasticSearch</name>

	<description>ElasticSearch library </description>



	<properties>

		<!-- REDMIC -->

		<redmic.models.version>0.14.0</redmic.models.version>

		<redmic.models.version>0.14.0-feature-addActivityEmbeddedContent</redmic.models.version>

		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>

		<redmic.utils.version>0.10.0-feature-changeJtsVersion</redmic.utils.version>

src/test/resources/data/administrative/activity/dto/activity.json

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 
		},

		"urlResource": "https://ckan.redmic.es"

	}],

	"embeddedContents": [{

		"id": 1,

		"embeddedContent": "<iframe></iframe>"

	}],

	"accessibility": {

		"id": 2,

		"name": "Libre",

src/test/resources/data/administrative/activity/dto/searchWrapperActivityDTO.json

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ 
				},

				"urlResource": "https://ckan.redmic.es"

			}],

			"embeddedContents": [{

				"id": 1,

				"embeddedContent": "<iframe></iframe>"

			}],

			"accessibility": {

				"id": 2,

				"name": "Libre",

src/test/resources/data/administrative/activity/model/activity.json

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
		},

		"urlResource": "https://ckan.redmic.es"

	}],

	"embeddedContents": [{

		"id": 1,

		"embeddedContent": "<iframe></iframe>"

	}],

	"accessibility": {

		"id": 2,

		"name": "Libre",

src/test/resources/data/administrative/activity/model/activity2.json

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ 
		},

		"urlResource": "https://ckan.redmic.es"

	}],

	"embeddedContents": [{

		"id": 1,

		"embeddedContent": "<iframe></iframe>"

	}],

	"accessibility": {

		"id": 2,

		"name": "Libre",