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, 2 insertions, 4 deletions

diff --git a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
index bde3b7fa..f15cda81 100644
--- a/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
+++ b/web-ui/test/spec/user_alerts/ui/user_alerts.spec.js
@@ -8,13 +8,13 @@ describeComponent('user_alerts/ui/user_alerts', function () {
   it('should render message when ui:user_alerts:displayMessage is triggered', function () {
     this.component.trigger(Pixelated.events.ui.userAlerts.displayMessage, { message: 'a message' });
 
-    expect(this.component.$node.html()).toEqual('<span class="success">a message</span>\n');
+    expect(this.component.$node.html()).toEqual('<span class="message-panel__growl message-panel__growl--success">a message</span>\n');
   });
 
   it('should render error message', function () {
     this.component.trigger(Pixelated.events.ui.userAlerts.displayMessage, { message: 'send failed', class: 'error' });
 
-    expect(this.component.$node.html()).toEqual('<span class="error">send failed</span>\n');
+    expect(this.component.$node.html()).toEqual('<span class="message-panel__growl message-panel__growl--error">send failed</span>\n');
   });
 
   it('should be emptied and hidden when hide is called', function() {
@@ -24,6 +24,4 @@ describeComponent('user_alerts/ui/user_alerts', function () {
     expect(this.$node.html()).toEqual('');
   });
 
-
-
 });