Merge branch 'master' of https://github.com/pixelated/pixelated-user-agent

# By Felix Hammerl (13) and Thais Siqueira (3)
# Via Christoph (1) and Thais Siqueira (1)
* 'master' of https://github.com/pixelated/pixelated-user-agent:
  Sets SSL certifications to false.
  Fixes pep8 errors and update requests to 2.9.1.
  Update locust test to run after xsrf token implementation.
  Issue #620: Adapt unit tests to CSS changes
  Issue #620: Refactor palceholder
  Issue #620: Remove former main css file
  Issue #620: Spike growl CSS modularization
  Issue #617: Highlight search terms by altering mail content
  Issue #617: Allow only >=3 alphanumeric characters in search field
  Issue #617: Restrict searching to alphanumeric characters
  Issue #617: Remove highlighting for sandboxed content
  Issue #617: Add sandbox to build scripts
  Issue #617: Add sandbox to user-agent
  Issue #617: Create sandbox resouces
  Issue #617: Add iframe-resizer
  Issue #617: Serve content from Sandbox resource

1 files changed, 11 insertions, 3 deletions

diff --git a/web-ui/test/spec/search/results_highlighter.spec.js b/web-ui/test/spec/search/results_highlighter.spec.js
index cfb61e9c..13131a8e 100644
--- a/web-ui/test/spec/search/results_highlighter.spec.js
+++ b/web-ui/test/spec/search/results_highlighter.spec.js
@@ -1,9 +1,11 @@
 describeComponent('search/results_highlighter', function () {
   'use strict';
 
-  it('highlights words or parts of words that match with the keywords given', function () {
+  beforeEach(function () {
     this.setupComponent('<div id="text">Any one seeing too many open bugs</div>');
+  });
 
+  it('highlights words or parts of words that match with the keywords given', function () {
     this.component.attr = {keywords: ['any']};
     this.component.highlightResults(event, {where: '#text'});
 
@@ -12,9 +14,15 @@ describeComponent('search/results_highlighter', function () {
     expect(highlightedWords).toEqual(2);
   });
 
-  it('resets highlights when a new search is performed', function() {
-    this.setupComponent('<div id="text">Any one seeing too many open bugs</div>');
+  it('highlights a string with the keywords given', function () {
+    this.component.attr = {keywords: ['foo']};
+    var expectedString = 'the <em class="search-highlight">foo</em> bar';
+    var string = this.component.highlightString('the foo bar');
+
+    expect(string).toEqual(expectedString);
+  });
 
+  it('resets highlights when a new search is performed', function() {
     this.component.attr = {keywords: ['any']};
     this.component.highlightResults(event, {where: '#text'});
     $(document).trigger(Pixelated.events.search.resetHighlight);