From 6150006f39d94a90c5054def927d6f176744518c Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 24 Jul 2014 18:03:55 +0200
Subject: [PATCH] dev #15356 fix js test
---
public/admin/js/custom-fields/custom_fields.js | 5 +++--
.../js/custom-fields/tests/custom_fields_test.js | 14 +++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/public/admin/js/custom-fields/custom_fields.js b/public/admin/js/custom-fields/custom_fields.js
index 9a3d21a884e..2364678905c 100644
--- a/public/admin/js/custom-fields/custom_fields.js
+++ b/public/admin/js/custom-fields/custom_fields.js
@@ -19,11 +19,12 @@
*/
(function ( $ ) {
$.fn.report_helper = function() {
- var base_url = window.location.hostname;
+ var bokeh = window.location.pathname.split('/')[1];
+ var base_url = window.location.hostname+'/'+bokeh;
var current = this;
return {
'current': current,
-
+ 'base_url': base_url,
downloadReport: function(datas) {
var a = $('<a target="_blank" download="report.csv" href="data:attachment/csv,' + encodeURIComponent(datas) + '"></a>');
diff --git a/public/admin/js/custom-fields/tests/custom_fields_test.js b/public/admin/js/custom-fields/tests/custom_fields_test.js
index 9f10a3854f0..bdb02b9cc43 100644
--- a/public/admin/js/custom-fields/tests/custom_fields_test.js
+++ b/public/admin/js/custom-fields/tests/custom_fields_test.js
@@ -21,10 +21,18 @@
var fixture = '';
var helper = null;
var options = null;
+var bokeh;
+var base_url;
+
QUnit.module('custom_fields', {
setup: function() {
+
+ bokeh = window.location.pathname.split('/')[1];
+ base_url = window.location.hostname+'/'+bokeh;
+
+
jQuery.ajax = function (param) {
options = param;
var responseText = function() {
@@ -56,17 +64,17 @@ test('link to download csv should be present', function() {
test('url for data model should be as expected' ,function() {
var fields = helper.datasFields('Article');
- equal(options.url.length, window.location.hostname+'/opac/datas/fields/model/Artcile'.length);
+ equal(options.url, base_url+'/opac/datas/fields/model/Article');
});
test('url for field values should be as expected' ,function() {
var values = helper.fieldValues(456);
- equal(options.url.length, window.location.hostname+'/opac/datas/values/field/456'.length);
+ equal(options.url, base_url+'/opac/datas/values/field/456');
});
test('url for number of children by model and id should be as expected' ,function() {
var values = helper.numberOf('Formation',98,'Session');
- equal(options.url.length, window.location.hostname+'/opac/datas/numberof/model/Formation/id/98/children/Session'.length, options.url);
+ equal(options.url, base_url+'/opac/datas/numberof/model/Formation/id/98/children/Session', options.url);
});
--
GitLab