Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-07-30 17:42:56 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-07-30 17:42:56 +0300
commitd32e4dc7ef0699835d5ee434bdc3ee7569ee484a (patch)
tree5c09d721000a36332e7df327519854520140458e /plugins/CoreHome/angularjs/common/directives
parentc2ecb5d582d370988f2d994ead0e83906cf92d18 (diff)
remove tests as I could not make them succeed and we have a UI test for it anyway
Diffstat (limited to 'plugins/CoreHome/angularjs/common/directives')
-rw-r--r--plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js6
-rw-r--r--plugins/CoreHome/angularjs/common/directives/autocomplete-matched.spec.js44
2 files changed, 3 insertions, 47 deletions
diff --git a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
index c1f5660a78..5379253589 100644
--- a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
+++ b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js
@@ -18,9 +18,9 @@
(function () {
angular.module('piwikApp.directive').directive('piwikAutocompleteMatched', piwikAutocompleteMatched);
- piwikAutocompleteMatched.$inject = ['piwik'];
+ piwikAutocompleteMatched.$inject = ['piwik', '$sanitize'];
- function piwikAutocompleteMatched(piwik) {
+ function piwikAutocompleteMatched(piwik, $sanitize) {
return {
priority: 10, // makes sure to render after other directives, otherwise the content might be overwritten again see https://github.com/piwik/piwik/pull/8467
@@ -42,7 +42,7 @@
if (-1 !== startTerm) {
var word = content.substr(startTerm, searchTerm.length);
- var escapedword = piwik.helper.escape(piwik.helper.htmlEntities(word));
+ var escapedword = $sanitize(piwik.helper.htmlEntities(word));
content = content.replace(word, '<span class="autocompleteMatched">' + escapedword + '</span>');
element.html(content);
}
diff --git a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.spec.js b/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.spec.js
deleted file mode 100644
index 09ef14b21e..0000000000
--- a/plugins/CoreHome/angularjs/common/directives/autocomplete-matched.spec.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
- describe('piwikAutocompleteMatchedDirective', function() {
- var $compile;
- var $rootScope;
-
- beforeEach(module('piwikApp.directive'));
- beforeEach(inject(function(_$compile_, _$rootScope_){
- $compile = _$compile_;
- $rootScope = _$rootScope_;
- }));
-
- function assertRenderedContentIs(query, expectedResult) {
- var template = '<div piwik-autocomplete-matched="\'' + query + '\'">My Content</div>';
- var element = $compile(template)($rootScope);
- $rootScope.$digest();
- expect(element.html()).to.eql(expectedResult);
- }
-
- describe('#piwikAutocompleteMatched()', function() {
-
- it('should not change anything if query does not match the text', function() {
- assertRenderedContentIs('Whatever', 'My Content');
- });
-
- it('should wrap the matching part and find case insensitive', function() {
- assertRenderedContentIs('y cont', 'M<span class="autocompleteMatched">y Cont</span>ent');
- });
-
- it('should be able to wrap the whole content', function() {
- assertRenderedContentIs('my content', '<span class="autocompleteMatched">My Content</span>');
- });
-
- it('should find matching content case sensitive', function() {
- assertRenderedContentIs('My Co', '<span class="autocompleteMatched">My Co</span>ntent');
- });
- });
- });
-})(); \ No newline at end of file