Skip to content
Snippets Groups Projects
Commit f1b0443d authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch...

Merge branch 'hotline#95887_la_carte_osm_sur_les_evenements_agenda_ne_s_affiche_pas_dans_la_version_smartphone' into 'hotline'

hotline #95887 use same article rendering in phone version as opac one

See merge request !3307
parents 5d87cdb5 46d2246d
Branches
Tags
2 merge requests!3308Hotline,!3307hotline #95887 use same article rendering in phone version as opac one
Pipeline #8703 passed with stage
in 43 minutes and 10 seconds
- ticket #95887 : Version smartphone: affichage de la carte OSM et boutons de partage sur les événements agenda
\ No newline at end of file
......@@ -3,5 +3,6 @@
<h1><?php echo $this->article->titre ?></h1>
<div class='article pave'>
<?php echo $this->article->getFullContent();?>
</div>
\ No newline at end of file
<?php echo $this->getHelper('Article_RenderFullContent')
->renderArticle($this->article); ?>
</div>
......@@ -572,3 +572,7 @@ li.pret_en_retard a {
padding: 0 20px 0 0;
}
dl.article_info {
display:none;
}
......@@ -27,7 +27,16 @@ abstract class AbstractCmsControllerTelephoneTestCase extends TelephoneAbstractC
Class_Article::getLoader()
->newInstanceWithId(4)
->setTitre('Fete de la patate')
->setDescription('A Annecy !');
->setDescription('A Annecy !')
->setLieu($this->fixture('Class_Lieu',
['id' => '4156465',
'libelle' => 'Annecy',
'adresse' => 'Rue des tomates',
'code_postal' => '74000',
'latitude' => '45.9262592',
'longitude' => '6.1459837']));
;
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Article')
......@@ -81,6 +90,14 @@ class CmsControllerTelephoneTest extends AbstractCmsControllerTelephoneTestCase
function contentShouldBeAAnnecy() {
$this->assertXPathContentContains('//div[@class="article pave"]', 'A Annecy !');
}
/** @test */
public function divShouldContainsStaticMap() {
$this->assertXPath('//div[@class="lieu"]//img[contains(@src,"https://smap.afi-sa.net/staticmap.php")]',
$this->_response->getBody());
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment