From 8a3bda8d3f7e3c29f72b8613b06fdeb54ea9636b Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 20 Dec 2016 13:55:41 +0100
Subject: [PATCH] fix html5 & qunit failures
---
.../View/Helper/MonocleReaderServerSide.php | 3 ++-
.../tests/agenda_slider_test.js | 16 ++++++++--------
.../controllers/BibNumeriqueControllerTest.php | 1 +
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/library/ZendAfi/View/Helper/MonocleReaderServerSide.php b/library/ZendAfi/View/Helper/MonocleReaderServerSide.php
index c80c9421d9f..8a710caa8a7 100644
--- a/library/ZendAfi/View/Helper/MonocleReaderServerSide.php
+++ b/library/ZendAfi/View/Helper/MonocleReaderServerSide.php
@@ -108,7 +108,8 @@ class ZendAfi_View_Helper_MonocleReaderServerSide extends Zend_View_Helper_HtmlE
'controller' => 'bib-numerique',
'action' => 'full-screen',
'id' => $ressource->getId()],
- '<img src="'.URL_ADMIN_IMG.'picto/show.gif" title="'.$this->view->_('Plein écran').'">',
+ $this->view->tagImg(URL_ADMIN_IMG . 'picto/show.gif',
+ ['alt' => $this->view->_('Plein écran')]),
['data-ajax' => 'false']
);
}
diff --git a/public/opac/java/slider_navigation/tests/agenda_slider_test.js b/public/opac/java/slider_navigation/tests/agenda_slider_test.js
index dc6cbeeef1b..b9327a596ce 100644
--- a/public/opac/java/slider_navigation/tests/agenda_slider_test.js
+++ b/public/opac/java/slider_navigation/tests/agenda_slider_test.js
@@ -103,21 +103,21 @@ test('window height should be 80px', function() {
});
-QUnit.asyncTest('cycle should trigger click and move articles', function( assert ) {
+QUnit.asyncTest('cycle should not trigger click and not move articles', function( assert ) {
expect( 1 );
-
+ fixture.trigger('click');
setTimeout(function() {
- deepEqual(fixture.find('div.news_row').css('margin-left'), '-110px', fixture.html());
+ deepEqual(fixture.find('div.news_row').css('margin-left'), '0px', fixture.html());
QUnit.start();
- }, 1000);
+ }, 1500);
});
-QUnit.asyncTest('cycle should not trigger click and not move articles', function( assert ) {
+QUnit.asyncTest('cycle should trigger click and move articles', function( assert ) {
expect( 1 );
- fixture.trigger('click');
+
setTimeout(function() {
- deepEqual(fixture.find('div.news_row').css('margin-left'), '0px', fixture.html());
+ deepEqual(fixture.find('div.news_row').css('margin-left'), '-110px', fixture.html());
QUnit.start();
- }, 1500);
+ }, 1000);
});
diff --git a/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php b/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
index bb3b1c787d9..f7d09f827d8 100644
--- a/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
+++ b/tests/application/modules/telephone/controllers/BibNumeriqueControllerTest.php
@@ -87,6 +87,7 @@ class BibNumeriqueControllerTelephoneViewAlbumMonumentsTest extends BibNumerique
$this->assertXPath('//ul[@data-role="listview"]//li[@data-role="list-divider"]//a[contains(@href, "media/versailles.epub")]//img[contains(@src, "epub.png")]');
}
+
/** @test */
public function pageShouldBeHTML5Valid() {
$this->assertHTML5();
--
GitLab